From e7a228bc524298043f02d30c14179b002d23c488 Mon Sep 17 00:00:00 2001
From: Ben Greear <greearb@candelatech.com>
Date: Sat, 14 Dec 2019 15:14:06 -0800
Subject: [PATCH] Improve cisco ctrl script and let lf_portmod.pl work from CWD

---
 cisco_wifi_ctl.py | 38 +++++++++++++++++++++++++++++---------
 lf_portmod.pl     |  8 ++++----
 2 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/cisco_wifi_ctl.py b/cisco_wifi_ctl.py
index 394ed6cc..3543a8e7 100755
--- a/cisco_wifi_ctl.py
+++ b/cisco_wifi_ctl.py
@@ -75,8 +75,8 @@ def main():
    #parser.add_argument("-r", "--radio",   type=str, help="select radio")
    parser.add_argument("-a", "--ap",      type=str, help="select AP")
    parser.add_argument("--action",        type=str, help="perform action",
-      choices=["config", "country", "enable", "disable", "summary", "advanced",
-      "cmd", "txPower", "show" ])
+      choices=["config", "country", "ap_country", "enable", "disable", "summary", "advanced",
+      "cmd", "txPower", "bandwidth", "show" ])
    parser.add_argument("--value",       type=str, help="set value")
 
    args = None
@@ -164,6 +164,8 @@ def main():
    time.sleep(0.1)
    CCPROMPT = '\(Cisco Controller\) >'
    EXITPROMPT = "Would you like to save them now\? \(y/N\)"
+   AREYOUSURE = "Are you sure you want to continue\? \(y/n\)"
+   CLOSEDBYREMOTE = "closed by remote host."
    egg.expect(CCPROMPT)
 
    logg.info("Ap[%s] Action[%s] Value[%s] "%(args.ap, args.action, args.value))
@@ -175,18 +177,29 @@ def main():
       print ("HI")
       command = "show "+args.value
 
+   if (args.action == "cmd"):
+       if (args.value is None):
+           raise Exception("cmd requires value to be set.")
+       command = "%s"%(args.value)
+
    if (args.action == "summary"):
       command = "show ap summary"
 
    if (args.action == "advanced"):
       command = "show advanced 802.11a summary"
 
-   if ((args.action == "set_country") and ((args.value is None) or (args.ap is None))):
-      raise  Exception("set_country requires country and AP name")
+   if ((args.action == "ap_country") and ((args.value is None) or (args.ap is None))):
+      raise  Exception("ap_country requires country and AP name")
 
-   if (args.action == "set_country"):
+   if (args.action == "ap_country"):
       command = "config ap country %s %s"%(args.value, args.ap)
 
+   if ((args.action == "country") and ((args.value is None))):
+      raise  Exception("country requires country value")
+
+   if (args.action == "country"):
+      command = "config country %s"%(args.value)
+
    if (args.action in ["enable", "disable" ] and (args.ap is None)):
       raise Exception("action requires AP name")
    if (args.action == "enable"):
@@ -199,18 +212,25 @@ def main():
    if (args.action == "txPower"):
       command = "config 802.11a txPower ap %s %s"%(args.ap, args.value)
 
+   if (args.action == "bandwidth" and ((args.ap is None) or (args.value is None))):
+      raise Exception("bandwidth requires ap and value (20, 40, 80, 160)")
+   if (args.action == "bandwidth"):
+      command = "config 802.11a chan_width %s %s"%(args.ap, args.value)
 
 
    if (command is None):
-      logg.info("Going to log out.")
+      logg.info("No command specified, going to log out.")
    else:
       logg.info("Command[%s]"%command)
       egg.sendline(command);
-      egg.expect(CCPROMPT)
+      i = egg.expect([CCPROMPT, AREYOUSURE])
+      if i == 1:
+          egg.sendline("y")
 
    egg.sendline("logout")
-   egg.expect(EXITPROMPT)
-   egg.sendline("y")
+   i = egg.expect([EXITPROMPT, CLOSEDBYREMOTE])
+   if i == 0:
+       egg.sendline("y")
 
 
 
diff --git a/lf_portmod.pl b/lf_portmod.pl
index 92ec736f..f925be6f 100755
--- a/lf_portmod.pl
+++ b/lf_portmod.pl
@@ -32,11 +32,11 @@ use Cwd qw(getcwd);
 my $cwd = getcwd();
 
  # this is pedantic necessity for the following use statements
-if ( $cwd =~ q(.*LANforge-Server\scripts$)) {
-   use lib '/home/lanforge/scripts'
+if ( -f "LANforge/Endpoint.pm" ) {
+   use lib "./";
 }
-elsif ( -f "LANforge/Endpoint.pm" ) {
-   use lib "./LANforge";
+elsif ( $cwd =~ q(.*LANforge-Server\scripts$)) {
+   use lib '/home/lanforge/scripts'
 }
 else {
    use lib '/home/lanforge/scripts';