openstack/neutron-dynamic-routing
Code Issues Proposed changes

Merge "tempest: Avoid using dvr extension"

Browse Source
This commit is contained in:
Jenkins 2017-08-16 17:10:19 +00:00 committed by Gerrit Code Review
commit 173bcfb8ca
3 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
neutron_dynamic_routing/tests/tempest/scenario/base.py
View File

@ -33,7 +33,7 @@ Scope = collections.namedtuple('Scope', 'name')
Pool = collections.namedtuple('Pool', 'name, prefixlen, prefixes')
Net = collections.namedtuple('Net', 'name, net, mask, cidr, router')
SubNet = collections.namedtuple('SubNet', 'name, cidr, mask')
Router = collections.namedtuple('Router', 'name, gw, dist')
Router = collections.namedtuple('Router', 'name, gw')
AS = collections.namedtuple('AS', 'asn, router_id, adv_net')
CHECKTIME = 180
CHECKTIME_INFO = 60
@ -213,8 +213,7 @@ class BgpSpeakerScenarioTestJSONBase(base.BaseAdminNetworkTest):
ext_gw_info = {'network_id': ext_net_id}
router_cr = self.admin_client.create_router(
router.name,
external_gateway_info=ext_gw_info,
distributed=router.dist)['router']
external_gateway_info=ext_gw_info)['router']
self.admin_routers.append(router_cr)
self.admin_client.add_router_interface_with_subnet_id(
router_cr['id'],

11
neutron_dynamic_routing/tests/tempest/scenario/base_test_proto.py
View File

@ -32,7 +32,7 @@ class BgpSpeakerProtoTestBase(base.BgpSpeakerScenarioTestJSONBase):
TNet = base.Net(name='', net=subnet, mask=self.TPool.prefixlen,
cidr=subnet + mask, router=None)
TSubNet = base.SubNet(name='', cidr=TNet.cidr, mask=TNet.mask)
MyRouter = base.Router(name='my-router' + str(num), gw='', dist=False)
MyRouter = base.Router(name='my-router' + str(num), gw='')
ext_net_id = self.create_bgp_network(
ip_version, self.MyScope,
self.PNet, self.PPool, self.PSubNet,
@ -51,7 +51,7 @@ class BgpSpeakerProtoTestBase(base.BgpSpeakerScenarioTestJSONBase):
TNet = base.Net(name='', net=subnet, mask=self.TPool.prefixlen,
cidr=subnet + mask, router=None)
TSubNet = base.SubNet(name='', cidr=TNet.cidr, mask=TNet.mask)
MyRouter = base.Router(name='my-router' + str(num), gw='', dist=False)
MyRouter = base.Router(name='my-router' + str(num), gw='')
ext_net_id = self.create_bgp_network(
ip_version, self.MyScope,
self.PNet, self.PPool, self.PSubNet,
@ -77,8 +77,7 @@ class BgpSpeakerProtoTestBase(base.BgpSpeakerScenarioTestJSONBase):
TNet = base.Net(name='', net=subnet, mask=self.TPool.prefixlen,
cidr=subnet + mask, router=None)
TSubNet = base.SubNet(name='', cidr=TNet.cidr, mask=TNet.mask)
MyRouter = base.Router(name='my-router' + str(num),
gw='', dist=False)
MyRouter = base.Router(name='my-router' + str(num), gw='')
tnets.append([TNet, TSubNet, MyRouter])
tnets_cidr.append(TNet.cidr)
ext_net_id = self.create_bgp_network(
@ -107,7 +106,7 @@ class BgpSpeakerProtoTestBase(base.BgpSpeakerScenarioTestJSONBase):
TNet = base.Net(name='', net=subnet, mask=self.TPool.prefixlen,
cidr=subnet + mask, router=None)
TSubNet = base.SubNet(name='', cidr=TNet.cidr, mask=TNet.mask)
MyRouter = base.Router(name='my-router' + str(num), gw='', dist=False)
MyRouter = base.Router(name='my-router' + str(num), gw='')
ext_net_id = self.create_bgp_network(
ip_version, self.MyScope,
self.PNet, self.PPool, self.PSubNet,
@ -129,7 +128,7 @@ class BgpSpeakerProtoTestBase(base.BgpSpeakerScenarioTestJSONBase):
TNet = base.Net(name='', net=subnet, mask=self.TPool.prefixlen,
cidr=subnet + mask, router=None)
TSubNet = base.SubNet(name='', cidr=TNet.cidr, mask=TNet.mask)
MyRouter = base.Router(name='my-router' + str(num), gw='', dist=False)
MyRouter = base.Router(name='my-router' + str(num), gw='')
ext_net_id = self.create_bgp_network(
ip_version, self.MyScope,
self.PNet, self.PPool, self.PSubNet,

6
neutron_dynamic_routing/tests/tempest/scenario/basic/test_basic.py
View File

@ -35,8 +35,7 @@ class BgpSpeakerBasicTest(base.BgpSpeakerBasicTestJSONBase):
TNet = s_base.Net(name='', net=subnet, mask=self.TPool.prefixlen,
cidr=subnet + mask, router=None)
TSubNet = s_base.SubNet(name='', cidr=TNet.cidr, mask=TNet.mask)
MyRouter = s_base.Router(name='my-router' + str(num), gw='',
dist=False)
MyRouter = s_base.Router(name='my-router' + str(num), gw='')
ext_net_id = self.create_bgp_network(
4, self.MyScope,
self.PNet, self.PPool, self.PSubNet,
@ -56,8 +55,7 @@ class BgpSpeakerBasicTest(base.BgpSpeakerBasicTestJSONBase):
TNet = s_base.Net(name='', net=subnet, mask=self.TPool.prefixlen,
cidr=subnet + mask, router=None)
TSubNet = s_base.SubNet(name='', cidr=TNet.cidr, mask=TNet.mask)
MyRouter = s_base.Router(name='my-router' + str(num), gw='',
dist=False)
MyRouter = s_base.Router(name='my-router' + str(num), gw='')
ext_net_id = self.create_bgp_network(
4, self.MyScope,
self.PNet, self.PPool, self.PSubNet,