add running profiler in python

For support bash and python both, I don't refactor the profiler_poc file,
just call the func in python main.

JIRA: DOCTOR-117

Change-Id: I5f06ecbd673c6a21acc94cc359a3f2b749b77b13
Signed-off-by: dongwenjuan <dong.wenjuan@zte.com.cn>

2 files changed, 12 insertions, 24 deletions

diff --git a/tests/scenario/common.py b/tests/scenario/common.py
index e880e8b2..a33c50ff 100644
--- a/tests/scenario/common.py
+++ b/tests/scenario/common.py
@@ -6,35 +6,23 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-import os
-import re
 import sys
-
-
-def match_rep_in_file(regex, full_path):
-    if not os.path.isfile(full_path):
-        raise Exception('File(%s) does not exist' % full_path)
-
-    with open(full_path, 'r') as file:
-        for line in file:
-            result = re.search(regex, line)
-            if result:
-                return result.group(0)
-
-    return None
+from common.utils import match_rep_in_file
 
 
 def calculate_notification_time():
     log_file = '{0}/{1}'.format(sys.path[0], 'doctor.log')
 
     reg = '(?<=doctor monitor detected at )\d+.\d+'
-    detected = match_rep_in_file(reg, log_file)
-    if not detected:
-        raise Exception('Can not find detected time')
+    result = match_rep_in_file(reg, log_file)
+    if not result:
+        raise Exception('Can not match detected time')
+    detected = result.group(0)
 
     reg = '(?<=doctor consumer notified at )\d+.\d+'
-    notified = match_rep_in_file(reg, log_file)
-    if not notified:
-        raise Exception('Can not find notified time')
+    result = match_rep_in_file(reg, log_file)
+    if not result:
+        raise Exception('Can not match notified time')
+    notified = result.group(0)
 
     return float(notified) - float(detected)
\ No newline at end of file
diff --git a/tests/scenario/network_failure.py b/tests/scenario/network_failure.py
index 1d9027a2..e9a239db 100644
--- a/tests/scenario/network_failure.py
+++ b/tests/scenario/network_failure.py
@@ -40,10 +40,10 @@ class NetworkFault(object):
 
     def cleanup(self):
         self.log.info('fault inject cleanup......')
-        self.get_diable_network_log()
+        self.get_disable_network_log()
 
-    def get_diable_network_log(self):
-        if not self.GetLog:
+    def get_disable_network_log(self):
+        if self.GetLog:
             self.log.info('Already get the disable_netork.log from down_host......')
             return
         if self.host is not None: