summaryrefslogtreecommitdiffstats
path: root/functest/opnfv_tests/openstack/tempest/tempest.py
diff options
context:
space:
mode:
authorJuha Kosonen <juha.kosonen@nokia.com>2018-02-19 11:18:11 +0200
committerJuha Kosonen <juha.kosonen@nokia.com>2018-02-19 11:18:11 +0200
commitdf3843843c4449585550e8a0bb8fcc79b43b7871 (patch)
tree21a21dad3ae049343aab2e58d30f6f80be0e09a3 /functest/opnfv_tests/openstack/tempest/tempest.py
parent1ea6bca515a9a4bd9f21a87337f74bf4e41018dd (diff)
Enhance variable manipulation in tempest
Use getattr/setattr to read/write CONST. JIRA: FUNCTEST-932 Change-Id: Ic9a944100c60563b16f5d89b622ef7f04183cceb Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>
Diffstat (limited to 'functest/opnfv_tests/openstack/tempest/tempest.py')
-rw-r--r--functest/opnfv_tests/openstack/tempest/tempest.py79
1 files changed, 34 insertions, 45 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/tempest.py b/functest/opnfv_tests/openstack/tempest/tempest.py
index c19c8d9d..5148d114 100644
--- a/functest/opnfv_tests/openstack/tempest/tempest.py
+++ b/functest/opnfv_tests/openstack/tempest/tempest.py
@@ -320,21 +320,16 @@ class TempestResourcesManager(object):
self.os_creds = kwargs.get('os_creds') or snaps_utils.get_credentials()
self.guid = '-' + str(uuid.uuid4())
self.creators = list()
-
- if hasattr(CONST, 'snaps_images_cirros'):
- self.cirros_image_config = CONST.__getattribute__(
- 'snaps_images_cirros')
- else:
- self.cirros_image_config = None
+ self.cirros_image_config = getattr(CONST, 'snaps_images_cirros', None)
def _create_project(self):
"""Create project for tests."""
project_creator = deploy_utils.create_project(
self.os_creds, ProjectConfig(
- name=CONST.__getattribute__(
- 'tempest_identity_tenant_name') + self.guid,
- description=CONST.__getattribute__(
- 'tempest_identity_tenant_description')))
+ name=getattr(
+ CONST, 'tempest_identity_tenant_name') + self.guid,
+ description=getattr(
+ CONST, 'tempest_identity_tenant_description')))
if project_creator is None or project_creator.get_project() is None:
raise Exception("Failed to create tenant")
self.creators.append(project_creator)
@@ -344,12 +339,12 @@ class TempestResourcesManager(object):
"""Create user for tests."""
user_creator = deploy_utils.create_user(
self.os_creds, UserConfig(
- name=CONST.__getattribute__(
- 'tempest_identity_user_name') + self.guid,
- password=CONST.__getattribute__(
- 'tempest_identity_user_password'),
- project_name=CONST.__getattribute__(
- 'tempest_identity_tenant_name') + self.guid))
+ name=getattr(
+ CONST, 'tempest_identity_user_name') + self.guid,
+ password=getattr(
+ CONST, 'tempest_identity_user_password'),
+ project_name=getattr(
+ CONST, 'tempest_identity_tenant_name') + self.guid))
if user_creator is None or user_creator.get_user() is None:
raise Exception("Failed to create user")
self.creators.append(user_creator)
@@ -361,18 +356,14 @@ class TempestResourcesManager(object):
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')
-
- tempest_net_name = CONST.__getattribute__(
- 'tempest_private_net_name') + self.guid
+ tempest_network_type = getattr(
+ CONST, 'tempest_network_type', None)
+ tempest_physical_network = getattr(
+ CONST, 'tempest_physical_network', None)
+ tempest_segmentation_id = getattr(
+ CONST, 'tempest_segmentation_id', None)
+ tempest_net_name = getattr(
+ CONST, 'tempest_private_net_name') + self.guid
network_creator = deploy_utils.create_network(
self.os_creds, NetworkConfig(
@@ -382,11 +373,11 @@ class TempestResourcesManager(object):
physical_network=tempest_physical_network,
segmentation_id=tempest_segmentation_id,
subnet_settings=[SubnetConfig(
- name=CONST.__getattribute__(
- 'tempest_private_subnet_name') + self.guid,
+ name=getattr(
+ CONST, 'tempest_private_subnet_name') + self.guid,
project_name=project_name,
- cidr=CONST.__getattribute__(
- 'tempest_private_subnet_cidr'))]))
+ cidr=getattr(
+ CONST, 'tempest_private_subnet_cidr'))]))
if network_creator is None or network_creator.get_network() is None:
raise Exception("Failed to create private network")
self.creators.append(network_creator)
@@ -413,9 +404,9 @@ class TempestResourcesManager(object):
flavor_creator = OpenStackFlavor(
self.os_creds, FlavorConfig(
name=name,
- ram=CONST.__getattribute__('openstack_flavor_ram'),
- disk=CONST.__getattribute__('openstack_flavor_disk'),
- vcpus=CONST.__getattribute__('openstack_flavor_vcpus'),
+ ram=getattr(CONST, 'openstack_flavor_ram'),
+ disk=getattr(CONST, 'openstack_flavor_disk'),
+ vcpus=getattr(CONST, 'openstack_flavor_vcpus'),
metadata=flavor_metadata))
flavor = flavor_creator.create()
if flavor is None:
@@ -437,8 +428,8 @@ class TempestResourcesManager(object):
if create_project:
LOGGER.debug("Creating project and user for Tempest suite")
- project_name = CONST.__getattribute__(
- 'tempest_identity_tenant_name') + self.guid
+ project_name = getattr(
+ CONST, 'tempest_identity_tenant_name') + self.guid
result['project_id'] = self._create_project()
result['user_id'] = self._create_user()
result['tenant_id'] = result['project_id'] # for compatibility
@@ -447,28 +438,26 @@ class TempestResourcesManager(object):
result['tempest_net_name'] = self._create_network(project_name)
LOGGER.debug("Creating image for Tempest suite")
- image_name = CONST.__getattribute__('openstack_image_name') + self.guid
+ image_name = getattr(CONST, 'openstack_image_name') + self.guid
result['image_id'] = self._create_image(image_name)
if use_custom_images:
LOGGER.debug("Creating 2nd image for Tempest suite")
- image_name = CONST.__getattribute__(
- 'openstack_image_name_alt') + self.guid
+ image_name = getattr(CONST, 'openstack_image_name_alt') + self.guid
result['image_id_alt'] = self._create_image(image_name)
- if (CONST.__getattribute__('tempest_use_custom_flavors') == 'True' or
+ if (getattr(CONST, 'tempest_use_custom_flavors') == 'True' or
use_custom_flavors):
LOGGER.info("Creating flavor for Tempest suite")
- name = CONST.__getattribute__('openstack_flavor_name') + self.guid
+ name = getattr(CONST, 'openstack_flavor_name') + self.guid
result['flavor_id'] = self._create_flavor(name)
if use_custom_flavors:
LOGGER.info("Creating 2nd flavor for Tempest suite")
scenario = env.get('DEPLOY_SCENARIO')
if 'ovs' in scenario or 'fdio' in scenario:
- CONST.__setattr__('openstack_flavor_ram', 1024)
- name = CONST.__getattribute__(
- 'openstack_flavor_name_alt') + self.guid
+ setattr(CONST, 'openstack_flavor_ram', 1024)
+ name = getattr(CONST, 'openstack_flavor_name_alt') + self.guid
result['flavor_id_alt'] = self._create_flavor(name)
return result