

from neutron.agent.l3 import agent


class TestL3NATAgent(agent.L3NATAgentWithStateReport):
    NESTED_NAMESPACE_SEPARATOR = '@'

    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)

    def get_router_id(self, ns_name):
        # 'ns_name' should be in the format of: 'qrouter-<id>@<host>'.
        return super(TestL3NATAgent, self).get_router_id(
            ns_name.split(self.NESTED_NAMESPACE_SEPARATOR)[0])



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)

    def get_router_id(self, ns_name):
        # 'ns_name' should be in the format of: 'qrouter-<id>@<host>'.
        return super(TestL3NATAgent, self).get_router_id(
            ns_name.split(self.NESTED_NAMESPACE_SEPARATOR)[0])

Update L3 agent drivers singletons to look at new agent
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

  
  
  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)
  
      def get_router_id(self, ns_name):
          # 'ns_name' should be in the format of: 'qrouter-<id>@<host>'.
          return super(TestL3NATAgent, self).get_router_id(
              ns_name.split(self.NESTED_NAMESPACE_SEPARATOR)[0])
  
Update L3 agent drivers singletons to look at new agent
## Code Before:


from neutron.agent.l3 import agent


class TestL3NATAgent(agent.L3NATAgentWithStateReport):
    NESTED_NAMESPACE_SEPARATOR = '@'

    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)

    def get_router_id(self, ns_name):
        # 'ns_name' should be in the format of: 'qrouter-<id>@<host>'.
        return super(TestL3NATAgent, self).get_router_id(
            ns_name.split(self.NESTED_NAMESPACE_SEPARATOR)[0])

## Instruction:
Update L3 agent drivers singletons to look at new agent
## Code After:


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)

    def get_router_id(self, ns_name):
        # 'ns_name' should be in the format of: 'qrouter-<id>@<host>'.
        return super(TestL3NATAgent, self).get_router_id(
            ns_name.split(self.NESTED_NAMESPACE_SEPARATOR)[0])
