scottk/wlan-lanforge-scripts
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-lanforge-scripts.git synced 2025-11-01 03:07:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

delete base_profile from realm.py, add updated logg function from logg in base_profile in realm.py to base_profile.py file

Browse Source 
Signed-off-by: Dipti <dipti.dhond@candelatech.com>
This commit is contained in:
Dipti
2021-03-03 00:47:09 -08:00
parent bf5dbb841a
commit 37b44441a6
2 changed files with 16 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
py-json/base_profile.py
View File

@@ -7,13 +7,14 @@ import csv
import datetime
import random
import string
import pprint
from pprint import pprint
#from LANforge.lfcriteria import LFCriteria
class BaseProfile:
def __init__(self, local_realm, debug=False):
self.parent_realm = local_realm
self.halt_on_error = False
#self.halt_on_error = False
self.exit_on_error = False
self.debug = debug or local_realm.debug
self.profiles = []
@@ -55,36 +56,34 @@ class BaseProfile:
def wait_until_cxs_appear(self, these_cx, debug=False):
return self.parent_realm.wait_until_cxs_appear(these_cx, debug=False)
def logg(self, message=None):
def logg(self, message=None, audit_list=None):
if audit_list is None:
self.parent_realm.logg(message)
for item in audit_list:
message += ("\n" + pprint.pformat(item, indent=4))
self.parent_realm.logg(message)
def replace_special_char(self,
str):
def replace_special_char(self, str):
return str.replace('+', ' ').replace('_', ' ').strip(' ')
def get_milliseconds(self,
timestamp):
def get_milliseconds(self, timestamp):
return (timestamp - datetime.datetime(1970,1,1)).total_seconds()*1000
def get_seconds(self,
timestamp):
def get_seconds(self, timestamp):
return (timestamp - datetime.datetime(1970,1,1)).total_seconds()
def read_file(self,
filename):
#Convert file contents to a list
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
#Function to create 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))
#--------------- create file path / find file path code - to be put into functions
# #Find file path to save data/csv to:
# if args.report_file is None:
# new_file_path = str(datetime.datetime.now().strftime("%Y-%m-%d-%H-h-%M-m-%S-s")).replace(':',

49
py-json/realm.py
View File

@@ -926,55 +926,6 @@ class Realm(LFCliBase):
# test_group_profile = test_group_profile2.TestGroupProfile2(self.lfclient_host, self.lfclient_port, local_realm=self, debug_=self.debug)
return test_group_profile
class BaseProfile:
def __init__(self, local_realm, debug=False):
self.parent_realm = local_realm
# self.halt_on_error = False
self.exit_on_error = False
self.debug = debug or local_realm.debug
def json_get(self, _req_url, debug_=False):
return self.parent_realm.json_get(_req_url, debug_=False)
def json_post(self, req_url=None, data=None, debug_=False, suppress_related_commands_=None):
return self.parent_realm.json_post(_req_url=req_url,
_data=data,
suppress_related_commands_=suppress_related_commands_,
debug_=debug_)
def parse_time(self, time_string):
return self.parent_realm.parse_time(time_string)
def stopping_cx(self, name):
return self.parent_realm.stop_cx(name)
def cleanup_cxe_prefix(self, prefix):
return self.parent_realm.cleanup_cxe_prefix(prefix)
def rm_cx(self, cx_name):
return self.parent_realm.rm_cx(cx_name)
def rm_endp(self, ename, debug_=False, suppress_related_commands_=True):
self.parent_realm.rm_endp(ename, debug_=False, suppress_related_commands_=True)
def name_to_eid(self, eid):
return self.parent_realm.name_to_eid(eid)
def set_endp_tos(self, ename, _tos, debug_=False, suppress_related_commands_=True):
return self.parent_realm.set_endp_tos(ename, _tos, debug_=False, suppress_related_commands_=True)
def wait_until_endps_appear(self, these_endp, debug=False):
return self.parent_realm.wait_until_endps_appear(these_endp, debug=False)
def wait_until_cxs_appear(self, these_cx, debug=False):
return self.parent_realm.wait_until_cxs_appear(these_cx, debug=False)
def logg(self, message=None, audit_list=None):
if audit_list is None:
self.parent_realm.logg(message)
for item in audit_list:
message += ("\n" + pprint.pformat(item, indent=4))
self.parent_realm.logg(message)
class MULTICASTProfile(LFCliBase):
def __init__(self, lfclient_host, lfclient_port, local_realm,