lf_create_dut_json.py : initial checkin will create the json file for

the device under test
lf_create_rig_json.py : comment update
test_l3.py : help sintax update

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

py-scripts/test_l3.py

@@ -1660,7 +1660,7 @@ Setting wifi_settings per radio
         action='append',
         nargs=1,
         help=(' --radio'
-              ' "radio==<number_of_wiphy stations=<=number of stations>'
+              ' "radio==<number_of_wiphy stations==<number of stations>'
               ' ssid==<ssid> ssid_pw==<ssid password> security==<security> '
               ' wifi_settings==True wifi_mode==<wifi_mode>'
               ' enable_flags==<enable_flags> '

py-scripts/tools/ct_dut_json/lf_create_dut_json.py

@@ -0,0 +1,213 @@
+#!/usr/bin/env python3
+'''
+File: create lf_dut.json file for --json_dut input to lf_check.py , LANforge traffic generation system
+Usage: lf_create_dut_json.py 
+'''
+
+import argparse
+import logging
+import importlib
+import os
+import sys
+
+if sys.version_info[0] != 3:
+    print("This script requires Python 3")
+    exit(1)
+
+
+sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../../../")))
+
+
+logger = logging.getLogger(__name__)
+lf_logger_config = importlib.import_module("py-scripts.lf_logger_config")
+
+
+
+
+class lf_create_dut_json():
+    def __init__(self,
+                 _file,
+                 _dut_name,
+                 _dut_hw,
+                 _dut_sw,
+                 _dut_model,
+                 _dut_serial,
+                 _ssid_idx_dict_dict_str,
+                 ):
+        self.file = _file
+        self.dut_name = _dut_name
+        self.dut_hw = _dut_hw
+        self.dut_sw = _dut_sw
+        self.dut_model = _dut_model
+        self.dut_serial = _dut_serial
+        self.ssid_idx_dict_dict_str = _ssid_idx_dict_dict_str
+
+    # Helper methods
+    def create(self):
+        file_fd = open(self.file, 'w')
+        dut_json = """
+{{
+    "{file}":{{
+        "Notes":[
+            "This json file describes device under test run configuration used as input for --dut_json for lf_check.py"
+
+        ]
+    }},
+    "test_dut":{{
+        "DUT_SET_NAME": "DUT_NAME {dut_name}",
+        "USE_DUT_NAME": "{dut_name}",
+        "DUT_HW":"{dut_hw}",
+        "DUT_SW":"{dut_sw}",
+        "DUT_MODEL":"{dut_model}",
+        "DUT_SERIAL":"{dut_serial}",
+        "wireless_network_dict":{{\n{ssid_idx_dict_dict_str} \t\t}}
+    }}
+}}
+
+        """.format(file=self.file, dut_name=self.dut_name, dut_hw=self.dut_hw, dut_sw=self.dut_sw,
+                   dut_model=self.dut_model, dut_serial=self.dut_serial, ssid_idx_dict_dict_str=self.ssid_idx_dict_dict_str
+                   )
+
+        file_fd.write(dut_json)
+        file_fd.close()
+
+# Feature, Sum up the subtests passed/failed from the kpi files for each run, poke those into the database, and generate a kpi graph for them.
+
+
+def main():
+
+    parser = argparse.ArgumentParser(
+        prog='lf_create_dut_json.py',
+        formatter_class=argparse.RawTextHelpFormatter,
+        epilog='''\
+        lf_create_dut_json.py creates lf_dut.json file for --json_dut input to lf_check.py 
+        The lf_dut.json file contains dut configuration information
+        NOTE: cannot have extra blank lines at the end of the json to work properly
+
+            ''',
+        description='''\
+File: create lf_dut.json file for --json_dut input to lf_check.py , LANforge traffic generation system
+Usage: lf_create_dut_json.py --file <lf_dut.json> --dut_name GT-AXE11000 --dut_hw A1.1 --dut_sw 3.0.0.4.386 --dut_model GT-AXE11000 
+                --dut_serial 123456 --log_level debug
+                --ssid_idx "ssid_idx==0,ssid_used==axe11000_2g,ssid_pw_used==lf_axe11000_2g,bssid==fc:34:97:2b:38:90,security_used==wpa2"
+                --ssid_idx "ssid_idx==1,ssid_used==axe11000_5g,ssid_pw_used==lf_axe11000_5g,bssid==fc:34:97:2b:38:94,security_used==wpa2"
+            ]
+
+        ''')
+    parser.add_argument('--file', help='--file lf_dut.json , required', required=True)
+    parser.add_argument('--dut_name', help='--dut_name <device under test> required', required=True)
+    parser.add_argument('--dut_hw', help='--dut_hw <dut hardware version> ', default='dut_hw')
+    parser.add_argument('--dut_sw', help='--dut_sw <dut software version> ', default='dut_sw')
+    parser.add_argument('--dut_model', help='--dut_model <dut model> ', default='dut_model')
+    parser.add_argument('--dut_serial', help='--dut_serial <dut_serial_num> ', default='123456578')
+    parser.add_argument(
+        '--ssid_idx',
+        action='append',
+        nargs=1,
+        required=True,
+        help=('--ssid_idx', 
+            ' "ssid_idx==0,SSID_USED==<ssid>,SSID_PW_USED==<ssid password>,BSSID==<bssid>,SECURITY_USED==<security> ',
+            ' '
+
+        )
+    )
+    parser.add_argument('--log_level',
+                        default=None,
+                        help='Set logging level: debug | info | warning | error | critical')
+
+    # logging configuration
+    parser.add_argument(
+        "--lf_logger_config_json",
+        help="--lf_logger_config_json <json file> , json configuration of logger")
+
+
+    args = parser.parse_args()
+
+    # set up logger
+    logger_config = lf_logger_config.lf_logger_config()
+
+    # set the logger level to debug
+    if args.log_level:
+        logger_config.set_level(level=args.log_level)
+
+    # lf_logger_config_json will take presidence to changing debug levels
+    if args.lf_logger_config_json:
+        # logger_config.lf_logger_config_json = "lf_logger_config.json"
+        logger_config.lf_logger_config_json = args.lf_logger_config_json
+        logger_config.load_lf_logger_config()
+
+    _file=args.file
+    _dut_name=args.dut_name
+    _dut_hw=args.dut_hw
+    _dut_sw=args.dut_sw
+    _dut_model=args.dut_model
+    _dut_serial=args.dut_serial
+    _ssid_idx=args.ssid_idx
+
+    # create wifi dictionary, ssid indx
+    ssid_idx_dict_dict_str = ""
+    
+    logger.debug("_ssid_idx len {len_ssid_idx}".format(len_ssid_idx=len(_ssid_idx)))
+
+    ssid_idx_lengh = len(_ssid_idx)
+    for ssid_idx_ in _ssid_idx:
+        ssid_idx_keys = ['ssid_idx','ssid','ssid_pw','bssid','security']
+        _ssid_idx_dict_element = dict(
+            map(
+                lambda x: x.split('=='),
+                str(ssid_idx_).replace(
+                    '"',
+                    '').replace(
+                    '[',
+                    '').replace(
+                    ']',
+                    '').replace(
+                    "'",
+                    "").replace(
+                        ",",
+                    " ").split()))
+
+
+        for key in ssid_idx_keys:
+            if key not in ssid_idx_keys:
+                logger.critical(
+                    "missing config, for the {}, all of the following need to be present {} ".format(
+                        key, ssid_idx_keys))
+
+                exit(1)
+
+        # create the index string with index
+        ssid_idx = _ssid_idx_dict_element['ssid_idx']
+        ssid_idx_str = "\"ssid_idx={idx}\":".format(idx=_ssid_idx_dict_element['ssid_idx'])
+
+        # convert a dictionary to a string
+        ssid_idx_dict_element_str = str(_ssid_idx_dict_element)
+        logger.debug("ssid_idx_dict_element {dict}".format(dict=_ssid_idx_dict_element))
+
+        # convert string to json
+        ssid_idx_dict_element_str = str(_ssid_idx_dict_element).replace(
+            '\'',
+            '\"'
+        )
+        logger.debug("ssid_idx_dict_element_str {dict}".format(dict=ssid_idx_dict_element_str))
+
+        if ((ssid_idx_lengh - 1) != int(ssid_idx)):
+            ssid_idx_dict_dict_str += "\t\t\t" + ssid_idx_str + ssid_idx_dict_element_str + ",\n"
+        else:
+            # last element does not have comma at the end
+            ssid_idx_dict_dict_str += "\t\t\t" + ssid_idx_str + ssid_idx_dict_element_str + "\n"
+
+
+
+    dut_json = lf_create_dut_json(_file=_file,
+                                _dut_name=_dut_name,
+                                _dut_hw=_dut_hw,
+                                _dut_sw=_dut_sw,
+                                _dut_model=_dut_model,
+                                _dut_serial=_dut_serial,
+                                _ssid_idx_dict_dict_str=ssid_idx_dict_dict_str)
+    dut_json.create()
+
+
+if __name__ == '__main__':
+    main()

py-scripts/tools/ct_rig_json/lf_create_rig_json.py

@@ -40,7 +40,7 @@ class lf_create_rig_json():
 {{
     "{file}":{{
         "Notes":[
-            "This json file describes LANforge system and test run configuration"
+            "This json file describes LANforge system used as input for --dut_json for lf_check.py"
         ]
     }},
     "test_rig_parameters":{{