Merge "Add Rally scenarios for telemetry"

[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..8851f7a 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
+++ b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
@@ -10,7 +10,9 @@ import json
 import logging
 import os
 import pkg_resources
+import shlex
 import shutil
+import subprocess
 import time
 
 import requests
@@ -109,19 +111,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".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 +136,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: