scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-01 11:18:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

rvr_scenario: Fix whitespace

Browse Source 
Signed-off-by: Matthew Stidham <stidmatt@gmail.com>
This commit is contained in:
Matthew Stidham
2021-12-06 15:11:53 -08:00
parent b09daaa945
commit ed03860677
1 changed files with 24 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
py-scripts/rvr_scenario.py
View File

@@ -12,7 +12,6 @@ if sys.version_info[0] != 3:
print("This script requires Python 3") print("This script requires Python 3")
exit(1) exit(1)
sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../")))
LFUtils = importlib.import_module("py-json.LANforge.LFUtils") LFUtils = importlib.import_module("py-json.LANforge.LFUtils")
@@ -29,9 +28,12 @@ Realm = realm.Realm
cvScenario.test_scenario = args.test_scenario cvScenario.test_scenario = args.test_scenario
""" """
class RunCvScenario(LFCliBase): class RunCvScenario(LFCliBase):
def __init__(self, lfhost="localhost", lfport=8080, debug_=False, lanforge_db_=None, cv_scenario_=None, cv_test_=None, test_scenario_=None): def __init__(self, lfhost="localhost", lfport=8080, debug_=False, lanforge_db_=None, cv_scenario_=None,
super().__init__( _lfjson_host=lfhost, _lfjson_port=lfport, _debug=debug_, _exit_on_error=True, _exit_on_fail=True) cv_test_=None, test_scenario_=None):
super().__init__(_lfjson_host=lfhost, _lfjson_port=lfport, _debug=debug_, _exit_on_error=True,
_exit_on_fail=True)
self.lanforge_db = lanforge_db_ self.lanforge_db = lanforge_db_
self.cv_scenario = cv_scenario_ self.cv_scenario = cv_scenario_
self.cv_test = cv_test_ self.cv_test = cv_test_
@@ -45,13 +47,13 @@ class RunCvScenario(LFCliBase):
def build(self): def build(self):
data = { data = {
"name": "BLANK", "name": "BLANK",
"action":"overwrite", "action": "overwrite",
"clean_dut":"yes", "clean_dut": "yes",
"clean_chambers": "yes" "clean_chambers": "yes"
} }
self.json_post("/cli-json/load", data) self.json_post("/cli-json/load", data)
sleep(1) sleep(1)
port_counter = 0; port_counter = 0
attempts = 6 attempts = 6
while (attempts > 0) and (port_counter > 0): while (attempts > 0) and (port_counter > 0):
sleep(1) sleep(1)
@@ -74,8 +76,8 @@ class RunCvScenario(LFCliBase):
data = { data = {
"name": self.lanforge_db, "name": self.lanforge_db,
"action":"overwrite", "action": "overwrite",
"clean_dut":"yes", "clean_dut": "yes",
"clean_chambers": "yes" "clean_chambers": "yes"
} }
self.json_post("/cli-json/load", data) self.json_post("/cli-json/load", data)
@@ -86,7 +88,7 @@ class RunCvScenario(LFCliBase):
def start(self, debug_=False): def start(self, debug_=False):
# /gui_cli takes commands keyed on 'cmd', so we create an array of commands # /gui_cli takes commands keyed on 'cmd', so we create an array of commands
commands = [ commands = [
#"cv apply '%s'" % self.cv_scenario, # "cv apply '%s'" % self.cv_scenario,
"sleep 5", "sleep 5",
"cv build", "cv build",
"sleep 5", "sleep 5",
@@ -103,9 +105,10 @@ class RunCvScenario(LFCliBase):
"cv click test_ref Start", "cv click test_ref Start",
"sleep 2", "sleep 2",
"cv click test_ref 'Another Iteration'", "cv click test_ref 'Another Iteration'",
"sleep 240", #sleep for (test duration for 1 time test takes x num iterations requested) - this example is 2 iterations "sleep 240",
"cv click test_ref 'Another Iteration'", #unselect Another Iteration before test ends # sleep for (test duration for 1 time test takes x num iterations requested) - this example is 2 iterations
"sleep 50" #finish test "cv click test_ref 'Another Iteration'", # unselect Another Iteration before test ends
"sleep 50" # finish test
"cv get test_ref 'Report Location:'", "cv get test_ref 'Report Location:'",
"sleep 5", "sleep 5",
"cv click test_ref 'Save HTML'", "cv click test_ref 'Save HTML'",
@@ -115,7 +118,6 @@ class RunCvScenario(LFCliBase):
"sleep 1", "sleep 1",
"exit" "exit"
] ]
response_json = []
for command in commands: for command in commands:
data = { data = {
"cmd": command "cmd": command
@@ -123,7 +125,7 @@ class RunCvScenario(LFCliBase):
try: try:
debug_par = "" debug_par = ""
if debug_: if debug_:
debug_par="?_debug=1" debug_par = "?_debug=1"
if command.endswith("is_built"): if command.endswith("is_built"):
print("Waiting for scenario to build...", end='') print("Waiting for scenario to build...", end='')
self.localrealm.wait_while_building(debug_=False) self.localrealm.wait_while_building(debug_=False)
@@ -136,18 +138,16 @@ class RunCvScenario(LFCliBase):
else: else:
response_json = [] response_json = []
print("running %s..." % command, end='') print("running %s..." % command, end='')
response = self.json_post("/gui-json/cmd%s" % debug_par, data, debug_=False, response_json_list_=response_json) self.json_post("/gui-json/cmd%s" % debug_par, data, debug_=False, response_json_list_=response_json)
if debug_: if debug_:
LFUtils.debug_printer.pprint(response_json) LFUtils.debug_printer.pprint(response_json)
print("...proceeding") print("...proceeding")
except Exception as x: except Exception as x:
print(x) print(x)
self._pass("report finished", print_=True) self._pass("report finished", print_=True)
def stop(self): def stop(self):
pass pass
@@ -165,15 +165,15 @@ def main():
Example: Example:
./rvr_scenario.py --lfmgr 127.0.0.1 --lanforge_db 'handsets' --cv_test --test_scenario 'test-20' ./rvr_scenario.py --lfmgr 127.0.0.1 --lanforge_db 'handsets' --cv_test --test_scenario 'test-20'
""") """)
parser.add_argument("-m", "--lfmgr", type=str, parser.add_argument("-m", "--lfmgr", type=str,
help="address of the LANforge GUI machine (localhost is default)") help="address of the LANforge GUI machine (localhost is default)")
parser.add_argument("-o", "--port", type=int, parser.add_argument("-o", "--port", type=int,
help="IP Port the LANforge GUI is listening on (8080 is default)") help="IP Port the LANforge GUI is listening on (8080 is default)")
parser.add_argument("--lanforge_db", "--db", "--lanforge_scenario", type=str, parser.add_argument("--lanforge_db", "--db", "--lanforge_scenario", type=str,
help="Name of test scenario database (see Status Tab)") help="Name of test scenario database (see Status Tab)")
parser.add_argument("-c", "--cv_scenario", type=str, required=True, parser.add_argument("-c", "--cv_scenario", type=str, required=True,
help="Name of Chamber View test scenario (see CV Manage Scenarios)") help="Name of Chamber View test scenario (see CV Manage Scenarios)")
parser.add_argument("-n", "--cv_test", type=str, required = True, parser.add_argument("-n", "--cv_test", type=str, required=True,
help="Chamber View test") help="Chamber View test")
parser.add_argument("-s", "--test_profile", "--test_settings", type=str, required=True, parser.add_argument("-s", "--test_profile", "--test_settings", type=str, required=True,
help="Name of the saved CV test settings") help="Name of the saved CV test settings")
@@ -220,7 +220,9 @@ Example:
exit(1) exit(1)
report_file = run_cv_scenario.get_report_file_name() report_file = run_cv_scenario.get_report_file_name()
print("Report file saved to "+report_file) print("Report file saved to " + report_file)
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -