From: Jenkins <jenkins@review.openstack.org>
Date: Wed, 3 Dec 2014 06:33:47 +0000 (+0000)
Subject: Merge "Delete FIP namespace when last VM is deleted"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=90d9de822d2fef111c3176e050aad367d4381681;p=openstack-build%2Fneutron-build.git

Merge "Delete FIP namespace when last VM is deleted"
---

90d9de822d2fef111c3176e050aad367d4381681
diff --cc neutron/tests/unit/test_l3_agent.py
index 7c692fa36,732352a35..54ae156cf
--- a/neutron/tests/unit/test_l3_agent.py
+++ b/neutron/tests/unit/test_l3_agent.py
@@@ -1634,15 -1669,11 +1642,11 @@@ vrrp_instance VR_1 
  
          self.assertIn(jump_float_rule, nat_rules)
  
 -        self.assertIn(internal_net_rule, nat_rules)
 +        self.assertIn(snat_rule, nat_rules)
          self.assertThat(nat_rules.index(jump_float_rule),
 -                        matchers.LessThan(nat_rules.index(internal_net_rule)))
 +                        matchers.LessThan(nat_rules.index(snat_rule)))
  
      def test_process_router_delete_stale_internal_devices(self):
-         class FakeDev(object):
-             def __init__(self, name):
-                 self.name = name
- 
          agent = l3_agent.L3NATAgent(HOSTNAME, self.conf)
          stale_devlist = [FakeDev('qr-a1b2c3d4-e5'),
                           FakeDev('qr-b2c3d4e5-f6')]