Fix unit tests
Commit Id5d8ac09a38c656619f88a6f87b8f384fe4c55a8 broke some unittests Change-Id: If87a8b5acd5d0e21d5971aeec1cd783ba6b7b6ba
This commit is contained in:
parent
461e5b7a43
commit
2f11462faf
@ -128,6 +128,7 @@ class TestNSXv3ExtendedSGRule(test_nsxv3_plugin.NsxV3PluginTestCaseMixin,
|
|||||||
'remote_group_id': None,
|
'remote_group_id': None,
|
||||||
'remote_address_group_id': None,
|
'remote_address_group_id': None,
|
||||||
'remote_ip_prefix': '10.0.0.0/24',
|
'remote_ip_prefix': '10.0.0.0/24',
|
||||||
|
'normalized_cidr': '10.0.0.0/24',
|
||||||
'local_ip_prefix': '239.255.0.0/16',
|
'local_ip_prefix': '239.255.0.0/16',
|
||||||
'direction': u'ingress',
|
'direction': u'ingress',
|
||||||
'description': '',
|
'description': '',
|
||||||
@ -174,6 +175,7 @@ class TestNSXv3ExtendedSGRule(test_nsxv3_plugin.NsxV3PluginTestCaseMixin,
|
|||||||
'remote_group_id': None,
|
'remote_group_id': None,
|
||||||
'remote_address_group_id': None,
|
'remote_address_group_id': None,
|
||||||
'remote_ip_prefix': None,
|
'remote_ip_prefix': None,
|
||||||
|
'normalized_cidr': "0.0.0.0/0",
|
||||||
'direction': u'ingress',
|
'direction': u'ingress',
|
||||||
'description': '',
|
'description': '',
|
||||||
'standard_attr_id': mock.ANY}]
|
'standard_attr_id': mock.ANY}]
|
||||||
|
@ -1894,6 +1894,9 @@ class NsxPTestL3NatTestCase(NsxPTestL3NatTest,
|
|||||||
enable_dhcp=False) as s:
|
enable_dhcp=False) as s:
|
||||||
self._test_router_add_interface_subnet(r, s)
|
self._test_router_add_interface_subnet(r, s)
|
||||||
|
|
||||||
|
def test_router_set_gateway_cidr_overlapped_with_subnets(self):
|
||||||
|
self.skipTest('2 dhcp subnets not supported')
|
||||||
|
|
||||||
@common_v3.with_disable_dhcp
|
@common_v3.with_disable_dhcp
|
||||||
def test_route_clear_routes_with_None(self):
|
def test_route_clear_routes_with_None(self):
|
||||||
super(NsxPTestL3NatTestCase,
|
super(NsxPTestL3NatTestCase,
|
||||||
|
@ -2178,6 +2178,9 @@ class TestL3NatTestCase(L3NatTest,
|
|||||||
super(TestL3NatTestCase,
|
super(TestL3NatTestCase,
|
||||||
self).test_router_add_and_remove_gateway()
|
self).test_router_add_and_remove_gateway()
|
||||||
|
|
||||||
|
def test_router_set_gateway_cidr_overlapped_with_subnets(self):
|
||||||
|
self.skipTest('2 dhcp subnets not supported')
|
||||||
|
|
||||||
def test_router_update_gateway_upon_subnet_create_max_ips_ipv6(self):
|
def test_router_update_gateway_upon_subnet_create_max_ips_ipv6(self):
|
||||||
self.skipTest('not supported')
|
self.skipTest('not supported')
|
||||||
|
|
||||||
|
@ -250,7 +250,7 @@ class TestVpnaasDriver(test_plugin.NsxVPluginV2TestCase):
|
|||||||
self.router(router_type='exclusive',
|
self.router(router_type='exclusive',
|
||||||
external_gateway_info={'network_id':
|
external_gateway_info={'network_id':
|
||||||
ext_net['network']['id']}) as router,\
|
ext_net['network']['id']}) as router,\
|
||||||
self.subnet() as sub:
|
self.subnet(cidr="20.0.0.0/24") as sub:
|
||||||
# add an interface to the router
|
# add an interface to the router
|
||||||
self.l3plugin.add_router_interface(
|
self.l3plugin.add_router_interface(
|
||||||
self.context,
|
self.context,
|
||||||
@ -275,7 +275,7 @@ class TestVpnaasDriver(test_plugin.NsxVPluginV2TestCase):
|
|||||||
self.router(router_type='shared',
|
self.router(router_type='shared',
|
||||||
external_gateway_info={'network_id':
|
external_gateway_info={'network_id':
|
||||||
ext_net['network']['id']}) as router,\
|
ext_net['network']['id']}) as router,\
|
||||||
self.subnet() as sub:
|
self.subnet(cidr="20.0.0.0/24") as sub:
|
||||||
# add an interface to the router
|
# add an interface to the router
|
||||||
self.l3plugin.add_router_interface(
|
self.l3plugin.add_router_interface(
|
||||||
self.context,
|
self.context,
|
||||||
@ -320,7 +320,7 @@ class TestVpnaasDriver(test_plugin.NsxVPluginV2TestCase):
|
|||||||
self.router(router_type='exclusive',
|
self.router(router_type='exclusive',
|
||||||
external_gateway_info={'network_id':
|
external_gateway_info={'network_id':
|
||||||
ext_net['network']['id']}) as router,\
|
ext_net['network']['id']}) as router,\
|
||||||
self.subnet() as sub:
|
self.subnet(cidr="20.0.0.0/24") as sub:
|
||||||
# add an interface to the router
|
# add an interface to the router
|
||||||
self.l3plugin.add_router_interface(
|
self.l3plugin.add_router_interface(
|
||||||
self.context,
|
self.context,
|
||||||
|
Loading…
x
Reference in New Issue
Block a user