Merge "Delete FIP namespace when last VM is deleted"

diff --cc neutron/agent/l3_agent.py
Simple merge

diff --cc neutron/tests/unit/test_l3_agent.py
index 7c692fa36002c2300100e4fbb841bbfcbd573289,732352a35a0d742a1a1a1410bd99c12e57896104..54ae156cf6befc1765f8d15edc91dca83640b33b
--- 1/neutron/tests/unit/test_l3_agent.py
--- 2/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')]