From e95b4a25678fd47deb96697e7df41e1ae23dd7fd Mon Sep 17 00:00:00 2001 From: Gary Kotton Date: Sun, 10 Apr 2016 00:06:46 -0700 Subject: [PATCH] [Tempest: use project instead of tenant Change-Id: I4851d82e6d3efb65637bd4e63ec1ce9eb6a992b9 --- .../tests/nsxv/api/base_provider.py | 8 ++++---- .../tests/nsxv/api/test_l2_gateway_connection.py | 4 ++-- .../tests/nsxv/api/test_router_types.py | 4 ++-- .../tests/nsxv/api/test_subnets.py | 16 ++++++++-------- .../nsxv/scenario/manager_topo_deployment.py | 8 ++++---- .../tests/nsxv3/api/test_nsx_security_groups.py | 2 +- 6 files changed, 21 insertions(+), 21 deletions(-) diff --git a/vmware_nsx_tempest/tests/nsxv/api/base_provider.py b/vmware_nsx_tempest/tests/nsxv/api/base_provider.py index c543000c3d..a2b1dadc1b 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/base_provider.py +++ b/vmware_nsx_tempest/tests/nsxv/api/base_provider.py @@ -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: diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway_connection.py b/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway_connection.py index 7c167d426c..b5c6c2b588 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway_connection.py +++ b/vmware_nsx_tempest/tests/nsxv/api/test_l2_gateway_connection.py @@ -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): diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_router_types.py b/vmware_nsx_tempest/tests/nsxv/api/test_router_types.py index f5d5f357c7..467f06ecbe 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_router_types.py +++ b/vmware_nsx_tempest/tests/nsxv/api/test_router_types.py @@ -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( diff --git a/vmware_nsx_tempest/tests/nsxv/api/test_subnets.py b/vmware_nsx_tempest/tests/nsxv/api/test_subnets.py index 0f5c9b821a..80d3be3d0d 100644 --- a/vmware_nsx_tempest/tests/nsxv/api/test_subnets.py +++ b/vmware_nsx_tempest/tests/nsxv/api/test_subnets.py @@ -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 diff --git a/vmware_nsx_tempest/tests/nsxv/scenario/manager_topo_deployment.py b/vmware_nsx_tempest/tests/nsxv/scenario/manager_topo_deployment.py index 67e958eed0..1527adabd2 100644 --- a/vmware_nsx_tempest/tests/nsxv/scenario/manager_topo_deployment.py +++ b/vmware_nsx_tempest/tests/nsxv/scenario/manager_topo_deployment.py @@ -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: diff --git a/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_security_groups.py b/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_security_groups.py index 23e3386a8e..e26fe4c2ff 100644 --- a/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_security_groups.py +++ b/vmware_nsx_tempest/tests/nsxv3/api/test_nsx_security_groups.py @@ -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):