3 files changed, 0 insertions, 157 deletions
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 975f2bdc..fd3785b9 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -51,25 +51,6 @@ logger = logging.getLogger(__name__)
 
 def create_tempest_resources(use_custom_images=False,
                              use_custom_flavors=False):
-    keystone_client = os_utils.get_keystone_client()
-
-    logger.debug("Creating tenant and user for Tempest suite")
-    tenant_id = os_utils.create_tenant(
-        keystone_client,
-        CONST.__getattribute__('tempest_identity_tenant_name'),
-        CONST.__getattribute__('tempest_identity_tenant_description'))
-    if not tenant_id:
-        logger.error("Failed to create %s tenant"
-                     % CONST.__getattribute__('tempest_identity_tenant_name'))
-
-    user_id = os_utils.create_user(
-        keystone_client,
-        CONST.__getattribute__('tempest_identity_user_name'),
-        CONST.__getattribute__('tempest_identity_user_password'),
-        None, tenant_id)
-    if not user_id:
-        logger.error("Failed to create %s user" %
-                     CONST.__getattribute__('tempest_identity_user_name'))
 
     logger.debug("Creating private network for Tempest suite")
     network_dic = os_utils.create_shared_network_full(
@@ -289,12 +270,6 @@ def configure_tempest_update_params(tempest_conf_file,
             config.set('compute', 'flavor_ref', FLAVOR_ID)
         if FLAVOR_ID_ALT is not None:
             config.set('compute', 'flavor_ref_alt', FLAVOR_ID_ALT)
-    config.set('identity', 'tenant_name',
-               CONST.__getattribute__('tempest_identity_tenant_name'))
-    config.set('identity', 'username',
-               CONST.__getattribute__('tempest_identity_user_name'))
-    config.set('identity', 'password',
-               CONST.__getattribute__('tempest_identity_user_password'))
     config.set('identity', 'region', 'RegionOne')
     if os_utils.is_keystone_v3():
         auth_version = 'v3'
diff --git a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
index 5a5c12be..1c3f69c6 100644
--- a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
+++ b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
@@ -117,7 +117,6 @@ class ClearwaterOnBoardingBase(vnf.VnfOnBoarding):
         dns_file_bak = '/etc/resolv.conf.bak'
         shutil.copy(dns_file, dns_file_bak)
         script = ('echo -e "nameserver {0}{1}" > {2};'
-                  'source /etc/profile.d/rvm.sh;'
                   'cd {3};'
                   'rake test[{4}] SIGNUP_CODE={5}'
                   .format(dns_ip,
diff --git a/functest/opnfv_tests/vnf/ims/opera_ims.py b/functest/opnfv_tests/vnf/ims/opera_ims.py
deleted file mode 100644
index d420705a..00000000
--- a/functest/opnfv_tests/vnf/ims/opera_ims.py
+++ /dev/null
@@ -1,131 +0,0 @@
-#!/usr/bin/env python
-
-# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-
-import json
-import logging
-import os
-import time
-
-from opera import openo_connect
-import requests
-
-import functest.opnfv_tests.vnf.ims.clearwater_ims_base as clearwater_ims_base
-from functest.utils.constants import CONST
-
-
-class OperaIms(clearwater_ims_base.ClearwaterOnBoardingBase):
-
-    def __init__(self, **kwargs):
-        if "case_name" not in kwargs:
-            kwargs["case_name"] = "opera_ims"
-        super(OperaIms, self).__init__(**kwargs)
-        self.logger = logging.getLogger(__name__)
-        self.ellis_file = os.path.join(
-            CONST.__getattribute__('dir_results'), 'ellis.info')
-        self.live_test_file = os.path.join(
-            CONST.__getattribute__('dir_results'), 'live_test_report.json')
-        try:
-            self.openo_msb_endpoint = os.environ['OPENO_MSB_ENDPOINT']
-        except KeyError:
-            raise Exception('OPENO_MSB_ENDPOINT is not specified,'
-                            ' put it as <OPEN-O ip>:<port>')
-        else:
-            self.logger.info('OPEN-O endpoint is: %s', self.openo_msb_endpoint)
-
-    def prepare(self):
-        pass
-
-    def clean(self):
-        pass
-
-    def deploy_vnf(self):
-        try:
-            openo_connect.create_service(self.openo_msb_endpoint,
-                                         'functest_opera',
-                                         'VNF for functest testing')
-        except Exception as e:
-            self.logger.error(e)
-            return {'status': 'FAIL', 'result': e}
-        else:
-            self.logger.info('vIMS deployment is kicked off')
-            return {'status': 'PASS', 'result': ''}
-
-    def dump_info(self, info_file, result):
-        with open(info_file, 'w') as f:
-            self.logger.debug('Save information to file: %s', info_file)
-            json.dump(result, f)
-
-    def test_vnf(self):
-        vnfm_ip = openo_connect.get_vnfm_ip(self.openo_msb_endpoint)
-        self.logger.info('VNFM IP: %s', vnfm_ip)
-        vnf_status_url = 'http://{0}:5000/api/v1/model/status'.format(vnfm_ip)
-        vnf_alive = False
-        retry = 40
-
-        self.logger.info('Check the VNF status')
-        while retry > 0:
-            rq = requests.get(vnf_status_url, timeout=90)
-            response = rq.json()
-            vnf_alive = response['vnf_alive']
-            msg = response['msg']
-            self.logger.info(msg)
-            if vnf_alive:
-                break
-            self.logger.info('check again in one and half a minute...')
-            retry = retry - 1
-            time.sleep(90)
-
-        if not vnf_alive:
-            raise Exception('VNF failed to start: {0}'.format(msg))
-
-        ellis_config_url = ('http://{0}:5000/api/v1/model/ellis/configure'
-                            .format(vnfm_ip))
-        rq = requests.get(ellis_config_url, timeout=90)
-        if rq.json() and not rq.json()['ellis_ok']:
-            self.logger.error(rq.json()['data'])
-            raise Exception('Failed to configure Ellis')
-
-        self.logger.info('Get Clearwater deployment detail')
-        vnf_info_url = ('http://{0}:5000/api/v1/model/output'
-                        .format(vnfm_ip))
-        rq = requests.get(vnf_info_url, timeout=90)
-        data = rq.json()['data']
-        self.logger.info(data)
-        bono_ip = data['bono_ip']
-        ellis_ip = data['ellis_ip']
-        dns_ip = data['dns_ip']
-        result = self.config_ellis(ellis_ip, 'signup', True)
-        self.logger.debug('Ellis Result: %s', result)
-        self.dump_info(self.ellis_file, result)
-
-        if dns_ip:
-            vims_test_result = self.run_clearwater_live_test(
-                dns_ip,
-                'clearwater.local',
-                bono_ip,
-                ellis_ip,
-                'signup')
-            if vims_test_result != '':
-                self.dump_info(self.live_test_file, vims_test_result)
-                return {'status': 'PASS', 'result': vims_test_result}
-            else:
-                return {'status': 'FAIL', 'result': ''}
-
-    def main(self, **kwargs):
-        self.logger.info("Start to run Opera vIMS VNF onboarding test")
-        self.execute()
-        self.logger.info("Opera vIMS VNF onboarding test finished")
-        if self.result is "PASS":
-            return self.EX_OK
-        else:
-            return self.EX_RUN_ERROR
-
-    def run(self):
-        kwargs = {}
-        return self.main(**kwargs)