From 284b6a142e7f7ae911cf1788066fe4a7efa690b0 Mon Sep 17 00:00:00 2001 From: shivam Date: Wed, 17 Aug 2022 00:18:38 +0530 Subject: [PATCH] Fixed the key error for sniff_radio Signed-off-by: shivam --- lf_libs/lf_libs.py | 40 ++++++++++++++++++++-------------------- lf_libs/lf_tests.py | 22 +++++++++++++--------- 2 files changed, 33 insertions(+), 29 deletions(-) diff --git a/lf_libs/lf_libs.py b/lf_libs/lf_libs.py index bf4700c8..c0ce84a3 100644 --- a/lf_libs/lf_libs.py +++ b/lf_libs/lf_libs.py @@ -137,27 +137,27 @@ class lf_libs: logging.basicConfig(format='%(asctime)s - %(message)s', level=log_level) lf_data = dict(lf_data) self.dut_data = dut_data - # try: - self.lanforge_data = lf_data.get("details") - self.testbed = lf_data.get("testbed") - self.scenario = lf_data.get("scenario") - self.setup_lf_data() - self.setup_relevent_profiles() - # self.load_scenario() - # self.setup_metadata() - if self.scenario == "dhcp-bridge": - logging.info("Scenario name: " + str(self.scenario)) - # creating default raw lines for chamberview - self.create_dhcp_bridge() - elif self.scenario == "dhcp-external": - logging.info("Scenario name: " + str(self.scenario)) - self.create_dhcp_external() - self.chamber_view(raw_lines=self.default_scenario_raw_lines) - self.setup_dut() + try: + self.lanforge_data = lf_data.get("details") + self.testbed = lf_data.get("testbed") + self.scenario = lf_data.get("scenario") + self.setup_lf_data() + self.setup_relevent_profiles() + # self.load_scenario() + self.setup_metadata() + if self.scenario == "dhcp-bridge": + logging.info("Scenario name: " + str(self.scenario)) + # creating default raw lines for chamberview + self.create_dhcp_bridge() + elif self.scenario == "dhcp-external": + logging.info("Scenario name: " + str(self.scenario)) + self.create_dhcp_external() + self.chamber_view(raw_lines=self.default_scenario_raw_lines) + self.setup_dut() - # except Exception as e: - # logging.error("lf_data has bad values: " + str(lf_data)) - # logging.error(e) + except Exception as e: + logging.error("lf_data has bad values: " + str(lf_data)) + logging.error(e) """ setup_lf_data : used to set object variables that are passed from lab_info.json diff --git a/lf_libs/lf_tests.py b/lf_libs/lf_tests.py index 05f655cd..6a461c6d 100644 --- a/lf_libs/lf_tests.py +++ b/lf_libs/lf_tests.py @@ -1,16 +1,14 @@ +import csv import importlib import logging import os import sys import time from datetime import datetime -import allure -import paramiko -import pytest -import csv from itertools import islice -from scp import SCPClient -from tabulate import tabulate + +import allure +import pytest sys.path.append(os.path.join(os.path.abspath(__file__ + "../../../"))) lfcli_base = importlib.import_module("py-json.LANforge.lfcli_base") @@ -431,7 +429,7 @@ class lf_tests(lf_libs): if dict(dut_data.get(identifier)[-1]).keys().__contains__("2G") and \ dict(dut_data.get(identifier)[-1])["2G"] is not None: channel = dict(dut_data.get(identifier)[-1])["2G"][0] - self.start_sniffer(radio_channel=channel, radio=data["sniff_radio"].split(".")[2], + self.start_sniffer(radio_channel=channel, radio=data["sniff_radio_2g"].split(".")[2], duration=runtime_secs) print("started-sniffer") for obj in sta_connect_obj: @@ -445,7 +443,7 @@ class lf_tests(lf_libs): if dict(dut_data.get(identifier)[-1]).keys().__contains__("5G") and \ dict(dut_data.get(identifier)[-1])["5G"] is not None: channel = dict(dut_data.get(identifier)[-1])["5G"][0] - self.start_sniffer(radio_channel=channel, radio=data["sniff_radio"].split(".")[2], + self.start_sniffer(radio_channel=channel, radio=data["sniff_radio_5g"].split(".")[2], duration=runtime_secs) for obj in sta_connect_obj: print(obj) @@ -457,7 +455,7 @@ class lf_tests(lf_libs): if dict(dut_data.get(identifier)[-1]).keys().__contains__("6G") and \ dict(dut_data.get(identifier)[-1])["6G"] is not None: channel = dict(dut_data.get(identifier)[-1])["6G"][0] - self.start_sniffer(radio_channel=channel, radio=data["sniff_radio"].split(".")[2], + self.start_sniffer(radio_channel=channel, radio=data["sniff_radio_6g"].split(".")[2], duration=runtime_secs) for obj in sta_connect_obj: print(obj) @@ -465,6 +463,12 @@ class lf_tests(lf_libs): print("napping %f sec" % runtime_secs) time.sleep(runtime_secs) self.stop_sniffer() + else: + for obj in sta_connect_obj: + print(obj) + obj.start() + print("napping %f sec" % runtime_secs) + time.sleep(runtime_secs) pass_fail_result = [] for obj in sta_connect_obj: print(obj.station_names)