From 6c466ea8e3fe2818f5efd0191d081ddf917b947d Mon Sep 17 00:00:00 2001 From: Linda Wang Date: Wed, 27 Dec 2017 01:35:01 +0000 Subject: 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 --- functest/opnfv_tests/openstack/rally/rally.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'functest/opnfv_tests/openstack/rally') 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) -- cgit 1.2.3-korg