Merge remote-tracking branch 'origin/ci_test_sa_nsa' into integration_2021_wk41_bwt-abs

ci-scripts/ran.py

@@ -705,7 +705,7 @@ class RANManagement():
 					#debug / tentative
 					mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './nrL1_stats.log', self.eNBSourceCodePath + '/cmake_targets/')
 					mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './nrMAC_stats.log', self.eNBSourceCodePath + '/cmake_targets/')
-					mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './gnb_stats_monitor.pickle.pickle', self.eNBSourceCodePath + '/cmake_targets/')
+					mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './gnb_stats_monitor.pickle', self.eNBSourceCodePath + '/cmake_targets/')
 					mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './gnb_stats_monitor.png', self.eNBSourceCodePath + '/cmake_targets/')
 					#
 					mySSH.copyout(self.eNBIPAddress, self.eNBUserName, self.eNBPassword, './' + fileToAnalyze, self.eNBSourceCodePath + '/cmake_targets/')

ci-scripts/stats_monitor_dev.py

+"""
+To create graphs and pickle from runtime statistics in L1,MAC,RRC,PDCP files
+"""
+
 import subprocess
 import time
 import shlex
 import re
 import sys
-import matplotlib.pyplot as plt
 import pickle
+import matplotlib.pyplot as plt
 import numpy as np
-import os
 import yaml
 
 
-class Stat_Monitor():
+class StatMonitor():
     def __init__(self,):
-        with open('stats_monitor_conf.yaml','r') as f:
-            self.d = yaml.load(f)
+        with open('stats_monitor_conf.yaml','r') as file:
+            self.d = yaml.load(file)
         for node in self.d:
             for metric in self.d[node]:
                 self.d[node][metric]=[]
@@ -45,9 +48,6 @@ class Stat_Monitor():
                 self.d[node_type]['mcs'].append(int(result.group(4)))
 
 
-
-
-
     def collect(self,node_type):
         if node_type=='enb':
             cmd='cat L1_stats.log MAC_stats.log PDCP_stats.log RRC_stats.log'
@@ -60,8 +60,8 @@ class Stat_Monitor():
         else: #'gnb'
             self.process_gnb(node_type,output)
 
-    def graph(self,node_type):
 
+    def graph(self,node_type):
         col = 1
         figure, axis = plt.subplots(len(self.d[node_type]), col ,figsize=(10, 10))
         i=0
@@ -83,21 +83,19 @@ class Stat_Monitor():
 
 if __name__ == "__main__":
 
-    node_type = sys.argv[1]#enb or gnb
-    mon=Stat_Monitor()
+    node = sys.argv[1]#enb or gnb
+    mon=StatMonitor()
 
     #collecting stats when modem process is stopped
-    cmd='ps aux | grep mode | grep -v grep'
-    process=subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
+    CMD='ps aux | grep mode | grep -v grep'
+    process=subprocess.Popen(CMD, shell=True, stdout=subprocess.PIPE)
     output = process.stdout.readlines()
     while len(output)!=0 :
-        mon.collect(node_type)
-        process=subprocess.Popen(cmd, shell=True, stdout=subprocess.PIPE)
+        mon.collect(node)
+        process=subprocess.Popen(CMD, shell=True, stdout=subprocess.PIPE)
         output = process.stdout.readlines()
         time.sleep(1)
     print('Process stopped')
-    with open(node_type+'_stats_monitor.pickle', 'wb') as handle:
+    with open(node+'_stats_monitor.pickle', 'wb') as handle:
         pickle.dump(mon.d, handle, protocol=pickle.HIGHEST_PROTOCOL)
-    mon.graph(node_type)
-
-
+    mon.graph(node)