diff --git a/py-json/LANforge/lfcli_base.py b/py-json/LANforge/lfcli_base.py index 84637d7c..905a5e89 100644 --- a/py-json/LANforge/lfcli_base.py +++ b/py-json/LANforge/lfcli_base.py @@ -590,31 +590,24 @@ class LFCliBase: } self.json_post("/cli-json/add_event", data, debug_=debug_) - # def read_file(self, - # filename): - # #Convert file contents to a list - # filename = open(filename, 'r') - # return [line.split(',') for line in filename.readlines()] + def read_file(self, filename): + filename = open(filename, 'r') + return [line.split(',') for line in filename.readlines()] - # def random_chars(self, - # size, - # chars=None): - # #Create random characters made of letters - # if chars is None: - # chars = string.ascii_letters - # return ''.join(random.choice(chars) for x in range(size)) + #Function creates random characters made of letters + def random_chars(self, size, chars=None): + if chars is None: + chars = string.ascii_letters + return ''.join(random.choice(chars) for x in range(size)) - # def get_milliseconds(self, - # timestamp): - # return (timestamp - datetime.datetime(1970,1,1)).total_seconds()*1000 - # def get_seconds(self, - # timestamp): - # return (timestamp - datetime.datetime(1970,1,1)).total_seconds() + def get_milliseconds(self, timestamp): + return (timestamp - datetime.datetime(1970,1,1)).total_seconds()*1000 + def get_seconds(self, timestamp): + return (timestamp - datetime.datetime(1970,1,1)).total_seconds() - # def replace_special_char(self, - # str): - # return str.replace('+', ' ').replace('_', ' ').strip(' ') + def replace_special_char(self, str): + return str.replace('+', ' ').replace('_', ' ').strip(' ') Help_Mode = """Station WiFi modes: use the number value below: auto : 0, diff --git a/py-json/l3_cxprofile.py b/py-json/l3_cxprofile.py index 777f5922..68e011e8 100644 --- a/py-json/l3_cxprofile.py +++ b/py-json/l3_cxprofile.py @@ -3,7 +3,7 @@ import re import time import pprint -from base_profile import BaseProfile +from LANforge.lfcli_base import LFCliBase import csv import pandas as pd import os @@ -13,7 +13,7 @@ import random import string import datetime -class L3CXProfile(BaseProfile): +class L3CXProfile(LFCliBase): def __init__(self, lfclient_host, lfclient_port, @@ -46,7 +46,7 @@ class L3CXProfile(BaseProfile): :param number_template_: how many zeros wide we padd, possibly a starting integer with left padding :param debug_: """ - super().__init__(local_realm, debug = debug_) + super().__init__(lfclient_host, lfclient_port, _debug = debug_) self.debug = debug_ self.local_realm = local_realm self.side_a_min_pdu = side_a_min_pdu