summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinda Wang <wangwulin@huawei.com>2017-12-27 01:35:01 +0000
committerLinda Wang <wangwulin@huawei.com>2017-12-27 02:24:25 +0000
commit6c466ea8e3fe2818f5efd0191d081ddf917b947d (patch)
treebad20eff4f59b2124615a2742fc001a203135c09
parentc411e0a16b804792c1b34cc819618e1bfbca3d9a (diff)
Config physical network when creating tempest net
When the network_type is vlan, physical_network and segmentation_id could be configured. This also supports to config physical network when creating rally net. Change-Id: I9770968537c1509c5712eada66925a4bf8f6678c Signed-off-by: Linda Wang <wangwulin@huawei.com>
-rw-r--r--functest/ci/config_functest.yaml6
-rw-r--r--functest/opnfv_tests/openstack/rally/rally.py18
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py18
3 files changed, 42 insertions, 0 deletions
diff --git a/functest/ci/config_functest.yaml b/functest/ci/config_functest.yaml
index a40d80f20..608d5470e 100644
--- a/functest/ci/config_functest.yaml
+++ b/functest/ci/config_functest.yaml
@@ -122,6 +122,9 @@ tempest:
ssh_timeout: 130
object_storage:
operator_role: SwiftOperator
+ # network_type: vlan
+ # physical_network: physnet2
+ # segmentation_id: 2366
private_net_name: tempest-net
private_subnet_name: tempest-subnet
private_subnet_cidr: 192.168.150.0/24
@@ -132,6 +135,9 @@ tempest:
rally:
deployment_name: opnfv-rally
network_name: rally-net
+ # network_type: vlan
+ # physical_network: physnet2
+ # segmentation_id: 2366
subnet_name: rally-subnet
subnet_cidr: 192.168.140.0/24
router_name: rally-router
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index c16e6d13a..eefd3eb46 100644
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -492,10 +492,28 @@ class RallyBase(testcase.TestCase):
self.creators.append(image_creator)
LOGGER.debug("Creating network '%s'...", network_name)
+
+ rally_network_type = None
+ rally_physical_network = None
+ rally_segmentation_id = None
+
+ if hasattr(CONST, 'rally_network_type'):
+ rally_network_type = CONST.__getattribute__(
+ 'rally_network_type')
+ if hasattr(CONST, 'rally_physical_network'):
+ rally_physical_network = CONST.__getattribute__(
+ 'rally_physical_network')
+ if hasattr(CONST, 'rally_segmentation_id'):
+ rally_segmentation_id = CONST.__getattribute__(
+ 'rally_segmentation_id')
+
network_creator = deploy_utils.create_network(
self.os_creds, NetworkConfig(
name=network_name,
shared=True,
+ network_type=rally_network_type,
+ physical_network=rally_physical_network,
+ segmentation_id=rally_segmentation_id,
subnet_settings=[SubnetConfig(
name=subnet_name,
cidr=self.RALLY_PRIVATE_SUBNET_CIDR)
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index 58882b990..5481b13b1 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -363,11 +363,29 @@ class TempestResourcesManager(object):
user_id = None
logger.debug("Creating private network for Tempest suite")
+
+ tempest_network_type = None
+ tempest_physical_network = None
+ tempest_segmentation_id = None
+
+ if hasattr(CONST, 'tempest_network_type'):
+ tempest_network_type = CONST.__getattribute__(
+ 'tempest_network_type')
+ if hasattr(CONST, 'tempest_physical_network'):
+ tempest_physical_network = CONST.__getattribute__(
+ 'tempest_physical_network')
+ if hasattr(CONST, 'tempest_segmentation_id'):
+ tempest_segmentation_id = CONST.__getattribute__(
+ 'tempest_segmentation_id')
+
network_creator = deploy_utils.create_network(
self.os_creds, NetworkConfig(
name=CONST.__getattribute__(
'tempest_private_net_name') + self.guid,
project_name=project_name,
+ network_type=tempest_network_type,
+ physical_network=tempest_physical_network,
+ segmentation_id=tempest_segmentation_id,
subnet_settings=[SubnetConfig(
name=CONST.__getattribute__(
'tempest_private_subnet_name') + self.guid,