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

removing changes

Browse Source
This commit is contained in:
anjali
2021-07-03 00:18:19 +05:30
parent 130dac16eb
commit 534b584b72
4 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
py-json/LANforge/LFUtils.py
View File

@@ -270,7 +270,7 @@ def portNameSeries(prefix_="sta", start_id_=0, end_id_=1, padding_number_=10000,
return port_name_series(prefix=prefix_, start_id=start_id_, end_id=end_id_, padding_number=padding_number_, radio=radio) return port_name_series(prefix=prefix_, start_id=start_id_, end_id=end_id_, padding_number=padding_number_, radio=radio)
def port_name_series(prefix="sta", start_id=0, end_id=1, padding_number=10000, radio=None, resource=None): def port_name_series(prefix="sta", start_id=0, end_id=1, padding_number=10000, radio=None):
""" """
This produces a named series similar to "sta000, sta001, sta002...sta0(end_id)" This produces a named series similar to "sta000, sta001, sta002...sta0(end_id)"
the padding_number is added to the start and end numbers and the resulting sum the padding_number is added to the start and end numbers and the resulting sum
@@ -285,7 +285,7 @@ def port_name_series(prefix="sta", start_id=0, end_id=1, padding_number=10000, r
eid = None eid = None
if radio is not None: if radio is not None:
eid = name_to_eid(radio, resource=resource) eid = name_to_eid(radio)
name_list = [] name_list = []
for i in range((padding_number + start_id), (padding_number + end_id + 1)): for i in range((padding_number + start_id), (padding_number + end_id + 1)):
@@ -549,11 +549,8 @@ def waitUntilPortsAppear(base_url="http://localhost:8080", port_list=(), debug=F
""" """
return wait_until_ports_appear(base_url, port_list, debug=debug) return wait_until_ports_appear(base_url, port_list, debug=debug)
def name_to_eid(input, non_port=False, resource=None): def name_to_eid(input, non_port=False):
if resource is None: rv = [1, 1, "", ""]
rv = [1, 1, "", ""]
else:
rv = [1, resource, "", ""]
info = [] info = []
if (input is None) or (input == ""): if (input is None) or (input == ""):
raise ValueError("name_to_eid wants eid like 1.1.sta0 but given[%s]" % input) raise ValueError("name_to_eid wants eid like 1.1.sta0 but given[%s]" % input)

1
py-json/mac_vlan_profile.py
View File

@@ -136,7 +136,6 @@ class MACVLANProfile(LFCliBase):
set_port.set_port_current_flags) set_port.set_port_current_flags)
self.set_port_data["interest"] = self.add_named_flags(self.desired_set_port_interest_flags, self.set_port_data["interest"] = self.add_named_flags(self.desired_set_port_interest_flags,
set_port.set_port_interest_flags) set_port.set_port_interest_flags)
self.set_port_data["resource"] = self.resource
set_port_r = LFRequest.LFRequest(self.lfclient_url + "/cli-json/set_port") set_port_r = LFRequest.LFRequest(self.lfclient_url + "/cli-json/set_port")
for i in range(len(self.desired_macvlans)): for i in range(len(self.desired_macvlans)):

4
py-json/realm.py
View File

@@ -582,12 +582,12 @@ class Realm(LFCliBase):
return matched_map return matched_map
def name_to_eid(self, eid, debug=False, non_port=False, resource=None): def name_to_eid(self, eid, debug=False, non_port=False):
if debug: if debug:
self.logg(level="debug", mesg="name_to_eid: "+str(eid)) self.logg(level="debug", mesg="name_to_eid: "+str(eid))
if (type(eid) is list) or (type(eid) is tuple): if (type(eid) is list) or (type(eid) is tuple):
return eid return eid
return LFUtils.name_to_eid(eid, non_port=non_port, resource=resource) return LFUtils.name_to_eid(eid, non_port=non_port)
def wait_for_ip(self, station_list=None, ipv4=True, ipv6=False, timeout_sec=360, debug=False): def wait_for_ip(self, station_list=None, ipv4=True, ipv6=False, timeout_sec=360, debug=False):
if not (ipv4 or ipv6): if not (ipv4 or ipv6):

5
py-json/station_profile.py
View File

@@ -373,11 +373,10 @@ class StationProfile:
suppress_related_commands_=True, suppress_related_commands_=True,
use_radius=False, use_radius=False,
hs20_enable=False, hs20_enable=False,
sleep_time=0.02, sleep_time=0.02):
resource=None):
if (radio is None) or (radio == ""): if (radio is None) or (radio == ""):
raise ValueError("station_profile.create: will not create stations without radio") raise ValueError("station_profile.create: will not create stations without radio")
radio_eid = self.local_realm.name_to_eid(radio, resource=resource) radio_eid = self.local_realm.name_to_eid(radio)
radio_shelf = radio_eid[0] radio_shelf = radio_eid[0]
radio_resource = radio_eid[1] radio_resource = radio_eid[1]
radio_port = radio_eid[2] radio_port = radio_eid[2]