Stop using a forked obsolete repo

[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 f35e281..ae01cfa 100644 (file)
--- a/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
+++ b/functest/opnfv_tests/vnf/ims/clearwater_ims_base.py
@@ -6,9 +6,9 @@
 # which accompanies this distribution, and is available at
 #
 # http://www.apache.org/licenses/LICENSE-2.0
-import json
 import logging
 import os
+import re
 import shlex
 import shutil
 import subprocess
@@ -52,11 +52,14 @@ class ClearwaterOnBoardingBase(vnf.VnfOnBoarding):
                   "full_name": "opnfv functest user",
                   "email": "functest@opnfv.org",
                   "signup_code": signup_code}
-        rq = requests.post(account_url, data=params)
+        req = requests.post(account_url, data=params)
         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.debug('Account is created on Ellis: %s', params)
+        if req.status_code != 201 and req.status_code != 409:
+            raise Exception(
+                "Unable to create an account {}\n{}".format(
+                    params, req.text))
+        self.logger.debug(
+            'Account %s is created on Ellis\n%s', params, req.json())
 
         session_url = 'http://{0}/session'.format(ellis_ip)
         session_data = {
@@ -64,22 +67,24 @@ class ClearwaterOnBoardingBase(vnf.VnfOnBoarding):
             'password': params['password'],
             'email': params['email']
         }
-        rq = requests.post(session_url, data=session_data)
-        if rq.status_code != 201:
-            raise Exception('Failed to get cookie for Ellis')
-        cookies = rq.cookies
+        req = requests.post(session_url, data=session_data)
+        if req.status_code != 201:
+            raise Exception('Failed to get cookie for Ellis\n{}'.format(
+                req.text))
+        cookies = req.cookies
         self.logger.debug('Cookies: %s', cookies)
 
         number_url = 'http://{0}/accounts/{1}/numbers'.format(
             ellis_ip, params['email'])
         self.logger.debug('Create 1st calling number on Ellis')
         i = 30
-        while rq.status_code != 200 and i > 0:
+        while req.status_code != 200 and i > 0:
             try:
                 number_res = self.create_ellis_number(number_url, cookies)
                 break
             except Exception:  # pylint: disable=broad-except
                 if i == 1:
+                    self.logger.exception("Unable to create a number")
                     raise Exception("Unable to create a number")
                 self.logger.info("Unable to create a number. Retry ..")
                 time.sleep(25)
@@ -94,15 +99,15 @@ class ClearwaterOnBoardingBase(vnf.VnfOnBoarding):
         return output_dict
 
     def create_ellis_number(self, number_url, cookies):
-        rq = requests.post(number_url, cookies=cookies)
+        req = requests.post(number_url, cookies=cookies)
 
-        if rq.status_code != 200:
-            if rq and rq.json():
-                reason = rq.json()['reason']
+        if req.status_code != 200:
+            if req and req.json():
+                reason = req.json()['reason']
             else:
-                reason = rq
+                reason = req
             raise Exception("Unable to create a number: %s" % reason)
-        number_res = rq.json()
+        number_res = req.json()
         self.logger.info('Calling number is created: %s', number_res)
         return number_res
 
@@ -146,19 +151,18 @@ class ClearwaterOnBoardingBase(vnf.VnfOnBoarding):
         if result != "":
             self.logger.debug(result)
 
-        vims_test_result = ""
-        tempFile = os.path.join(self.test_dir, "temp.json")
+        vims_test_result = {}
         try:
-            self.logger.debug("Trying to load test results")
-            with open(tempFile) as f:
-                vims_test_result = json.load(f)
-            f.close()
+            grp = re.search(
+                '(\d+) failures out of (\d+) tests run\n.*?'
+                '(\d+) tests skipped', result)
+            assert grp
+            vims_test_result["failures"] = int(grp.group(1))
+            vims_test_result["total"] = int(grp.group(2))
+            vims_test_result["skipped"] = int(grp.group(3))
+            vims_test_result['passed'] = (
+                int(grp.group(2)) - int(grp.group(3)) - int(grp.group(1)))
         except Exception:  # pylint: disable=broad-except
-            self.logger.error("Unable to retrieve test results")
-
-        try:
-            os.remove(tempFile)
-        except Exception:  # pylint: disable=broad-except
-            self.logger.error("Deleting file failed")
-
+            self.logger.exception("Cannot parse live tests results")
+            return None
         return vims_test_result