From: Jenkins <jenkins@review.openstack.org>
Date: Mon, 27 Oct 2014 09:49:00 +0000 (+0000)
Subject: Merge "Remove use_namespaces from RouterInfo Property"
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=8cd633ad19722c5e215c66e426282108826c9a6b;p=openstack-build%2Fneutron-build.git

Merge "Remove use_namespaces from RouterInfo Property"
---

8cd633ad19722c5e215c66e426282108826c9a6b
diff --cc neutron/tests/unit/test_l3_agent.py
index df362342d,44e82d318..628081908
--- a/neutron/tests/unit/test_l3_agent.py
+++ b/neutron/tests/unit/test_l3_agent.py
@@@ -2188,9 -2177,8 +2178,9 @@@ vrrp_instance VR_1 
          fip_cidr = '11.22.33.44/24'
  
          ri = l3_agent.RouterInfo(router['id'], self.conf.root_helper,
-                                  self.conf.use_namespaces, router=router)
+                                  router=router)
          ri.dist_fip_count = 2
 +        agent.fip_ns_subscribers.add(ri.router_id)
          ri.floating_ips_dict['11.22.33.44'] = FIP_PRI
          ri.fip_2_rtr = '11.22.33.42'
          ri.rtr_2_fip = '11.22.33.40'