Merge branch 'master' into feature-ucentral-wifi-2526

libs/lanforge/lf_tools.py

@@ -2,11 +2,13 @@ from create_chamberview import CreateChamberview
 from create_chamberview_dut import DUT
 import time
 from LANforge.lfcli_base import LFCliBase
-
+import json
+import os
+import pandas as pd
 
 class ChamberView:
 
-    def __init__(self, lanforge_data=None, access_point_data=None, debug=False, testbed=None):
+    def __init__(self, lanforge_data=None, access_point_data=None, debug=True, testbed=None):
         self.lanforge_ip = lanforge_data["ip"]
         self.lanforge_port = lanforge_data["port"]
         self.twog_radios = lanforge_data["2.4G-Radio"]
@@ -24,13 +26,16 @@ class ChamberView:
         self.delete_old_scenario = True
         # For chamber view
         self.scenario_name = "TIP-" + self.testbed
+        self.debug = debug
+        self.exit_on_error = False
 
         self.raw_line = [
             ["profile_link " + self.upstream_resources + " upstream-dhcp 1 NA NA " + self.upstream_port.split(".")
             [2] + ",AUTO -1 NA"],
             ["profile_link " + self.uplink_resources + " uplink-nat 1 'DUT: upstream LAN " + self.upstream_subnet
-             + "' NA " + self.uplink_port.split(".")[2] + " -1 NA"]
+             + "' NA " + self.uplink_port.split(".")[2] + "," + self.upstream_port.split(".")[2] + " -1 NA"]
         ]
+
         # This is for rawline input | see create_chamberview_dut.py for more details
 
         self.CreateChamberview = CreateChamberview(self.lanforge_ip, self.lanforge_port)
@@ -94,4 +99,35 @@ class ChamberView:
         self.CreateChamberview.setup(create_scenario=self.scenario_name,
                                      raw_line=self.raw_line)
 
-        return True
+        return True
+
+    def json_post(self, req_url, shelf, resources, port, current, intrest):
+        data = {
+            "shelf": shelf,
+            "resource": resources,
+            "port": port,
+            "current_flags": current,
+            "interest": intrest
+        }
+        cli_base = LFCliBase(_lfjson_host=self.lanforge_ip, _lfjson_port=self.lanforge_port, )
+        return cli_base.json_post(req_url, data)
+
+    def read_kpi_file(self, column_name, dir_name ):
+        if column_name == None:
+            df = pd.read_csv("../reports/" + str(dir_name) + "/kpi.csv", sep=r'\t', engine='python')
+            if df.empty == True:
+                return "empty"
+            else:
+                return df
+        else:
+            df = pd.read_csv("../reports/" + str(dir_name) + "/kpi.csv", sep=r'\t', usecols=column_name, engine='python')
+            if df.empty == True:
+                return "empty"
+            else:
+                return df
+
+
+
+
+
+