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

lfcli_base.py: renames variable

Browse Source
This commit is contained in:
Jed Reynolds
2020-06-09 13:22:24 -07:00
parent f28bef230e
commit 7db0b8b7ad
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
py-json/LANforge/lfcli_base.py
View File

@@ -6,7 +6,7 @@ from pprint import pprint
import LANforge.LFUtils import LANforge.LFUtils
from LANforge.LFUtils import * from LANforge.LFUtils import *
import realm
class LFCliBase: class LFCliBase:
# do not use `super(LFCLiBase,self).__init__(self, host, port, _debugOn) # do not use `super(LFCLiBase,self).__init__(self, host, port, _debugOn)
@@ -19,7 +19,7 @@ class LFCliBase:
self.lfjson_port = _lfjson_port self.lfjson_port = _lfjson_port
self.debugOn = _debug self.debugOn = _debug
self.haltOnError = _halt_on_error self.haltOnError = _halt_on_error
self.mgr_url = "http://%s:%s" % (self.lfjson_host, self.lfjson_port) self.lfclient_url = "http://%s:%s" % (self.lfjson_host, self.lfjson_port)
self.test_results = [] self.test_results = []
def clear_test_results(self): def clear_test_results(self):
@@ -28,7 +28,7 @@ class LFCliBase:
def json_post(self, _req_url, _data): def json_post(self, _req_url, _data):
json_response = None json_response = None
try: try:
lf_r = LFRequest.LFRequest(self.mgr_url, _req_url, debug_=self.debugOn) lf_r = LFRequest.LFRequest(self.lfclient_url, _req_url, debug_=self.debugOn)
_data['suppress_preexec_cli'] = True _data['suppress_preexec_cli'] = True
_data['suppress_preexec_method'] = True _data['suppress_preexec_method'] = True
lf_r.addPostData(_data) lf_r.addPostData(_data)
@@ -51,7 +51,7 @@ class LFCliBase:
print("URL: "+_req_url) print("URL: "+_req_url)
json_response = None json_response = None
try: try:
lf_r = LFRequest.LFRequest(self.mgr_url, _req_url) lf_r = LFRequest.LFRequest(self.lfclient_url, _req_url)
json_response = lf_r.getAsJson(self.debugOn) json_response = lf_r.getAsJson(self.debugOn)
#debug_printer.pprint(json_response) #debug_printer.pprint(json_response)
if (json_response is None) and self.debugOn: if (json_response is None) and self.debugOn:
@@ -78,11 +78,11 @@ class LFCliBase:
def check_connect(self): def check_connect(self):
if self.debugOn: if self.debugOn:
print("Checking for LANforge GUI connection: %s" % self.mgr_url) print("Checking for LANforge GUI connection: %s" % self.lfclient_url)
response = self.json_get("/") response = self.json_get("/")
duration = 0 duration = 0
while (response is None) and (duration < 300): while (response is None) and (duration < 300):
print("LANforge GUI connection not found sleeping 5 seconds, tried: %s" % self.mgr_url) print("LANforge GUI connection not found sleeping 5 seconds, tried: %s" % self.lfclient_url)
duration += 2 duration += 2
time.sleep(2) time.sleep(2)
response = self.json_get("") response = self.json_get("")