x/vmware-nsx
Code Issues Proposed changes

[Tempest: use project instead of tenant

Browse Source 
Change-Id: I4851d82e6d3efb65637bd4e63ec1ce9eb6a992b9
This commit is contained in:
Gary Kotton 2016-04-10 00:06:46 -07:00
parent af3bfdd403
commit e95b4a2567
6 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vmware_nsx_tempest/tests/nsxv/api/base_provider.py
View File

@ -137,12 +137,12 @@ def get_subnet_create_options(network_id, ip_version=4,
gateway_not_set = (gateway == '')
if ip_version == 4:
cidr = cidr or netaddr.IPNetwork(CONF.network.tenant_network_cidr)
mask_bits = mask_bits or CONF.network.tenant_network_mask_bits
cidr = cidr or netaddr.IPNetwork(CONF.network.project_network_cidr)
mask_bits = mask_bits or CONF.network.project_network_mask_bits
elif ip_version == 6:
cidr = (
cidr or netaddr.IPNetwork(CONF.network.tenant_network_v6_cidr))
mask_bits = mask_bits or CONF.network.tenant_network_v6_mask_bits
cidr or netaddr.IPNetwork(CONF.network.project_network_v6_cidr))
mask_bits = mask_bits or CONF.network.project_network_v6_mask_bits
# Find a cidr that is not in use yet and create a subnet with it
subnet_list = []
if cidr_offset > 0:

4
vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway_connection.py
View File

@ -127,9 +127,9 @@ class L2GatewayConnectionTest(base.BaseAdminNetworkTest):
def get_ipaddress_from_tempest_conf(cls, ip_version=4):
"""Return first subnet gateway for configured CIDR."""
if ip_version == 4:
cidr = netaddr.IPNetwork(CONF.network.tenant_network_cidr)
cidr = netaddr.IPNetwork(CONF.network.project_network_cidr)
elif ip_version == 6:
cidr = netaddr.IPNetwork(CONF.network.tenant_network_v6_cidr)
cidr = netaddr.IPNetwork(CONF.network.project_network_v6_cidr)
return netaddr.IPAddress(cidr)
def get_segmentation_id(self, _l2gw, d_idx=0, i_idx=0):

4
vmware_nsx_tempest/tests/nsxv/api/test_router_types.py
View File

@ -48,9 +48,9 @@ class ExcRouterTest(base.BaseRouterTest):
@classmethod
def resource_setup(cls):
super(ExcRouterTest, cls).resource_setup()
cls.tenant_cidr = (CONF.network.tenant_network_cidr
cls.tenant_cidr = (CONF.network.project_network_cidr
if cls._ip_version == 4 else
CONF.network.tenant_network_v6_cidr)
CONF.network.project_network_v6_cidr)
manager_ip = re.search(r"(\d{1,3}\.){3}\d{1,3}",
CONF.nsxv.manager_uri).group(0)
cls.vsm = nsxv_client.VSMClient(

16
vmware_nsx_tempest/tests/nsxv/api/test_subnets.py
View File

@ -111,11 +111,11 @@ class SubnetTestJSON(base.BaseAdminNetworkTest):
create the subnet with that derived CIDR
"""
if ip_version == 4:
cidr = netaddr.IPNetwork(CONF.network.tenant_network_cidr)
mask_bits = CONF.network.tenant_network_mask_bits
cidr = netaddr.IPNetwork(CONF.network.project_network_cidr)
mask_bits = CONF.network.project_network_mask_bits
elif ip_version == 6:
cidr = netaddr.IPNetwork(CONF.network.tenant_network_v6_cidr)
mask_bits = CONF.network.tenant_network_v6_mask_bits
cidr = netaddr.IPNetwork(CONF.network.project_network_v6_cidr)
mask_bits = CONF.network.project_network_v6_mask_bits
subnet_cidr = list(cidr.subnet(mask_bits))[-1]
gateway_ip = str(netaddr.IPAddress(subnet_cidr) + 1)
@ -127,11 +127,11 @@ class SubnetTestJSON(base.BaseAdminNetworkTest):
def _get_gateway_from_tempest_conf(cls, ip_version):
"""Return first subnet gateway for configured CIDR."""
if ip_version == 4:
cidr = netaddr.IPNetwork(CONF.network.tenant_network_cidr)
mask_bits = CONF.network.tenant_network_mask_bits
cidr = netaddr.IPNetwork(CONF.network.project_network_cidr)
mask_bits = CONF.network.project_network_mask_bits
elif ip_version == 6:
cidr = netaddr.IPNetwork(CONF.network.tenant_network_v6_cidr)
mask_bits = CONF.network.tenant_network_v6_mask_bits
cidr = netaddr.IPNetwork(CONF.network.project_network_v6_cidr)
mask_bits = CONF.network.project_network_v6_mask_bits
if mask_bits >= cidr.prefixlen:
return netaddr.IPAddress(cidr) + 1

8
vmware_nsx_tempest/tests/nsxv/scenario/manager_topo_deployment.py
View File

@ -641,12 +641,12 @@ def get_subnet_create_options(network_id, ip_version=4,
gateway_not_set = gateway == ''
if ip_version == 4:
cidr = cidr or netaddr.IPNetwork(CONF.network.tenant_network_cidr)
mask_bits = mask_bits or CONF.network.tenant_network_mask_bits
cidr = cidr or netaddr.IPNetwork(CONF.network.project_network_cidr)
mask_bits = mask_bits or CONF.network.project_network_mask_bits
elif ip_version == 6:
cidr = (
cidr or netaddr.IPNetwork(CONF.network.tenant_network_v6_cidr))
mask_bits = mask_bits or CONF.network.tenant_network_v6_mask_bits
cidr or netaddr.IPNetwork(CONF.network.project_network_v6_cidr))
mask_bits = mask_bits or CONF.network.project_network_v6_mask_bits
# Find a cidr that is not in use yet and create a subnet with it
subnet_list = []
if cidr_offset > 0:

2
vmware_nsx_tempest/tests/nsxv3/api/test_nsx_security_groups.py
View File

@ -34,7 +34,7 @@ NSX_FIREWALL_REALIZED_DELAY = 2
class NSXv3SecGroupTest(base.BaseSecGroupTest):
_tenant_network_cidr = CONF.network.tenant_network_cidr
_tenant_network_cidr = CONF.network.project_network_cidr
@classmethod
def skip_checks(cls):