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

Revert "sta_connect2: Make the mgr argument on sta_connect2 more robust"

Browse Source 
This reverts commit b3d9447c7e.
This commit is contained in:
Matthew Stidham
2021-11-29 13:00:32 -08:00
parent e98e7c71c9
commit 356dbcf15a
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
py-scripts/sta_connect2.py
View File

@@ -398,6 +398,8 @@ class StaConnect2(LFCliBase):
def main(): def main():
lfjson_host = "localhost"
lfjson_port = 8080
parser = argparse.ArgumentParser( parser = argparse.ArgumentParser(
prog="sta_connect2.py", prog="sta_connect2.py",
formatter_class=argparse.RawTextHelpFormatter, formatter_class=argparse.RawTextHelpFormatter,
@@ -405,8 +407,8 @@ def main():
Example: Example:
./sta_connect2.py --dest 192.168.100.209 --dut_ssid OpenWrt-2 --dut_bssid 24:F5:A2:08:21:6C ./sta_connect2.py --dest 192.168.100.209 --dut_ssid OpenWrt-2 --dut_bssid 24:F5:A2:08:21:6C
""") """)
parser.add_argument("-d", "--dest", "--mgr", type=str, help="address of the LANforge GUI machine (localhost is default)", default='localhost') parser.add_argument("-d", "--dest", type=str, help="address of the LANforge GUI machine (localhost is default)")
parser.add_argument("-o", "--port", type=int, help="IP Port the LANforge GUI is listening on (8080 is default)", default=8080) parser.add_argument("-o", "--port", type=int, help="IP Port the LANforge GUI is listening on (8080 is default)")
parser.add_argument("-u", "--user", type=str, help="TBD: credential login/username") parser.add_argument("-u", "--user", type=str, help="TBD: credential login/username")
parser.add_argument("-p", "--passwd", type=str, help="TBD: credential password") parser.add_argument("-p", "--passwd", type=str, help="TBD: credential password")
parser.add_argument("--resource", type=str, help="LANforge Station resource ID to use, default is 1") parser.add_argument("--resource", type=str, help="LANforge Station resource ID to use, default is 1")
@@ -432,8 +434,12 @@ Example:
parser.add_argument('--monitor_interval', help='How frequently you want to append to your database', default='5s') parser.add_argument('--monitor_interval', help='How frequently you want to append to your database', default='5s')
args = parser.parse_args() args = parser.parse_args()
if args.dest is not None:
lfjson_host = args.dest
if args.port is not None:
lfjson_port = args.port
staConnect = StaConnect2(args.dest, args.port, staConnect = StaConnect2(lfjson_host, lfjson_port,
debug_=True, debug_=True,
_influx_db=args.influx_db, _influx_db=args.influx_db,
_influx_passwd=args.influx_passwd, _influx_passwd=args.influx_passwd,