summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-15 11:56:14 +0000
committerGerrit Code Review <review@openstack.org>2017-06-15 11:56:14 +0000
commit2d752108d04767054d4f54a09eec35f1c612add9 (patch)
treeaa61d825151d295cd4d9f475a82a54193f1750c8
parentc507656044fd6c19c1f3ead535772437f5a9cebc (diff)
parent803f7b85448bbe7fbff8e245913eb3031f5abdc6 (diff)
Merge "Fix test_dvr_gateway_host_binding_is_set"
-rw-r--r--neutron/tests/functional/services/l3_router/test_l3_dvr_router_plugin.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/neutron/tests/functional/services/l3_router/test_l3_dvr_router_plugin.py b/neutron/tests/functional/services/l3_router/test_l3_dvr_router_plugin.py
index ea00b8e..1af1e1d 100644
--- a/neutron/tests/functional/services/l3_router/test_l3_dvr_router_plugin.py
+++ b/neutron/tests/functional/services/l3_router/test_l3_dvr_router_plugin.py
@@ -717,7 +717,7 @@ class L3DvrTestCase(L3DvrTestCaseBase):
717 expected_calls) 717 expected_calls)
718 718
719 def test_dvr_gateway_host_binding_is_set(self): 719 def test_dvr_gateway_host_binding_is_set(self):
720 router = self._create_router() 720 router = self._create_router(ha=False)
721 private_net1 = self._make_network(self.fmt, 'net1', True) 721 private_net1 = self._make_network(self.fmt, 'net1', True)
722 kwargs = {'arg_list': (external_net.EXTERNAL,), 722 kwargs = {'arg_list': (external_net.EXTERNAL,),
723 external_net.EXTERNAL: True} 723 external_net.EXTERNAL: True}
@@ -725,6 +725,9 @@ class L3DvrTestCase(L3DvrTestCaseBase):
725 self._make_subnet( 725 self._make_subnet(
726 self.fmt, ext_net, '10.20.0.1', '10.20.0.0/24', 726 self.fmt, ext_net, '10.20.0.1', '10.20.0.0/24',
727 ip_version=4, enable_dhcp=True) 727 ip_version=4, enable_dhcp=True)
728 self.l3_plugin.schedule_router(self.context,
729 router['id'],
730 candidates=[self.l3_agent])
728 # Set gateway to router 731 # Set gateway to router
729 self.l3_plugin._update_router_gw_info( 732 self.l3_plugin._update_router_gw_info(
730 self.context, router['id'], 733 self.context, router['id'],
@@ -739,9 +742,6 @@ class L3DvrTestCase(L3DvrTestCaseBase):
739 self.l3_plugin.add_router_interface( 742 self.l3_plugin.add_router_interface(
740 self.context, router['id'], 743 self.context, router['id'],
741 {'subnet_id': private_subnet1['subnet']['id']}) 744 {'subnet_id': private_subnet1['subnet']['id']})
742 self.l3_plugin.schedule_router(self.context,
743 router['id'],
744 candidates=[self.l3_agent])
745 # Check for the gw_port_host in the router dict to make 745 # Check for the gw_port_host in the router dict to make
746 # sure that the _build_routers_list in l3_dvr_db is called. 746 # sure that the _build_routers_list in l3_dvr_db is called.
747 router_handle = ( 747 router_handle = (