Impactor_ussuri
Change-Id: I516419816e401900aee5b39b198cbc796a4f3849
This commit is contained in:
parent
cf22adca2c
commit
2bee8f7e34
|
@ -241,11 +241,14 @@ class NSXPClient(object):
|
||||||
locale_service = self.get_logical_router_local_services(os_name,
|
locale_service = self.get_logical_router_local_services(os_name,
|
||||||
os_uuid)
|
os_uuid)
|
||||||
vpn_service = self.get_vpn_service(os_name, os_uuid)
|
vpn_service = self.get_vpn_service(os_name, os_uuid)
|
||||||
endpoint = "tier-1s/%s/locale-services/%s/ipsec-vpn-services/%s/ \
|
if vpn_service:
|
||||||
local-endpoints" % (router["id"],
|
endpoint = 'tier-1s/%s/locale-services/%s/ipsec-vpn-services/' % \
|
||||||
locale_service[0].get("id"),
|
(router["id"], locale_service[0].get("id"))
|
||||||
vpn_service[0].get("id"))
|
endpoint = str(endpoint) + '%s/local-endpoints' % \
|
||||||
return self.get_logical_resources(endpoint)
|
(vpn_service[0].get("id"))
|
||||||
|
return self.get_logical_resources(endpoint)
|
||||||
|
else:
|
||||||
|
return None
|
||||||
|
|
||||||
def get_ipsec_session(self, os_name, os_uuid):
|
def get_ipsec_session(self, os_name, os_uuid):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -95,12 +95,13 @@ class TestVpnOps(feature_manager.FeatureManager):
|
||||||
return dict(network=network, subnet=subnet, router=router)
|
return dict(network=network, subnet=subnet, router=router)
|
||||||
|
|
||||||
def create_vpn_basic_topo_endpoint_group(
|
def create_vpn_basic_topo_endpoint_group(
|
||||||
self, network_topology, name=None, ike=None, pfs=constants.PFS,
|
self, network_topology, name=None, ike=None,
|
||||||
encryption_algorithm=constants.ENCRYPTION_ALGO,
|
pfs=constants.PFS,
|
||||||
lifetime=constants.LIFETIME,
|
encryption_algorithm=constants.ENCRYPTION_ALGO,
|
||||||
peer_address=constants.PEER_ADDRESS,
|
lifetime=constants.LIFETIME,
|
||||||
peer_id=constants.PEER_ID,
|
peer_address=constants.PEER_ADDRESS,
|
||||||
site_connection_state=constants.SITE_CONNECTION_STATE):
|
peer_id=constants.PEER_ID,
|
||||||
|
site_connection_state=constants.SITE_CONNECTION_STATE):
|
||||||
# Create network topo
|
# Create network topo
|
||||||
kwargs = {}
|
kwargs = {}
|
||||||
subnet = network_topology['subnet']
|
subnet = network_topology['subnet']
|
||||||
|
@ -445,8 +446,8 @@ class TestVpnOps(feature_manager.FeatureManager):
|
||||||
try:
|
try:
|
||||||
local_endpoints = self.nsxp_client.get_local_endpoint(
|
local_endpoints = self.nsxp_client.get_local_endpoint(
|
||||||
router["name"], router["id"])
|
router["name"], router["id"])
|
||||||
self.assertNone(local_endpoints)
|
self.assertFalse(local_endpoints)
|
||||||
except IndexError:
|
except exceptions.ServerFault:
|
||||||
raise Exception('local endpoint not deleted from backend')
|
raise Exception('local endpoint not deleted from backend')
|
||||||
else:
|
else:
|
||||||
local_endpoints = self.nsx_client.get_local_endpoints()
|
local_endpoints = self.nsx_client.get_local_endpoints()
|
||||||
|
@ -911,7 +912,7 @@ class TestVpnOps(feature_manager.FeatureManager):
|
||||||
self.assertEqual(ipsec_session[0].get('resource_type'),
|
self.assertEqual(ipsec_session[0].get('resource_type'),
|
||||||
'PolicyBasedIPSecVpnSession')
|
'PolicyBasedIPSecVpnSession')
|
||||||
nsx_router = self.nsxp_client.get_logical_router(router["name"],
|
nsx_router = self.nsxp_client.get_logical_router(router["name"],
|
||||||
router["id"])
|
router["id"])
|
||||||
vpn_service = self.nsxp_client.get_vpn_service(router["name"],
|
vpn_service = self.nsxp_client.get_vpn_service(router["name"],
|
||||||
router["id"])
|
router["id"])
|
||||||
self.assertEqual(vpn_service[0].get('tags')[0].get("tag"),
|
self.assertEqual(vpn_service[0].get('tags')[0].get("tag"),
|
||||||
|
@ -930,7 +931,7 @@ class TestVpnOps(feature_manager.FeatureManager):
|
||||||
self.assertEqual(ipsec_session[0].get('resource_type'),
|
self.assertEqual(ipsec_session[0].get('resource_type'),
|
||||||
'PolicyBasedIPSecVpnSession')
|
'PolicyBasedIPSecVpnSession')
|
||||||
nsx_router = self.nsxp_client.get_logical_router(router["name"],
|
nsx_router = self.nsxp_client.get_logical_router(router["name"],
|
||||||
router["id"])
|
router["id"])
|
||||||
vpn_service = self.nsxp_client.get_vpn_service(router["name"],
|
vpn_service = self.nsxp_client.get_vpn_service(router["name"],
|
||||||
router["id"])
|
router["id"])
|
||||||
self.assertEqual(vpn_service[0].get('tags')[0].get("tag"),
|
self.assertEqual(vpn_service[0].get('tags')[0].get("tag"),
|
||||||
|
|
|
@ -68,8 +68,6 @@ class IPv6RoutersTest(feature_manager.FeatureManager):
|
||||||
subnet = self.create_topology_subnet(
|
subnet = self.create_topology_subnet(
|
||||||
subnet_name, network,
|
subnet_name, network,
|
||||||
subnets_client=subnet_client,
|
subnets_client=subnet_client,
|
||||||
ipv6_address_mode=ipv6_address_mode,
|
|
||||||
ipv6_ra_mode=ipv6_ra_mode,
|
|
||||||
ip_version=6, enable_dhcp=True,
|
ip_version=6, enable_dhcp=True,
|
||||||
cidr=cidr, router_id=router_id)
|
cidr=cidr, router_id=router_id)
|
||||||
return subnet
|
return subnet
|
||||||
|
|
|
@ -396,12 +396,12 @@ class TestRouterNoNATOps(manager.NetworkScenarioTest):
|
||||||
if CONF.network.backend == 'nsxp':
|
if CONF.network.backend == 'nsxp':
|
||||||
route_adv_type_nat = 'TIER1_NAT' in nsx_router_policy[
|
route_adv_type_nat = 'TIER1_NAT' in nsx_router_policy[
|
||||||
'route_advertisement_types']
|
'route_advertisement_types']
|
||||||
self.assertTrue(
|
self.assertFalse(
|
||||||
route_adv_type_nat,
|
route_adv_type_nat,
|
||||||
nat_msg)
|
nat_msg)
|
||||||
route_adv_type_conn = 'TIER1_CONNECTED' in nsx_router_policy[
|
route_adv_type_conn = 'TIER1_CONNECTED' in nsx_router_policy[
|
||||||
'route_advertisement_types']
|
'route_advertisement_types']
|
||||||
self.assertFalse(route_adv_type_conn, adv_msg)
|
self.assertTrue(route_adv_type_conn, adv_msg)
|
||||||
else:
|
else:
|
||||||
self.assertFalse(router_adv['advertise_nat_routes'], nat_msg)
|
self.assertFalse(router_adv['advertise_nat_routes'], nat_msg)
|
||||||
self.assertTrue(
|
self.assertTrue(
|
||||||
|
|
Loading…
Reference in New Issue