merge conflict issue equipment id issue

NOLA-README.md

@@ -8,6 +8,7 @@ sudo pip3 install pandas
 sudo pip3 install paramiko
 sudo pip3 install scp
 sudo pip3 install pexpect
+sudo pip3 install pexpect-serial
 
 # Clone these repositories to get started:
 git@github.com:Telecominfraproject/wlan-testing.git   # This repo

libs/apnos/ap_ssh.py

@@ -137,6 +137,9 @@ def ap_ssh_ovsh_nodec(command_line_args, key):
 
         output = str(stdout.read(), 'utf-8')
 
+        #print("ovsdh cmd: ", cmd)
+        #print("ovsh output: ", output)
+
         if key != None:
             for line in output.splitlines():
                 toks = line.split(':', 1)

tests/UnitTestBase.py

@@ -109,7 +109,7 @@ class UnitTestBase:
                                  help="Force upgrading firmware even if it is already current version",
                                  default=False)
         self.parser.add_argument("-m", "--model", type=str,
-                                 choices=['ea8300', 'ecw5410', 'ecw5211', 'ec420', 'wf188n', 'None'],
+                                 choices=['ea8300', 'ecw5410', 'ecw5211', 'ec420', 'wf188n', 'eap102', 'None'],
                                  help="AP model to be run", required=True)
         self.parser.add_argument("--equipment_id", type=str,
                                  help="AP model ID, as exists in the cloud-sdk.  -1 to auto-detect.",

tools/USAGE_EXAMPLES.txt

@@ -0,0 +1,61 @@
+
+
+All of this assumes you are running on some developer system, with ssh tunnels
+into the 'ubuntu' jumphost machine.
+
+ssh -C -L 8800:lf1:4002 -L 8801:lf1:5901 -L 8802:lf1:8080 -L 8803:lab-ctlr:22 \
+       -L 8810:lf4:4002 -L 8811:lf4:5901 -L 8812:lf4:8080 -L 8813:lab-ctlr:22 \
+       -L 8890:lf9:4002 -L 8891:lf9:5901 -L 8892:lf9:8080 -L 8893:lab-ctlr3:22 \
+       -L 8900:lf10:4002 -L 8901:lf10:5901 -L 8902:lf10:8080 -L 8903:lab-ctlr3:22 \
+       -L 8910:lf11:4002 -L 8911:lf11:5901 -L 8912:lf11:8080 -L 8913:lab-ctlr3:22 \
+       -L 8820:lf12:4002 -L 8821:lf12:5901 -L 8822:lf12:8080 -L 8823:lab-ctlr4:22 \
+       ubuntu@orch
+
+The ports are used as:
+  4002:  LANforge GUI connection to LANforge in the testbed.
+  5901:  VNC connection to LANforge machine.
+  8080:  LANforge JSON/API connection.
+  22:    ssh shell access to lab controller
+
+  Each testbed will have a set of 4 ssh tunnels.  Some are duplicated since
+  lab-controllers are shared.  I figure a consistent pattern is worth a few
+  duplicated tunnels.
+  
+
+
+Testbed-09 (perfecto)
+
+# Set AP profile (ssid, etc) on 'b' chamber.  AP is ttyAP4
+./sdk_set_profile.py --testrail-user-id NONE --model ecw5410 --ap-jumphost-address localhost --ap-jumphost-port 8893 \
+   --ap-jumphost-password pumpkin77 --ap-jumphost-tty /dev/ttyAP4 \
+   --lanforge-ip-address localhost --lanforge-port-number 8892 \
+   --default-ap-profile TipWlan-2-Radios --sdk-base-url https://wlan-portal-svc.cicd.lab.wlan.tip.build \
+   --skip-radius --skip-wpa --verbose --testbed "NOLA-09b" \
+   --ssid-5g-wpa2 Default-SSID-5gl-perfecto-b --psk-5g-wpa2 12345678 \
+   --ssid-2g-wpa2 Default-SSID-2g-perfecto-b --psk-2g-wpa2 12345678
+
+# Set AP profile (ssid, etc) on 'a' chamber.  AP is ttyAP1
+./sdk_set_profile.py --testrail-user-id NONE --model ecw5410 --ap-jumphost-address localhost --ap-jumphost-port 8893 \
+   --ap-jumphost-password pumpkin77 --ap-jumphost-tty /dev/ttyAP1 \
+   --lanforge-ip-address localhost --lanforge-port-number 8892 \
+   --default-ap-profile TipWlan-2-Radios --sdk-base-url https://wlan-portal-svc.cicd.lab.wlan.tip.build \
+   --skip-radius --skip-wpa --verbose --testbed "NOLA-09a" \
+   --ssid-5g-wpa2 Default-SSID-5gl-perfecto --psk-5g-wpa2 12345678 \
+   --ssid-2g-wpa2 Default-SSID-2g-perfecto --psk-2g-wpa2 12345678
+
+
+Testbed 10 (Advanced setup, 2D turntable chamber plus medium chamber, RF attenuator, etc)
+
+./sdk_set_profile.py --testrail-user-id NONE --model ecw5410 --ap-jumphost-address localhost --ap-jumphost-port 8903 \
+  --ap-jumphost-password pumpkin77 --ap-jumphost-tty /dev/ttyAP2 --lanforge-ip-address localhost --lanforge-port-number 8902 \
+  --default-ap-profile TipWlan-2-Radios --sdk-base-url https://wlan-portal-svc.cicd.lab.wlan.tip.build \
+  --skip-radius --skip-wpa --verbose --testbed "NOLA-10" --ssid-5g-wpa2 Default-SSID-5gl --psk-5g-wpa2 12345678 \
+  --ssid-2g-wpa2 Default-SSID-2g --psk-2g-wpa2 12345678
+
+Testbed 11 (Advanced setup, 2D turntable chamber plus medium chamber, RF attenuator, etc)
+
+./sdk_set_profile.py --testrail-user-id NONE --model eap102 --ap-jumphost-address localhost --ap-jumphost-port 8913 \
+  --ap-jumphost-password pumpkin77 --ap-jumphost-tty /dev/ttyAP3 --lanforge-ip-address localhost --lanforge-port-number 8912 \
+  --default-ap-profile TipWlan-2-Radios --sdk-base-url https://wlan-portal-svc.cicd.lab.wlan.tip.build \
+  --skip-radius --skip-wpa --verbose --testbed "NOLA-11" --ssid-5g-wpa2 Default-SSID-5gl --psk-5g-wpa2 12345678 \
+  --ssid-2g-wpa2 Default-SSID-2g --psk-2g-wpa2 12345678

tools/sdk_set_profile.py

@@ -20,6 +20,7 @@ from cloudsdk import CreateAPProfiles
 
 
 
+
 def main():
 
 
@@ -135,7 +136,7 @@ def main():
                     print("Found equipment ID: %s  inventoryId: %s" % (e['id'], e['inventoryId']))
                     equipment_id = str(e['id'])
 
-    if equipment_id == -1:
+    if equipment_id == "-1":
         print("ERROR:  Could not find equipment-id.")
         sys.exit(1)