diff options
Diffstat (limited to 'functest/opnfv_tests')
6 files changed, 11 insertions, 49 deletions
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index 64382ded8..8c482545d 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -66,7 +66,6 @@ class RallyBase(testcase.OSGCTestCase): BLACKLIST_FILE = os.path.join(RALLY_DIR, "blacklist.txt") TEMP_DIR = os.path.join(RALLY_DIR, "var") - CINDER_VOLUME_TYPE_NAME = "volume_test" RALLY_PRIVATE_NET_NAME = CONST.__getattribute__('rally_network_name') RALLY_PRIVATE_SUBNET_NAME = CONST.__getattribute__('rally_subnet_name') RALLY_PRIVATE_SUBNET_CIDR = CONST.__getattribute__('rally_subnet_cidr') @@ -80,9 +79,7 @@ class RallyBase(testcase.OSGCTestCase): self.scenario_dir = '' self.nova_client = os_utils.get_nova_client() self.neutron_client = os_utils.get_neutron_client() - self.cinder_client = os_utils.get_cinder_client() self.network_dict = {} - self.volume_type = None self.smoke = None self.test_name = None self.image_exists = None @@ -448,20 +445,6 @@ class RallyBase(testcase.OSGCTestCase): if self.test_name not in self.TESTS: raise Exception("Test name '%s' is invalid" % self.test_name) - volume_types = os_utils.list_volume_types(self.cinder_client, - private=False) - if volume_types: - LOGGER.debug("Using existing volume type(s)...") - else: - LOGGER.debug('Creating volume type...') - self.volume_type = os_utils.create_volume_type( - self.cinder_client, self.CINDER_VOLUME_TYPE_NAME) - if self.volume_type is None: - raise Exception("Failed to create volume type '%s'" % - self.CINDER_VOLUME_TYPE_NAME) - LOGGER.debug("Volume type '%s' is created succesfully.", - self.CINDER_VOLUME_TYPE_NAME) - LOGGER.debug('Getting or creating image...') self.image_exists, self.image_id = os_utils.get_or_create_image( self.GLANCE_IMAGE_NAME, @@ -562,10 +545,6 @@ class RallyBase(testcase.OSGCTestCase): self.case_name, success_rate) def _clean_up(self): - if self.volume_type: - LOGGER.debug("Deleting volume type '%s'...", self.volume_type) - os_utils.delete_volume_type(self.cinder_client, self.volume_type) - if not self.image_exists: LOGGER.debug("Deleting image '%s' with ID '%s'...", self.GLANCE_IMAGE_NAME, self.image_id) diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml index e844e33f6..5f46f5192 100644 --- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml +++ b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml @@ -101,7 +101,6 @@ CinderVolumes.create_snapshot_and_attach_volume: - args: - volume_type: false size: min: 1 max: 5 @@ -119,26 +118,6 @@ {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} sla: {{ no_failures_sla() }} - - - args: - volume_type: true - size: - min: 1 - max: 5 - context: - {% call user_context(tenants_amount, users_amount, use_existing_users) %} - quotas: - {{ unlimited_volumes() }} - servers: - {{ vm_params(image_name,flavor_name,none)|indent(2,true) }} - servers_per_tenant: 2 - auto_assign_nic: true - network: {} - {% endcall %} - runner: - {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }} - sla: - {{ no_failures_sla() }} CinderVolumes.create_volume: - diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py index c8c2c509c..f9548eb2c 100644 --- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py +++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py @@ -412,7 +412,7 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase): @energy.enable_recording def run(self, **kwargs): """Execute CloudifyIms test case.""" - super(CloudifyIms, self).run(**kwargs) + return super(CloudifyIms, self).run(**kwargs) # ---------------------------------------------------------- diff --git a/functest/opnfv_tests/vnf/ims/orchestra.yaml b/functest/opnfv_tests/vnf/ims/orchestra.yaml index 4cd18e72b..457ca90e1 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra.yaml +++ b/functest/opnfv_tests/vnf/ims/orchestra.yaml @@ -29,7 +29,7 @@ mano: orchestra_openims: name: OpenIMS descriptor: - url: http://marketplace.openbaton.org:8082/api/v1/nsds/fokus/OpenImsCore/3.2.0/json + url: http://marketplace.openbaton.org:8080/api/v1/nsds/fokus/OpenImsCore/3.2.0/json requirements: flavor: name: m1.small @@ -51,7 +51,7 @@ orchestra_openims: orchestra_clearwaterims: name: Clearwater IMS descriptor: - url: http://marketplace.openbaton.org:8082/api/v1/nsds/fokus/ClearwaterIMS/3.2.0/json + url: http://marketplace.openbaton.org:8080/api/v1/nsds/fokus/ClearwaterIMS/3.2.0/json requirements: flavor: name: m1.small diff --git a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py index c924a3470..5b2e585ed 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py @@ -130,6 +130,8 @@ def get_userdata(orchestrator=dict): orchestrator['gvnfm']['userdata']['url']) userdata += "sed -i '113i"'\ \ \ \ '"sleep 60' " \ "/etc/openbaton/openbaton-vnfm-generic-user-data.sh\n" + userdata += ("sed -i s/nfvo.marketplace.port=8082/nfvo.marketplace." + "port=8080/g /etc/openbaton/openbaton-nfvo.properties\n") userdata += "echo \"Starting NFVO\"\n" userdata += "service openbaton-nfvo restart\n" userdata += "echo \"Starting Generic VNFM\"\n" @@ -141,13 +143,13 @@ def get_userdata(orchestrator=dict): class ClearwaterImsVnf(vnf.VnfOnBoarding): """Clearwater IMS VNF deployed with openBaton orchestrator""" - logger = logging.getLogger(__name__) + # logger = logging.getLogger(__name__) def __init__(self, **kwargs): if "case_name" not in kwargs: kwargs["case_name"] = "orchestra_clearwaterims" super(ClearwaterImsVnf, self).__init__(**kwargs) - # self.logger = logging.getLogger("functest.ci.run_tests.orchestra") + self.logger = logging.getLogger("functest.ci.run_tests.orchestra") self.logger.info("kwargs %s", (kwargs)) self.case_dir = pkg_resources.resource_filename( diff --git a/functest/opnfv_tests/vnf/ims/orchestra_openims.py b/functest/opnfv_tests/vnf/ims/orchestra_openims.py index aae35146f..fa700890c 100644 --- a/functest/opnfv_tests/vnf/ims/orchestra_openims.py +++ b/functest/opnfv_tests/vnf/ims/orchestra_openims.py @@ -130,6 +130,8 @@ def get_userdata(orchestrator=dict): orchestrator['gvnfm']['userdata']['url']) userdata += "sed -i '113i"'\ \ \ \ '"sleep 60' " \ "/etc/openbaton/openbaton-vnfm-generic-user-data.sh\n" + userdata += ("sed -i s/nfvo.marketplace.port=8082/nfvo.marketplace." + "port=8080/g /etc/openbaton/openbaton-nfvo.properties\n") userdata += "echo \"Starting NFVO\"\n" userdata += "service openbaton-nfvo restart\n" userdata += "echo \"Starting Generic VNFM\"\n" @@ -141,13 +143,13 @@ def get_userdata(orchestrator=dict): class OpenImsVnf(vnf.VnfOnBoarding): """OpenIMS VNF deployed with openBaton orchestrator""" - logger = logging.getLogger(__name__) + # logger = logging.getLogger(__name__) def __init__(self, **kwargs): if "case_name" not in kwargs: kwargs["case_name"] = "orchestra_openims" super(OpenImsVnf, self).__init__(**kwargs) - # self.logger = logging.getLogger("functest.ci.run_tests.orchestra") + self.logger = logging.getLogger("functest.ci.run_tests.orchestra") self.logger.info("kwargs %s", (kwargs)) self.case_dir = pkg_resources.resource_filename( |