From: Assaf Muller <amuller@redhat.com>
Date: Sun, 21 Dec 2014 14:15:12 +0000 (+0200)
Subject: Update L3 agent drivers singletons to look at new agent
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1e562decdc03295dec4cb37d26162e5d9aa31079;p=openstack-build%2Fneutron-build.git

Update L3 agent drivers singletons to look at new agent

L3 agent drivers are singletons. They're created once, and hold
self.l3_agent. During testing, the agent is tossed away and
re-built, but the drivers singletons are pointing at the old
agent, and its old configuration.

Change-Id: Ie8a15318e71ea47cccad3b788751d914d51cbf18
Closes-Bug: #1404662
---

diff --git a/neutron/tests/common/agents/l3_agent.py b/neutron/tests/common/agents/l3_agent.py
index 529ecefe0..fb72c6855 100644
--- a/neutron/tests/common/agents/l3_agent.py
+++ b/neutron/tests/common/agents/l3_agent.py
@@ -19,6 +19,12 @@ from neutron.agent.l3 import agent
 class TestL3NATAgent(agent.L3NATAgentWithStateReport):
     NESTED_NAMESPACE_SEPARATOR = '@'
 
+    def __init__(self, host, conf=None):
+        super(TestL3NATAgent, self).__init__(host, conf)
+        self.event_observers.observers = set(
+            observer.__class__(self) for observer in
+            self.event_observers.observers)
+
     def get_ns_name(self, router_id):
         ns_name = super(TestL3NATAgent, self).get_ns_name(router_id)
         return "%s%s%s" % (ns_name, self.NESTED_NAMESPACE_SEPARATOR, self.host)