diff --git a/libs/apnos/apnos.py b/libs/apnos/apnos.py index f9f36616b..b4d628e09 100644 --- a/libs/apnos/apnos.py +++ b/libs/apnos/apnos.py @@ -307,11 +307,13 @@ class APNOS: output = stdout.read() print(output, stderr.read()) status = output.decode('utf-8').splitlines() + error = stderr + stdin = stdin client.close() except Exception as e: print(e) - status = "Error" - return status + stdin, status, error = "Error", "Error", "Error" + return stdin, status, error def get_ucentral_status(self): try: @@ -571,7 +573,7 @@ if __name__ == '__main__': 'version': "https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/edgecore_eap102/20210625-edgecore_eap102-uCentral-trunk-4225122-upgrade.bin" } var = APNOS(credentials=obj, sdk="2.x") - tx_power, name = var.gettxpower() + tx_power, name = var.iwinfo() allure.attach(name="interface name: ", body=str(name)) allure.attach(name="tx power: ", body=str(tx_power)) print(tx_power, name) diff --git a/tools/ap_tools.py b/tools/ap_tools.py index 7b13fda4d..c7ba9d6d1 100644 --- a/tools/ap_tools.py +++ b/tools/ap_tools.py @@ -28,7 +28,7 @@ class APTools: self.credentials = { 'jumphost': jumphost, 'ip': host, - 'serial': serial + 'serial': serial, 'username': username, 'password': password, 'port': port, @@ -61,7 +61,7 @@ def main(): parser.add_argument('--host', type=str, help=' --host : IP Address f LAB Controller / ' 'Access Point System', default="localhost") parser.add_argument('--jumphost', type=bool, help=' --host : IP Address f Access Point System', default=True) - parser.add_argument('--tty', type=bool, help=' --tty : /dev/ttyAP1', default="/dev/ttyAP1") + parser.add_argument('--tty', type=str, help=' --tty : /dev/ttyAP1', default="/dev/ttyAP1") parser.add_argument('--port', type=int, help='--passwd of dut', default=22) parser.add_argument('--username', type=str, help='--username to use on Access Point', default="root") parser.add_argument('--password', type=str, help='--password to the given username', default="openwifi") @@ -71,6 +71,7 @@ def main(): 'reboot | run_cmd', default="run_cmd") parser.add_argument('--cmd', type=str, help='--cmd : used when action is "run_cmd"', default="pwd") args = parser.parse_args() + print(args.tty) lf_tools = APTools(host=args.host, port=args.port, tty=args.tty, username=args.username, jumphost=args.jumphost, password=args.password) lf_tools.run_action(args.action, args.cmd)