X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fvnf%2Fims%2Fclearwater_ims_base.py;h=1c3f69c6d588c72053e7bb775dcaeceb5c1e02ef;hb=7c3035d0b2ac3e2fdec39c77028804247c1013d9;hp=42d31e3bb31d6a830d2d3b0dc716e0c524e1c72d;hpb=6e0a0070d775cf5f266cda53eb7c004cecb0511c;p=functest.git

diff --git a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
index 42d31e3bb..1c3f69c6d 100644
--- a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
+++ b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
@@ -9,7 +9,9 @@
 import json
 import logging
 import os
+import pkg_resources
 import shutil
+import time
 
 import requests
 
@@ -17,16 +19,22 @@ import functest.core.vnf as vnf
 from functest.utils.constants import CONST
 import functest.utils.functest_utils as ft_utils
 
+__author__ = ("Valentin Boucher <valentin.boucher@orange.com>, "
+              "Helen Yao <helanyao@gmail.com>")
+
 
 class ClearwaterOnBoardingBase(vnf.VnfOnBoarding):
+    """ vIMS clearwater base usable by several orchestrators"""
 
     def __init__(self, **kwargs):
         self.logger = logging.getLogger(__name__)
         super(ClearwaterOnBoardingBase, self).__init__(**kwargs)
-        self.case_dir = os.path.join(CONST.dir_functest_test, 'vnf', 'ims')
-        self.data_dir = CONST.dir_ims_data
-        self.result_dir = os.path.join(CONST.dir_results, self.case_name)
-        self.test_dir = CONST.dir_repo_vims_test
+        self.case_dir = pkg_resources.resource_filename(
+            'functest', 'opnfv_tests/vnf/ims')
+        self.data_dir = CONST.__getattribute__('dir_ims_data')
+        self.result_dir = os.path.join(CONST.__getattribute__('dir_results'),
+                                       self.case_name)
+        self.test_dir = CONST.__getattribute__('dir_repo_vims_test')
 
         if not os.path.exists(self.data_dir):
             os.makedirs(self.data_dir)
@@ -35,7 +43,7 @@ class ClearwaterOnBoardingBase(vnf.VnfOnBoarding):
 
     def config_ellis(self, ellis_ip, signup_code='secret', two_numbers=False):
         output_dict = {}
-        self.logger.info('Configure Ellis: %s', ellis_ip)
+        self.logger.debug('Configure Ellis: %s', ellis_ip)
         output_dict['ellis_ip'] = ellis_ip
         account_url = 'http://{0}/accounts'.format(ellis_ip)
         params = {"password": "functest",
@@ -46,7 +54,7 @@ class ClearwaterOnBoardingBase(vnf.VnfOnBoarding):
         output_dict['login'] = params
         if rq.status_code != 201 and rq.status_code != 409:
             raise Exception("Unable to create an account for number provision")
-        self.logger.info('Account is created on Ellis: %s', params)
+        self.logger.debug('Account is created on Ellis: %s', params)
 
         session_url = 'http://{0}/session'.format(ellis_ip)
         session_data = {
@@ -58,17 +66,27 @@ class ClearwaterOnBoardingBase(vnf.VnfOnBoarding):
         if rq.status_code != 201:
             raise Exception('Failed to get cookie for Ellis')
         cookies = rq.cookies
-        self.logger.info('Cookies: %s' % cookies)
+        self.logger.debug('Cookies: %s', cookies)
 
         number_url = 'http://{0}/accounts/{1}/numbers'.format(
                      ellis_ip,
                      params['email'])
-        self.logger.info('Create 1st calling number on Ellis')
-        number_res = self.create_ellis_number(number_url, cookies)
+        self.logger.debug('Create 1st calling number on Ellis')
+        i = 30
+        while rq.status_code != 200 and i > 0:
+            try:
+                number_res = self.create_ellis_number(number_url, cookies)
+                break
+            except:
+                if i == 1:
+                    raise Exception("Unable to create a number")
+                self.logger.warn("Unable to create a number. Retry ..")
+                time.sleep(25)
+            i = i - 1
         output_dict['number'] = number_res
 
         if two_numbers:
-            self.logger.info('Create 2nd calling number on Ellis')
+            self.logger.debug('Create 2nd calling number on Ellis')
             number_res = self.create_ellis_number(number_url, cookies)
             output_dict['number2'] = number_res
 
@@ -99,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,
@@ -113,7 +130,7 @@ class ClearwaterOnBoardingBase(vnf.VnfOnBoarding):
             script = '{0}{1}'.format(script, subscript)
         script = ('{0}{1}'.format(script, ' --trace'))
         cmd = "/bin/bash -c '{0}'".format(script)
-        self.logger.info('Live test cmd: %s', cmd)
+        self.logger.debug('Live test cmd: %s', cmd)
         output_file = os.path.join(self.result_dir, "ims_test_output.txt")
         ft_utils.execute_command(cmd,
                                  error_msg='Clearwater live test failed',