Mute log in vnfs

[functest.git] / functest / opnfv_tests / vnf / ims / clearwater_ims_base.py

diff --git a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
index 5a5c12b..be69d68 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
+++ b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
@@ -9,14 +9,16 @@
 import json
 import logging
 import os
-import pkg_resources
+import shlex
 import shutil
+import subprocess
 import time
 
+import pkg_resources
 import requests
 
 import functest.core.vnf as vnf
-from functest.utils.constants import CONST
+from functest.utils import config
 import functest.utils.functest_utils as ft_utils
 
 __author__ = ("Valentin Boucher <valentin.boucher@orange.com>, "
@@ -31,10 +33,10 @@ class ClearwaterOnBoardingBase(vnf.VnfOnBoarding):
         super(ClearwaterOnBoardingBase, self).__init__(**kwargs)
         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.data_dir = getattr(config.CONF, 'dir_ims_data')
+        self.result_dir = os.path.join(getattr(config.CONF, 'dir_results'),
                                        self.case_name)
-        self.test_dir = CONST.__getattribute__('dir_repo_vims_test')
+        self.test_dir = getattr(config.CONF, 'dir_repo_vims_test')
 
         if not os.path.exists(self.data_dir):
             os.makedirs(self.data_dir)
@@ -69,18 +71,17 @@ class ClearwaterOnBoardingBase(vnf.VnfOnBoarding):
         self.logger.debug('Cookies: %s', cookies)
 
         number_url = 'http://{0}/accounts/{1}/numbers'.format(
-                     ellis_ip,
-                     params['email'])
+            ellis_ip, params['email'])
         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:
+            except Exception:  # pylint: disable=broad-except
                 if i == 1:
                     raise Exception("Unable to create a number")
-                self.logger.warn("Unable to create a number. Retry ..")
+                self.logger.info("Unable to create a number. Retry ..")
                 time.sleep(25)
             i = i - 1
         output_dict['number'] = number_res
@@ -109,19 +110,17 @@ class ClearwaterOnBoardingBase(vnf.VnfOnBoarding):
                                  bono_ip=None, ellis_ip=None,
                                  signup_code='secret'):
         self.logger.info('Run Clearwater live test')
-        nameservers = ft_utils.get_resolvconf_ns()
-        resolvconf = ['{0}{1}{2}'.format(os.linesep, 'nameserver ', ns)
-                      for ns in nameservers]
-        self.logger.debug('resolvconf: %s', resolvconf)
         dns_file = '/etc/resolv.conf'
         dns_file_bak = '/etc/resolv.conf.bak'
+        self.logger.debug('Backup %s -> %s', dns_file, dns_file_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,
-                          ''.join(resolvconf),
+        cmd = ("dnsmasq -d -u root --server=/clearwater.opnfv/{0} "
+               "-r /etc/resolv.conf.bak >/dev/null 2>&1".format(dns_ip))
+        dnsmasq_process = subprocess.Popen(shlex.split(cmd))
+        script = ('echo -e "nameserver {0}" > {1};'
+                  'cd {2};'
+                  'rake test[{3}] SIGNUP_CODE={4}'
+                  .format('127.0.0.1',
                           dns_file,
                           self.test_dir,
                           public_domain,
@@ -136,7 +135,7 @@ class ClearwaterOnBoardingBase(vnf.VnfOnBoarding):
         ft_utils.execute_command(cmd,
                                  error_msg='Clearwater live test failed',
                                  output_file=output_file)
-
+        dnsmasq_process.kill()
         with open(dns_file_bak, 'r') as bak_file:
             result = bak_file.read()
             with open(dns_file, 'w') as f:
@@ -154,12 +153,12 @@ class ClearwaterOnBoardingBase(vnf.VnfOnBoarding):
             with open(tempFile) as f:
                 vims_test_result = json.load(f)
             f.close()
-        except Exception:
+        except Exception:  # pylint: disable=broad-except
             self.logger.error("Unable to retrieve test results")
 
         try:
             os.remove(tempFile)
-        except Exception:
+        except Exception:  # pylint: disable=broad-except
             self.logger.error("Deleting file failed")
 
         return vims_test_result