LFRequest.py : allow for debug to be enable at enstanciation o the LFRequest.py and passed in

vap_profile.py updated to allow the mac address to be used and pass in
debug state on enstanciation of LFRequest
modify_vap.py : added logging, pass debug flag to base classes

Signed-off-by: Chuck SmileyRekiere <chuck.smileyrekiere@candelatech.com>

py-json/LANforge/LFRequest.py

@@ -105,7 +105,7 @@ class LFRequest:
     def form_post(self, show_error=True, debug=False, die_on_error_=False):
         if self.die_on_error:
             die_on_error_ = True
-        if not debug and self.debug:
+        if debug or self.debug:
             debug = True
         responses = []
         urlenc_data = ""
@@ -160,7 +160,7 @@ class LFRequest:
                               response_json_list_=response_json_list_)
 
     def json_post(self, show_error=True, debug=False, die_on_error_=False, response_json_list_=None, method_='POST'):
-        if not debug and self.debug:
+        if debug or self.debug:
             debug = True
         if self.die_on_error:
             die_on_error_ = True
@@ -185,7 +185,7 @@ class LFRequest:
         try:
             resp = urllib.request.urlopen(myrequest)
             resp_data = resp.read().decode('utf-8')
-            if debug and die_on_error_:
+            if debug or die_on_error_:
                 self.logger.debug("----- LFRequest::json_post:128 debug: --------------------------------------------")
                 self.logger.debug("URL: <%s>  status: %d " % (self.requested_url, resp.status))
                 if resp.status != 200:

py-json/vap_profile.py

@@ -195,7 +195,7 @@ class VAPProfile(LFCliBase):
         if desired_list is None:
             raise ValueError("addNamedFlags wants a list of desired flag names")
         if len(desired_list) < 1:
-            print("addNamedFlags: empty desired list")
+            logger.info("addNamedFlags: empty desired list")
             return 0
         if (command_ref is None) or (len(command_ref) < 1):
             raise ValueError("addNamedFlags wants a maps of flag values")
@@ -344,19 +344,21 @@ class VAPProfile(LFCliBase):
             return False # Ports did not appear
             
     def modify(self, radio):
-         self.add_vap_data["flags"] = self.add_named_flags(self.desired_add_vap_flags, add_vap.add_vap_flags)
-         self.add_vap_data["flags_mask"] = self.add_named_flags(self.desired_add_vap_flags_mask, add_vap.add_vap_flags)
-         self.add_vap_data["radio"] = radio
-         self.add_vap_data["ap_name"] = self.vap_name
-         self.add_vap_data["ssid"] = 'NA'
-         self.add_vap_data["key"] = 'NA'
-         self.add_vap_data['mac'] = 'NA'
- 
-         add_vap_r = LFRequest.LFRequest(self.lfclient_url + "/cli-json/add_vap")
-         if self.debug:
-             print(self.add_vap_data)
-         add_vap_r.addPostData(self.add_vap_data)
-         json_response = add_vap_r.jsonPost(self.debug)
+        self.add_vap_data["flags"] = self.add_named_flags(self.desired_add_vap_flags, add_vap.add_vap_flags)
+        self.add_vap_data["flags_mask"] = self.add_named_flags(self.desired_add_vap_flags_mask, add_vap.add_vap_flags)
+        self.add_vap_data["radio"] = radio
+        self.add_vap_data["ap_name"] = self.vap_name
+        self.add_vap_data["ssid"] = 'NA'
+        self.add_vap_data["key"] = 'NA'
+        self.add_vap_data['mac'] = self.mac
+        # self.add_vap_data['mac'] = 'NA'
+
+        add_vap_r = LFRequest.LFRequest(self.lfclient_url + "/cli-json/add_vap", debug_=self.debug)
+        logger.debug(self.add_vap_data)
+        add_vap_r.addPostData(self.add_vap_data)
+        # inputs to jsonPost self, show_error=True, debug=False, die_on_error_=False, response_json_list_=None, method_='POST'
+        json_response = add_vap_r.jsonPost(show_error=True, debug=self.debug)
+        return json_response
 
     def cleanup(self, resource):
         print("Cleaning up VAP")

py-scripts/modify_vap.py

@@ -6,6 +6,9 @@ import sys
 import os
 import importlib
 import argparse
+import logging
+from pprint import pformat
+
 
 if sys.version_info[0] != 3:
     print("This script requires Python 3")
@@ -19,7 +22,9 @@ LFCliBase = lfcli_base.LFCliBase
 LFUtils = importlib.import_module("py-json.LANforge.LFUtils")
 realm = importlib.import_module("py-json.realm")
 Realm = realm.Realm
+lf_logger_config = importlib.import_module("py-scripts.lf_logger_config")
 
+logger = logging.getLogger(__name__)
 
 class ModifyVAP(Realm):
     def __init__(self,
@@ -39,8 +44,10 @@ class ModifyVAP(Realm):
                  _exit_on_error=False,
                  _exit_on_fail=False,
                  _dhcp=True):
-        super().__init__(_host,
-                         _port)
+        super().__init__(lfclient_host=_host,
+                         lfclient_port=_port,
+                         debug_=_debug_on)
+
         self.host = _host
         self.port = _port
         self.ssid = _ssid
@@ -140,6 +147,17 @@ use-bss-transition   | 0x80000000000   # Enable BSS transition.
 
     args = parser.parse_args()
 
+    # set up logger
+    logger_config = lf_logger_config.lf_logger_config()
+
+    if (args.log_level):
+        logger_config.set_level(level=args.log_level)
+        
+    if args.lf_logger_config_json:
+        logger_config.lf_logger_config_json = args.lf_logger_config_json
+        logger_config.load_lf_logger_config()
+
+
     modify_vap = ModifyVAP(_host=args.mgr,
                            _port=args.mgr_port,
                            _ssid=args.ssid,
@@ -152,7 +170,8 @@ use-bss-transition   | 0x80000000000   # Enable BSS transition.
                            _radio=args.radio,
                            _proxy_str=args.proxy,
                            _debug_on=args.debug)
-    modify_vap.set_vap()
+    json_response = modify_vap.set_vap()
+    logger.info("modify_vap.set_vap ")
 
 
 if __name__ == "__main__":