X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fopenstack%2Frally%2Frally.py;h=2b775bca0d37eda2563d5510ab67f93dca06064f;hb=294d5c5590426b44a20b7feb55ac60dfe9b4898b;hp=5c7acfded671c962fd44fa66bbaf7c697c5f6219;hpb=deb36ab8bd9e5f477ee2c0a098ce44567c496e5e;p=functest.git diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index 5c7acfded..2b775bca0 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -44,7 +44,7 @@ class RallyBase(testcase.TestCase): """Base class form Rally testcases implementation.""" # pylint: disable=too-many-instance-attributes - TESTS = ['authenticate', 'glance', 'ceilometer', 'cinder', 'heat', + TESTS = ['authenticate', 'glance', 'cinder', 'heat', 'keystone', 'neutron', 'nova', 'quotas', 'vm', 'all'] GLANCE_IMAGE_NAME = getattr(config.CONF, 'openstack_image_name') GLANCE_IMAGE_FILENAME = getattr(config.CONF, 'openstack_image_file_name') @@ -53,7 +53,7 @@ class RallyBase(testcase.TestCase): GLANCE_IMAGE_FORMAT = getattr(config.CONF, 'openstack_image_disk_format') GLANCE_IMAGE_USERNAME = getattr(config.CONF, 'openstack_image_username') GLANCE_IMAGE_EXTRA_PROPERTIES = getattr( - config.CONF, 'openstack_extra_properties', {}) + config.CONF, 'image_properties', {}) FLAVOR_NAME = getattr(config.CONF, 'rally_flavor_name') FLAVOR_ALT_NAME = getattr(config.CONF, 'rally_flavor_alt_name') FLAVOR_RAM = 512 @@ -189,7 +189,7 @@ class RallyBase(testcase.TestCase): return False for result in report.get('result'): - if result is None or len(result.get('error')) > 0: + if result is None or result.get('error'): return False return True @@ -464,7 +464,8 @@ class RallyBase(testcase.TestCase): segmentation_id=rally_segmentation_id, subnet_settings=[SubnetConfig( name=subnet_name, - cidr=self.RALLY_PRIVATE_SUBNET_CIDR)])) + cidr=self.RALLY_PRIVATE_SUBNET_CIDR, + dns_nameservers=[env.get('NAMESERVER')])])) if network_creator is None: raise Exception("Failed to create private network") self.priv_net_id = network_creator.get_network().id