scottk/wlan-testing
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-testing.git synced 2025-11-03 12:27:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

added upstream logic for dut in create mesh function

Browse Source
This commit is contained in:
Nikita Yadav
2021-09-13 21:44:25 +05:30
parent 7ac6fc489c
commit b187d528b7
1 changed files with 34 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
libs/lanforge/lf_tools.py
View File

@@ -66,26 +66,6 @@ class ChamberView:
["profile_link " + self.uplink_resource_1 + " uplink-nat 1 'DUT: upstream LAN " + self.upstream_subnet + "' NA " + self.uplink_port_1.split(".")[2] + "," + self.upstream_port_1.split(".")[2] + " -1 NA"] ["profile_link " + self.uplink_resource_1 + " uplink-nat 1 'DUT: upstream LAN " + self.upstream_subnet + "' NA " + self.uplink_port_1.split(".")[2] + "," + self.upstream_port_1.split(".")[2] + " -1 NA"]
] ]
self.CreateChamberview = CreateChamberview(self.lanforge_ip, self.lanforge_port) self.CreateChamberview = CreateChamberview(self.lanforge_ip, self.lanforge_port)
# if access_point_data:
# # for DUT
# self.dut_name = testbed
# self.ap_model = access_point_data[0]["model"]
# self.version = access_point_data[0]["version"].split("/")[-1]
# self.serial_1 = access_point_data[0]["serial"]
# # self.serial = access_point_data[1]["serial"]
#
#
# self.CreateDut = DUT(lfmgr=self.lanforge_ip,
# port=self.lanforge_port,
# dut_name=self.testbed,
# sw_version=self.version,
# hw_version=self.ap_model,
# model_num=self.ap_model,
# serial_num=self.serial
# )
# self.CreateDut.ssid = []
else: else:
self.lanforge_ip = lanforge_data["ip"] self.lanforge_ip = lanforge_data["ip"]
self.lanforge_port = lanforge_data["port"] self.lanforge_port = lanforge_data["port"]
@@ -330,37 +310,45 @@ class ChamberView:
attachment_type="image/png", extension=None) attachment_type="image/png", extension=None)
def create_mesh(self): def create_mesh(self):
upstream_list = []
for data in range(0,len(self.access_point_data)):
self.CreateDut = DUT(lfmgr=self.lanforge_ip,
port=self.lanforge_port,
dut_name="upstream" + str(data))
self.CreateDut.lan_port = "10.28.2.1/24"
name = "upstream" + str(data)
upstream_list.append(name)
self.CreateDut.setup()
data = data + 1
self.raw_line = [ self.raw_line = [
["profile_link " + self.upstream_resource_2 + " upstream-dhcp 1 NA NA " + self.upstream_port_2.split(".")[2] + ",AUTO -1 NA"], ["profile_link " + self.upstream_resource_2 + " upstream-dhcp 1 NA NA " + self.upstream_port_2.split(".")[2] + ",AUTO -1 NA"],
["profile_link " + self.uplink_resource_2 + " uplink-nat 1 'DUT: upstream LAN " + self.upstream_subnet + "' NA " + self.uplink_port_2.split(".")[2] + "," + self.upstream_port_2.split(".")[2] + " -1 NA"], ["profile_link " + self.uplink_resource_2 + " uplink-nat 1 'DUT: " + str(upstream_list[0]) + " LAN " + self.upstream_subnet + "' NA " + self.uplink_port_2.split(".")[2] + "," + self.upstream_port_2.split(".")[2] + " -1 NA"],
["profile_link " + self.upstream_resource_3 + " upstream-dhcp 1 NA NA " + self.upstream_port_3.split(".")[2] + ",AUTO -1 NA"], ["profile_link " + self.upstream_resource_3 + " upstream-dhcp 1 NA NA " + self.upstream_port_3.split(".")[2] + ",AUTO -1 NA"],
["profile_link " + self.uplink_resource_3 + " uplink-nat 1 'DUT: upstream2 LAN " + self.upstream_subnet + "' NA " + self.uplink_port_3.split(".")[2] + "," + self.upstream_port_3.split(".")[2] + " -1 NA"], ["profile_link " + self.uplink_resource_3 + " uplink-nat 1 'DUT: " + str(upstream_list[1]) + " LAN " + self.upstream_subnet + "' NA " + self.uplink_port_3.split(".")[2] + "," + self.upstream_port_3.split(".")[2] + " -1 NA"],
["profile_link " + self.upstream_resource_4 + " upstream-dhcp 1 NA NA " + self.upstream_port_4.split(".")[2] + ",AUTO -1 NA"], ["profile_link " + self.upstream_resource_4 + " upstream-dhcp 1 NA NA " + self.upstream_port_4.split(".")[2] + ",AUTO -1 NA"],
["profile_link " + self.uplink_resource_4 + " uplink-nat 1 'DUT: upstream3 LAN " + self.upstream_subnet + "' NA " + self.uplink_port_4.split(".")[2] + "," + self.upstream_port_4.split(".")[2] + " -1 NA"] ["profile_link " + self.uplink_resource_4 + " uplink-nat 1 'DUT: " + str(upstream_list[0]) + " LAN " + self.upstream_subnet + "' NA " + self.uplink_port_4.split(".")[2] + "," + self.upstream_port_4.split(".")[2] + " -1 NA"]
] ]
print(self.raw_line) print(self.raw_line)
mesh = self.Chamber_View() mesh = self.Chamber_View()
return mesh return mesh
def create_mesh_dut(self): def create_mesh_dut(self):
for i in range(0,len(self.access_point_data)): for ap in self.access_point_data:
if i == 0 : # print(ap)
self.dut_name = "tip-root" self.dut_name = ap["type"]
if i == 1: print(self.dut_name)
self.dut_name = "tip-node-1" self.ap_model = ap["model"]
if i == 2: self.version = ap["version"].split("/")[-1]
self.dut_name = "tip-node-2" self.serial = ap["serial"]
self.ap_model = self.access_point_data[i]["model"] self.CreateDut = DUT(lfmgr=self.lanforge_ip,
self.version = self.access_point_data[i]["version"].split("/")[-1] port=self.lanforge_port,
self.serial = self.access_point_data[i]["serial"] dut_name=self.dut_name,
self.CreateDut = DUT(lfmgr=self.lanforge_ip, hw_version=self.ap_model,
port=self.lanforge_port, model_num=self.ap_model,
dut_name=self.dut_name, serial_num=self.serial
hw_version=self.ap_model, )
model_num=self.ap_model, self.Create_Dut()
serial_num=self.serial
)
self.Create_Dut()
def main(): def main():
# lanforge_data = {'ip': 'localhost', 'port': 8802, 'ssh_port': 8804, '2.4G-Radio': ['1.1.wiphy0', '1.1.wiphy2'], '5G-Radio': ['1.1.wiphy1', '1.1.wiphy3'], 'AX-Radio': ['1.1.wiphy4', '1.1.wiphy5', '1.1.wiphy6', '1.1.wiphy7'], 'upstream': '1.1.eth2', 'upstream_subnet': '10.28.2.1/24', 'uplink': '1.1.eth1', '2.4G-Station-Name': 'sta00', '5G-Station-Name': 'sta10', 'AX-Station-Name': 'ax'} # lanforge_data = {'ip': 'localhost', 'port': 8802, 'ssh_port': 8804, '2.4G-Radio': ['1.1.wiphy0', '1.1.wiphy2'], '5G-Radio': ['1.1.wiphy1', '1.1.wiphy3'], 'AX-Radio': ['1.1.wiphy4', '1.1.wiphy5', '1.1.wiphy6', '1.1.wiphy7'], 'upstream': '1.1.eth2', 'upstream_subnet': '10.28.2.1/24', 'uplink': '1.1.eth1', '2.4G-Station-Name': 'sta00', '5G-Station-Name': 'sta10', 'AX-Station-Name': 'ax'}
@@ -400,6 +388,7 @@ def main():
# ap_data = [{'model': 'wf188n', 'mode': 'wifi6', 'serial': '0000c1018812', 'jumphost': True, 'ip': 'localhost', 'username': 'lanforge', 'password': 'pumpkin77', 'port': 8803, 'jumphost_tty': '/dev/ttyAP1', 'version': 'https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/cig_wf188/20210729-cig_wf188-v2.0.0-rc2-ec3662e-upgrade.bin'}] # ap_data = [{'model': 'wf188n', 'mode': 'wifi6', 'serial': '0000c1018812', 'jumphost': True, 'ip': 'localhost', 'username': 'lanforge', 'password': 'pumpkin77', 'port': 8803, 'jumphost_tty': '/dev/ttyAP1', 'version': 'https://tip.jfrog.io/artifactory/tip-wlan-ap-firmware/uCentral/cig_wf188/20210729-cig_wf188-v2.0.0-rc2-ec3662e-upgrade.bin'}]
ap_data = [ ap_data = [
{ {
'type' : 'root',
'model': 'eap101', 'model': 'eap101',
'mode': 'wifi6', 'mode': 'wifi6',
'serial': '34efb6af4a7a', 'serial': '34efb6af4a7a',
@@ -412,6 +401,7 @@ def main():
'version': "latest" 'version': "latest"
}, },
{ {
'type': 'node-1',
'model': 'eap101', 'model': 'eap101',
'mode': 'wifi6', 'mode': 'wifi6',
'serial': '34efb6af4903', 'serial': '34efb6af4903',
@@ -424,6 +414,7 @@ def main():
'version': "latest" 'version': "latest"
}, },
{ {
'type' : 'node-2',
'model': 'eap102', 'model': 'eap102',
'mode': 'wifi6', 'mode': 'wifi6',
'serial': '34efb6af4a7a', 'serial': '34efb6af4a7a',
@@ -438,7 +429,8 @@ def main():
] ]
testbed = "mesh" testbed = "mesh"
obj = ChamberView(lanforge_data=lanforge_data, access_point_data=ap_data, testbed="mesh") obj = ChamberView(lanforge_data=lanforge_data, access_point_data=ap_data, testbed="mesh")
obj.create_mesh_dut() # obj.create_mesh_dut()
obj.create_mesh()
if __name__ == '__main__': if __name__ == '__main__':
main() main()