diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 01eb9f7f4..e8855f27e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -16,4 +16,4 @@ repos: rev: 6.0.0 hooks: - id: flake8 - args: ["--max-line-length=201", "--extend-ignore=W605,F401,F402,F523,F524,F541,F601,F632,F811,F821,F841,E701,E722,E741,E203,E231"] + args: ["--max-line-length=201", "--extend-ignore=W605,F401,F402,F523,F524,F541,F601,F632,F811,F821,F841,E701,E722,E741,E203"] diff --git a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/bridging/bridging_packet_types.py b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/bridging/bridging_packet_types.py index 89aa3d94f..55a94aa30 100644 --- a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/bridging/bridging_packet_types.py +++ b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/bridging/bridging_packet_types.py @@ -10,7 +10,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstMac': '00:00:BB:11:22:33', 'frameSize': 96, 'protocol': '0x6666', - 'type' :'raw', + 'type' : 'raw', }, 'BridgedLLDP': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -19,7 +19,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstMac': '01:80:c2:00:00:0e', 'frameSize': 96, 'protocol': '0x88cc', - 'type' :'raw' + 'type' : 'raw' }, 'LACPDU': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -28,7 +28,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstMac': '01:80:c2:00:00:02', 'frameSize': 130, 'protocol': '0x8809', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4ToMe': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -39,7 +39,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstMac': self_mac, 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'ARP_Request_BC': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -48,7 +48,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstMac': 'FF:FF:FF:FF:FF:FF', 'frameSize': 96, 'protocol': '0x0806', - 'type' :'raw' + 'type' : 'raw' }, 'ARP_Reply': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -57,7 +57,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstMac': self_mac, 'frameSize': 96, 'protocol': '0x0806', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_Broadcast': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -68,7 +68,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstMac': 'FF:FF:FF:FF:FF:FF', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPV4_SSH': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -82,7 +82,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstPort': '22', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPV4_Telnet': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -96,7 +96,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstPort': '23', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'Host_to_Host_IPv4': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -110,7 +110,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstPort': '23', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_ICMP_Request': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -122,7 +122,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'ipproto': 'icmpv1', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_DCHP_BC': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -137,7 +137,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstPort': '68', 'frameSize': 346, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_Reserved_MC': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -148,7 +148,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstMac': '01:00:5E:00:00:45', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_All_Systems_on_this_Subnet': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -159,7 +159,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstMac': '01:00:5E:00:00:01', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_All_Routers_on_this_Subnet': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -170,7 +170,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstMac': '01:00:5E:00:00:02', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_OSPFIGP': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -181,7 +181,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstMac': '01:00:5E:00:00:05', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_RIP2_Routers': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -192,7 +192,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstMac': '01:00:5E:00:00:09', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_EIGRP_Routers': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -203,7 +203,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstMac': '01:00:5E:00:00:0A', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_DHCP_Server/Relay_Agent': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -217,7 +217,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstPort': '67', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_VRRP': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -229,7 +229,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): # "packet.ipv4.protocol": 112, 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_IGMP' : { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -240,7 +240,7 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstMac': '01:00:5E:00:00:16', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPV4_BGP': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -254,6 +254,6 @@ def get_streams(srcMac, self_mac, prefix, dev_groups, tg_ports): 'dstMac': self_mac, 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' } } diff --git a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/bridging/test_bridging_bum_traffic_bridge.py b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/bridging/test_bridging_bum_traffic_bridge.py index ac9013b6d..0dc714011 100644 --- a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/bridging/test_bridging_bum_traffic_bridge.py +++ b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/bridging/test_bridging_bum_traffic_bridge.py @@ -126,7 +126,7 @@ async def test_bridging_bum_traffic_bridge_with_rif(testbed): 'Host_to_Host_IPv4': 100, 'IPv4_ICMP_Request': 100, 'IPv4_DCHP_BC': 0, - 'IPv4_Reserved_MC' :0, + 'IPv4_Reserved_MC' : 0, 'IPv4_All_Systems_on_this_Subnet': 0, 'IPv4_All_Routers_on_this_Subnet': 0, 'IPv4_OSPFIGP' : 0, @@ -245,7 +245,7 @@ async def test_bridging_bum_traffic_bridge_without_rif(testbed): 'Host_to_Host_IPv4': 100, 'IPv4_ICMP_Request': 100, 'IPv4_DCHP_BC': 0, - 'IPv4_Reserved_MC' :0, + 'IPv4_Reserved_MC' : 0, 'IPv4_All_Systems_on_this_Subnet': 0, 'IPv4_All_Routers_on_this_Subnet': 0, 'IPv4_OSPFIGP' : 0, diff --git a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/bridging/test_bridging_forward_block_different_packets.py b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/bridging/test_bridging_forward_block_different_packets.py index 179958e74..f16a76978 100644 --- a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/bridging/test_bridging_forward_block_different_packets.py +++ b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/bridging/test_bridging_forward_block_different_packets.py @@ -87,7 +87,7 @@ async def test_bridging_forward_block_different_packets(testbed): 'dstMac': 'FF:FF:FF:FF:FF:FF', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_Reserved_MC': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -101,7 +101,7 @@ async def test_bridging_forward_block_different_packets(testbed): 'dstMac': '01:00:5E:00:00:45', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_All_Systems_on_this_Subnet': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -112,7 +112,7 @@ async def test_bridging_forward_block_different_packets(testbed): 'dstMac': '01:00:5E:00:00:01', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_All_Routers_on_this_Subnet': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -123,7 +123,7 @@ async def test_bridging_forward_block_different_packets(testbed): 'dstMac': '01:00:5E:00:00:02', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_OSPFIGP': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -137,7 +137,7 @@ async def test_bridging_forward_block_different_packets(testbed): 'dstMac': '01:00:5E:00:00:05', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_RIP2_Routers': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -148,7 +148,7 @@ async def test_bridging_forward_block_different_packets(testbed): 'dstMac': '01:00:5E:00:00:09', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_EIGRP_Routers': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -159,7 +159,7 @@ async def test_bridging_forward_block_different_packets(testbed): 'dstMac': '01:00:5E:00:00:0A', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_DHCP_Server/Relay_Agent': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -173,7 +173,7 @@ async def test_bridging_forward_block_different_packets(testbed): 'dstPort': '67', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_VRRP': { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -185,7 +185,7 @@ async def test_bridging_forward_block_different_packets(testbed): # "packet.ipv4.protocol": 112, 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, 'IPv4_IGMP' : { 'ip_source': dev_groups[tg_ports[0]][0]['name'], @@ -196,7 +196,7 @@ async def test_bridging_forward_block_different_packets(testbed): 'dstMac': '01:00:5E:00:00:16', 'frameSize': 96, 'protocol': '0x0800', - 'type' :'raw' + 'type' : 'raw' }, } diff --git a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/bridging/test_bridging_robustness_macs.py b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/bridging/test_bridging_robustness_macs.py index bf27255c6..a6ded2513 100644 --- a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/bridging/test_bridging_robustness_macs.py +++ b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/functional/bridging/test_bridging_robustness_macs.py @@ -90,7 +90,7 @@ async def test_bridging_robustness_macs(testbed): for x in range(3): streams = { f'bridge_{x + 1}': { - 'ip_source': dev_groups[tg_ports[random.randint(0,2)]][0]['name'], + 'ip_source': dev_groups[tg_ports[random.randint(0, 2)]][0]['name'], 'ip_destination': dev_groups[tg_ports[3]][0]['name'], 'srcMac': {'type': 'increment', 'start': '00:00:00:00:00:35', diff --git a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/sanity/test_switch_reload.py b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/sanity/test_switch_reload.py index ccb91f04e..524ada0c0 100644 --- a/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/sanity/test_switch_reload.py +++ b/DentOS_Framework/DentOsTestbed/src/dent_os_testbed/test/test_suite/sanity/test_switch_reload.py @@ -88,7 +88,7 @@ async def test_switch_reload_all(testbed): assert rc == 0, f'Could not run the {cmd}' data = json.loads(out) peers = data['ipv4Unicast']['peers'] - for k,v in bgp_state[host]['ipv4Unicast']['peers'].items(): + for k, v in bgp_state[host]['ipv4Unicast']['peers'].items(): if v['state'] in ['Connect', 'Active']: # no need to check these out. continue @@ -286,7 +286,7 @@ async def _test_switch_reload_disr1_switch(testbed): # if peers[ip]["state"] != "Established": # assert 0, f"peer {i} has no BGP established" - for k,v in prev_bgp['ipv4Unicast']['peers'].items(): + for k, v in prev_bgp['ipv4Unicast']['peers'].items(): if v['state'] in ['Connect', 'Active']: # no need to check these out. continue diff --git a/DentOS_Framework/DentOsTestbedDiscovery/setup.py b/DentOS_Framework/DentOsTestbedDiscovery/setup.py index 48e87c9e9..b20846b6b 100644 --- a/DentOS_Framework/DentOsTestbedDiscovery/setup.py +++ b/DentOS_Framework/DentOsTestbedDiscovery/setup.py @@ -16,7 +16,7 @@ version='1.0', # declare your packages packages=find_namespace_packages(where='src', - exclude=['test',], + exclude=['test', ], include=['dent_os_testbed.*']), package_dir={'': 'src'}, # include data files diff --git a/DentOS_Framework/DentOsTestbedDiscovery/src/dent_os_testbed/discovery/Report.py b/DentOS_Framework/DentOsTestbedDiscovery/src/dent_os_testbed/discovery/Report.py index d0626b4b7..cb5134dd3 100644 --- a/DentOS_Framework/DentOsTestbedDiscovery/src/dent_os_testbed/discovery/Report.py +++ b/DentOS_Framework/DentOsTestbedDiscovery/src/dent_os_testbed/discovery/Report.py @@ -385,7 +385,7 @@ class PartitionSchemaDict(SchemaDict): 'device' : str, 'size' : int, 'free' : int, - 'opts' : str,} + 'opts' : str, } class PartitionItemList(SchemaList): @@ -400,13 +400,13 @@ class BaseboardSchemaDict(SchemaDict): 'cpu_core_count' : int, 'memory_total' : int, 'memory_free' : int, - 'partitions' : PartitionItemList,} + 'partitions' : PartitionItemList, } class FruItemSchemaDict(SchemaDict): __schema_slots__ = {'name' : str, 'model' : str, - 'serial' : str,} + 'serial' : str, } class FruItemList(SchemaList): @@ -416,19 +416,19 @@ class FruItemList(SchemaList): class FruSchemaDict(SchemaDict): __schema_slots__ = {'fans' : FruItemList, 'psus' : FruItemList, - 'serial' : FruItemList,} + 'serial' : FruItemList, } class PlatformSchemaDict(SchemaDict): __schema_slots__ = {'baseboard' : BaseboardSchemaDict, 'software' : LeafSchemaDict, - 'fru' : FruSchemaDict,} + 'fru' : FruSchemaDict, } class SfpSchemaDict(SchemaDict): __schema_slots__ = {'vendor' : str, 'model' : str, - 'serial' : str,} + 'serial' : str, } class InterfaceSchemaDict(SchemaDict): @@ -438,7 +438,7 @@ class InterfaceSchemaDict(SchemaDict): 'configured_state' : str, 'peer_device_id' : str, 'peer_interface' : str, - 'sfp' : SfpSchemaDict,} + 'sfp' : SfpSchemaDict, } class InterfacesSchemaList(SchemaList): @@ -451,7 +451,7 @@ class InterfaceNamesSchemaList(SchemaList): class LagsSchemaDict(SchemaDict): __schema_slots__ = {'name' : str, - 'interfaces' : InterfaceNamesSchemaList,} + 'interfaces' : InterfaceNamesSchemaList, } class LagsSchemaList(SchemaList): @@ -461,13 +461,13 @@ class LagsSchemaList(SchemaList): class L1SchemaDict(SchemaDict): __schema_slots__ = {'management_mac' : str, 'interfaces' : InterfacesSchemaList, - 'lags' : LagsSchemaList,} + 'lags' : LagsSchemaList, } class VlanSchemaDict(SchemaDict): __schema_slots__ = {'vlan_id' : int, 'access_ports' : InterfaceNamesSchemaList, - 'trunk_ports' : InterfaceNamesSchemaList,} + 'trunk_ports' : InterfaceNamesSchemaList, } class VlansSchemaList(SchemaList): @@ -477,7 +477,7 @@ class VlansSchemaList(SchemaList): class BridgeSchemaDict(SchemaDict): ___schema_slots__ = {'name' : str, 'interfaces' : InterfaceNamesSchemaList, - 'stp' : bool,} + 'stp' : bool, } class BridgesSchemaList(SchemaList): @@ -486,14 +486,14 @@ class BridgesSchemaList(SchemaList): class L2SchemaDict(SchemaDict): __schema_slots__ = {'vlans' : VlansSchemaList, - 'bridges' : BridgesSchemaList,} + 'bridges' : BridgesSchemaList, } class BgpNeighSchemaDict(SchemaDict): __schema_slots__ = {'neighbor' : str, 'as_' : int, 'up' : str, - 'state' : str,} + 'state' : str, } class BgpNeighSchemaList(SchemaList): @@ -503,7 +503,7 @@ class BgpNeighSchemaList(SchemaList): class BgpSchemaDict(SchemaDict): __schema_slots__ = {'as_' : int, 'router' : str, - 'neighbors' : BgpNeighSchemaList,} + 'neighbors' : BgpNeighSchemaList, } class OspfNeighSchemaDict(SchemaDict): @@ -511,7 +511,7 @@ class OspfNeighSchemaDict(SchemaDict): 'router_id' : str, 'priority' : int, 'state' : str, - 'interface' : str,} + 'interface' : str, } class OspfNeighSchemaList(SchemaList): @@ -520,7 +520,7 @@ class OspfNeighSchemaList(SchemaList): class OspfSchemaDict(SchemaDict): __schema_slots__ = {'router_id' : str, - 'neighbors' : OspfNeighSchemaList,} + 'neighbors' : OspfNeighSchemaList, } class L3SchemaDict(SchemaDict): @@ -528,19 +528,19 @@ class L3SchemaDict(SchemaDict): 'routes' : UnknownSchemaList, 'acls' : UnknownSchemaDict, 'bgp' : BgpSchemaDict, - 'ospf' : OspfSchemaDict,} + 'ospf' : OspfSchemaDict, } class DeviceNetworkSchemaDict(SchemaDict): __schema_slots__ = {'layer1' : L1SchemaDict, 'layer2' : L2SchemaDict, - 'layer3' : L3SchemaDict,} + 'layer3' : L3SchemaDict, } class DutSchemaDict(SchemaDict): __schema_slots__ = {'device_id' : str, 'platform' : PlatformSchemaDict, - 'network' : DeviceNetworkSchemaDict,} + 'network' : DeviceNetworkSchemaDict, } class DutsSchemaList(SchemaList): @@ -549,7 +549,7 @@ class DutsSchemaList(SchemaList): class InfrastructureSchemaDict(SchemaDict): __schema_slots__ = {'device_id' : str, - 'network' : DeviceNetworkSchemaDict,} + 'network' : DeviceNetworkSchemaDict, } class InfrastructureSchemaList(SchemaList): @@ -558,7 +558,7 @@ class InfrastructureSchemaList(SchemaList): class TestbedInterfaceSchemaDict(SchemaDict): __schema_slots__ = {'device_id' : str, - 'interface' : str,} + 'interface' : str, } class TestbedInterfacesSchemaList(SchemaList): @@ -568,7 +568,7 @@ class TestbedInterfacesSchemaList(SchemaList): class TestbedVlanSchemaDict(SchemaDict): __schema_slots__ = {'vlan_id' : int, 'access_ports' : TestbedInterfacesSchemaList, - 'trunk_ports' : TestbedInterfacesSchemaList,} + 'trunk_ports' : TestbedInterfacesSchemaList, } class TestbedVlansSchemaList(SchemaList): @@ -576,12 +576,12 @@ class TestbedVlansSchemaList(SchemaList): class TestbedL2SchemaDict(SchemaDict): - __schema_slots__ = {'vlans' : TestbedVlansSchemaList,} + __schema_slots__ = {'vlans' : TestbedVlansSchemaList, } class TestbedBgpRouterSchemaDict(SchemaDict): __schema_slots__ = {'router' : str, - 'device_id' : str,} + 'device_id' : str, } class TestbedBgpRoutersSchemaList(SchemaList): @@ -589,13 +589,13 @@ class TestbedBgpRoutersSchemaList(SchemaList): class TestbedBgpSchemaDict(SchemaDict): - __schema_slots__ = {'routers' : TestbedBgpRoutersSchemaList,} + __schema_slots__ = {'routers' : TestbedBgpRoutersSchemaList, } class TestbedOspfRouterSchemaDict(SchemaDict): __schema_slots__ = {'address' : str, 'router_id' : str, - 'device_id' : str,} + 'device_id' : str, } class TestbedOspfRoutersSchemaList(SchemaList): @@ -603,24 +603,24 @@ class TestbedOspfRoutersSchemaList(SchemaList): class TestbedOspfSchemaDict(SchemaDict): - __schema_slots__ = {'routers' : TestbedOspfRoutersSchemaList,} + __schema_slots__ = {'routers' : TestbedOspfRoutersSchemaList, } class TestbedL3SchemaDict(SchemaDict): __schema_slots__ = {'bgp' : TestbedBgpSchemaDict, - 'ospf' : TestbedOspfSchemaDict,} + 'ospf' : TestbedOspfSchemaDict, } class TestbedNetworkSchemaDict(SchemaDict): __schema_slots__ = {'layer2' : TestbedL2SchemaDict, - 'layer3' : TestbedL3SchemaDict,} + 'layer3' : TestbedL3SchemaDict, } class ReportSchemaDict(SchemaDict): __schema_slots__ = {'attributes' : LeafSchemaDict, 'duts' : DutsSchemaList, 'infrastructure' : InfrastructureSchemaList, - 'network' : TestbedNetworkSchemaDict,} + 'network' : TestbedNetworkSchemaDict, } class Report(object): diff --git a/DentOS_Framework/DentOsTestbedLib/gen/lib/database.py b/DentOS_Framework/DentOsTestbedLib/gen/lib/database.py index ed0c58a06..70ec1c4c7 100644 --- a/DentOS_Framework/DentOsTestbedLib/gen/lib/database.py +++ b/DentOS_Framework/DentOsTestbedLib/gen/lib/database.py @@ -207,7 +207,7 @@ def __init__(self, mod, name, ydata, fname): if 'members' in ydata else [] ) - self.members_dct = {m.name:m for m in self.members} + self.members_dct = {m.name: m for m in self.members} self.apis = ydata['apis'] if 'apis' in ydata else ['add', 'del', 'get', 'dump'] self.implements = ydata['implements'] if 'implements' in ydata else None # indicates how many instances the object can have diff --git a/DentOS_Framework/DentOsTestbedLib/gen/plugins/discovery/plugin.py b/DentOS_Framework/DentOsTestbedLib/gen/plugins/discovery/plugin.py index 5a1c67a56..8adff134f 100644 --- a/DentOS_Framework/DentOsTestbedLib/gen/plugins/discovery/plugin.py +++ b/DentOS_Framework/DentOsTestbedLib/gen/plugins/discovery/plugin.py @@ -51,7 +51,7 @@ def generate_schema_classes(self, parent, name): visited = {} queue = [(parent, name)] while queue: - node,name = queue.pop(0) + node, name = queue.pop(0) if node in visited: continue visited[node] = True @@ -102,7 +102,7 @@ def generate_code(self): ) ) - self._classes.append(PyClass('ReportSchema', parent='Report',methods=methods)) + self._classes.append(PyClass('ReportSchema', parent='Report', methods=methods)) def write_file(self): p = PyFile(self._header, self._imports, self._classes, self._methods) @@ -219,7 +219,7 @@ def generate_code(self, dbs, odir): # BFS from base class and create discovery for each class that has implemented by visited = {} # queue=[(dbs["dent"].modules['base'].classes_dct['duts'],'data["duts"][i]')] - queue = [(dbs['dent'].modules['base'].classes_dct['duts'],'self.report.duts[i]')] + queue = [(dbs['dent'].modules['base'].classes_dct['duts'], 'self.report.duts[i]')] while queue: (node, parent) = queue.pop(0) if node in visited: diff --git a/DentOS_Framework/DentOsTestbedLib/gen/plugins/doc/plugin.py b/DentOS_Framework/DentOsTestbedLib/gen/plugins/doc/plugin.py index 8df13de17..3daef4e34 100644 --- a/DentOS_Framework/DentOsTestbedLib/gen/plugins/doc/plugin.py +++ b/DentOS_Framework/DentOsTestbedLib/gen/plugins/doc/plugin.py @@ -41,7 +41,7 @@ def generate_code(self): self._body.append(MdLines(lines=tokenize(md_mod_hdr))) for mname, mod in self._pkg.modules.items(): margs = mod.to_dict() - margs['mod_desc'] = margs['mod_desc'].replace('|','\|').replace('\n','') + margs['mod_desc'] = margs['mod_desc'].replace('|', '\|').replace('\n', '') classes = '' for c in mod.classes: if not c.implemented_by: @@ -93,7 +93,7 @@ def generate_code(self): self._body.append(MdLines(lines=tokenize(md_mbr_hdr))) for mbr in self._cls.members: margs = mbr.to_dict() - margs['cmbr_desc'] = margs['cmbr_desc'].replace('|','\|').replace('\n','') + margs['cmbr_desc'] = margs['cmbr_desc'].replace('|', '\|').replace('\n', '') self._body.append(MdLines(lines=tokenize(md_mbr_entry % margs))) for api in self._cls.apis: args['api'] = api diff --git a/DentOS_Framework/DentOsTestbedLib/gen/plugins/test/plugin.py b/DentOS_Framework/DentOsTestbedLib/gen/plugins/test/plugin.py index 251e7de14..826f6dab7 100644 --- a/DentOS_Framework/DentOsTestbedLib/gen/plugins/test/plugin.py +++ b/DentOS_Framework/DentOsTestbedLib/gen/plugins/test/plugin.py @@ -143,7 +143,7 @@ def generate_code(self): methods.append(PyMethod(api.lower(), '*argv, **kwarg', run_body[0], - indent=4,coroutine=True)) + indent=4, coroutine=True)) # discard other accessors self._classes = [ PyClass(camelcase(self._cls.name), diff --git a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/ReportSchema.py b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/ReportSchema.py index 5e780c2cf..e5070d4bd 100644 --- a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/ReportSchema.py +++ b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/ReportSchema.py @@ -15,11 +15,11 @@ class OspfNeighSchemaDict(SchemaDict): Refer ./gen/model/dent/network/network.yaml ospf_neigh """ __schema_slots__ = { - 'address':str, - 'router_id':str, - 'priority':str, - 'state':str, - 'interface':str, + 'address': str, + 'router_id': str, + 'priority': str, + 'state': str, + 'interface': str, } @@ -35,10 +35,10 @@ class BgpNeighSchemaDict(SchemaDict): Refer ./gen/model/dent/network/network.yaml bgp_neigh """ __schema_slots__ = { - 'neighbor':str, - 'as_':str, - 'up':str, - 'state':str, + 'neighbor': str, + 'as_': str, + 'up': str, + 'state': str, } @@ -54,9 +54,9 @@ class NexthopSchemaDict(SchemaDict): Refer ./gen/model/dent/network/ip/route.yaml nexthop """ __schema_slots__ = { - 'via':str, - 'dev':str, - 'weight':int, + 'via': str, + 'dev': str, + 'weight': int, } @@ -72,13 +72,13 @@ class IpAddressInfoSchemaDict(SchemaDict): Refer ./gen/model/dent/network/ip/address.yaml ip_address_info """ __schema_slots__ = { - 'family':str, - 'local':str, - 'prefixlen':int, - 'scope':str, - 'label':str, - 'valid_life_time':int, - 'preferred_life_time':int, + 'family': str, + 'local': str, + 'prefixlen': int, + 'scope': str, + 'label': str, + 'valid_life_time': int, + 'preferred_life_time': int, } @@ -94,7 +94,7 @@ class InterfaceNamesSchemaDict(SchemaDict): Refer ./gen/model/dent/network/network.yaml interface_names """ __schema_slots__ = { - 'name':str, + 'name': str, } @@ -110,11 +110,11 @@ class InterfaceAddrSchemaDict(SchemaDict): Refer ./gen/model/dent/network/network.yaml interface_addr """ __schema_slots__ = { - 'family':str, - 'local':str, - 'prefixlen':int, - 'scope':str, - 'label':str, + 'family': str, + 'local': str, + 'prefixlen': int, + 'scope': str, + 'label': str, } @@ -130,9 +130,9 @@ class SfpSchemaDict(SchemaDict): Refer ./gen/model/dent/network/network.yaml sfp """ __schema_slots__ = { - 'vendor':str, - 'model':str, - 'serial':str, + 'vendor': str, + 'model': str, + 'serial': str, } @@ -142,9 +142,9 @@ class TestbedOspfRoutersSchemaDict(SchemaDict): Refer ./gen/model/dent/testbed/testbed.yaml testbed_ospf_routers """ __schema_slots__ = { - 'address':str, - 'router_id':str, - 'device_id':str, + 'address': str, + 'router_id': str, + 'device_id': str, } @@ -160,8 +160,8 @@ class TestbedBgpRoutersSchemaDict(SchemaDict): Refer ./gen/model/dent/testbed/testbed.yaml testbed_bgp_routers """ __schema_slots__ = { - 'router':str, - 'device_id':str, + 'router': str, + 'device_id': str, } @@ -177,8 +177,8 @@ class TestbedInterfacesSchemaDict(SchemaDict): Refer ./gen/model/dent/testbed/testbed.yaml testbed_interfaces """ __schema_slots__ = { - 'device_id':str, - 'interface':str, + 'device_id': str, + 'interface': str, } @@ -194,12 +194,12 @@ class DiskFreeSchemaDict(SchemaDict): Refer ./gen/model/dent/system/os/disk.yaml disk_free """ __schema_slots__ = { - 'filesystem':str, - 'size':int, - 'used':int, - 'available':int, - 'use_percentage':int, - 'mounted_on':str, + 'filesystem': str, + 'size': int, + 'used': int, + 'available': int, + 'use_percentage': int, + 'mounted_on': str, } @@ -215,11 +215,11 @@ class ServiceSchemaDict(SchemaDict): Refer ./gen/model/dent/system/os/service.yaml service """ __schema_slots__ = { - 'name':str, - 'loaded':str, - 'active':str, - 'status':str, - 'description':str, + 'name': str, + 'loaded': str, + 'active': str, + 'status': str, + 'description': str, } @@ -235,19 +235,19 @@ class ProcessSchemaDict(SchemaDict): Refer ./gen/model/dent/system/os/process.yaml process """ __schema_slots__ = { - 'pid':int, - 'command':str, - 'elapsed':str, - 'vsz':str, - 'mem':str, - 'time':str, - 'args':str, - 'start_time':str, - 'cpu_usage_user':int, - 'cpu_usage_system':int, - 'cpu_utilization':float, - 'memory_usage':int, - 'memory_utilization':float, + 'pid': int, + 'command': str, + 'elapsed': str, + 'vsz': str, + 'mem': str, + 'time': str, + 'args': str, + 'start_time': str, + 'cpu_usage_user': int, + 'cpu_usage_system': int, + 'cpu_utilization': float, + 'memory_usage': int, + 'memory_utilization': float, } @@ -263,14 +263,14 @@ class MemoryUsageSchemaDict(SchemaDict): Refer ./gen/model/dent/system/os/memory.yaml memory_usage """ __schema_slots__ = { - 'mem_total':int, - 'mem_free':int, - 'mem_available':int, - 'buffers':int, - 'cached':int, - 'swap_cached':int, - 'active':int, - 'inactive':int, + 'mem_total': int, + 'mem_free': int, + 'mem_available': int, + 'buffers': int, + 'cached': int, + 'swap_cached': int, + 'active': int, + 'inactive': int, } @@ -280,16 +280,16 @@ class CpuUsageSchemaDict(SchemaDict): Refer ./gen/model/dent/system/os/cpu.yaml cpu_usage """ __schema_slots__ = { - 'cpu':int, - 'usr':float, - 'nice':float, - 'sys':float, - 'iowait':float, - 'irq':float, - 'soft':float, - 'steal':float, - 'guest':float, - 'idle':float, + 'cpu': int, + 'usr': float, + 'nice': float, + 'sys': float, + 'iowait': float, + 'irq': float, + 'soft': float, + 'steal': float, + 'guest': float, + 'idle': float, } @@ -305,8 +305,8 @@ class OspfSchemaDict(SchemaDict): Refer ./gen/model/dent/network/network.yaml ospf """ __schema_slots__ = { - 'router_id':str, - 'neighbors':OspfNeighSchemaList, + 'router_id': str, + 'neighbors': OspfNeighSchemaList, } @@ -322,9 +322,9 @@ class BgpSchemaDict(SchemaDict): Refer ./gen/model/dent/network/network.yaml bgp """ __schema_slots__ = { - 'as_':int, - 'router':str, - 'neighbors':BgpNeighSchemaList, + 'as_': int, + 'router': str, + 'neighbors': BgpNeighSchemaList, } @@ -340,18 +340,18 @@ class IpTablesSchemaDict(SchemaDict): Refer ./gen/model/dent/network/iptables/iptables.yaml ip_tables """ __schema_slots__ = { - 'table':str, - 'chain':str, - 'rulenum':int, - 'protocol':str, - 'source':str, - 'destination':str, - 'match':str, - 'target':str, - 'goto':str, - 'iif':str, - 'oif':str, - 'fragment':bool, + 'table': str, + 'chain': str, + 'rulenum': int, + 'protocol': str, + 'source': str, + 'destination': str, + 'match': str, + 'target': str, + 'goto': str, + 'iif': str, + 'oif': str, + 'fragment': bool, } @@ -367,36 +367,36 @@ class IpRouteSchemaDict(SchemaDict): Refer ./gen/model/dent/network/ip/route.yaml ip_route """ __schema_slots__ = { - 'type':str, - 'dst':str, - 'dev':str, - 'protocol':str, - 'scope':str, - 'prefsrc':str, - 'flags':str, - 'tos':int, - 'table':int, - 'metric':int, - 'nexthops':NexthopSchemaList, - 'via':str, - 'weight':int, - 'nhflags':int, - 'mtu':int, - 'advmss':int, - 'rtt':int, - 'rttvar':int, - 'reordering':int, - 'window':int, - 'cwnd':int, - 'ssthresh':int, - 'realms':int, - 'rto_min':str, - 'initcwnd':int, - 'initrwnd':int, - 'quickack':bool, - 'gateway':str, - 'src':str, - 'options':str, + 'type': str, + 'dst': str, + 'dev': str, + 'protocol': str, + 'scope': str, + 'prefsrc': str, + 'flags': str, + 'tos': int, + 'table': int, + 'metric': int, + 'nexthops': NexthopSchemaList, + 'via': str, + 'weight': int, + 'nhflags': int, + 'mtu': int, + 'advmss': int, + 'rtt': int, + 'rttvar': int, + 'reordering': int, + 'window': int, + 'cwnd': int, + 'ssthresh': int, + 'realms': int, + 'rto_min': str, + 'initcwnd': int, + 'initrwnd': int, + 'quickack': bool, + 'gateway': str, + 'src': str, + 'options': str, } @@ -412,32 +412,32 @@ class IpAddressSchemaDict(SchemaDict): Refer ./gen/model/dent/network/ip/address.yaml ip_address """ __schema_slots__ = { - 'ifindex':int, - 'ifname':str, - 'flags':str, - 'mtu':int, - 'qdisc':str, - 'operstate':str, - 'group':str, - 'txqlen':int, - 'link_type':str, - 'address':str, - 'broadcast':str, - 'promiscuity':int, - 'min_mtu':int, - 'max_mtu':int, - 'num_tx_queues':int, - 'num_rx_queues':int, - 'gso_max_size':int, - 'gso_max_segs':int, - 'addr_info':IpAddressInfoSchemaList, - 'prefix':str, - 'peer':str, - 'anycast':str, - 'label':str, - 'scope':int, - 'dev':str, - 'options':str, + 'ifindex': int, + 'ifname': str, + 'flags': str, + 'mtu': int, + 'qdisc': str, + 'operstate': str, + 'group': str, + 'txqlen': int, + 'link_type': str, + 'address': str, + 'broadcast': str, + 'promiscuity': int, + 'min_mtu': int, + 'max_mtu': int, + 'num_tx_queues': int, + 'num_rx_queues': int, + 'gso_max_size': int, + 'gso_max_segs': int, + 'addr_info': IpAddressInfoSchemaList, + 'prefix': str, + 'peer': str, + 'anycast': str, + 'label': str, + 'scope': int, + 'dev': str, + 'options': str, } @@ -453,9 +453,9 @@ class BridgeSchemaDict(SchemaDict): Refer ./gen/model/dent/network/network.yaml bridge """ __schema_slots__ = { - 'name':str, - 'interfaces':InterfaceNamesSchemaList, - 'stp':bool, + 'name': str, + 'interfaces': InterfaceNamesSchemaList, + 'stp': bool, } @@ -471,9 +471,9 @@ class VlansSchemaDict(SchemaDict): Refer ./gen/model/dent/network/network.yaml vlans """ __schema_slots__ = { - 'vlan_id':int, - 'access_ports':InterfaceNamesSchemaList, - 'trunk_ports':InterfaceNamesSchemaList, + 'vlan_id': int, + 'access_ports': InterfaceNamesSchemaList, + 'trunk_ports': InterfaceNamesSchemaList, } @@ -489,8 +489,8 @@ class LagsSchemaDict(SchemaDict): Refer ./gen/model/dent/network/network.yaml lags """ __schema_slots__ = { - 'name':str, - 'interfaces':InterfaceNamesSchemaList, + 'name': str, + 'interfaces': InterfaceNamesSchemaList, } @@ -506,50 +506,50 @@ class IpLinkSchemaDict(SchemaDict): Refer ./gen/model/dent/network/ip/link.yaml ip_link """ __schema_slots__ = { - 'ageing_time':int, - 'ifindex':int, - 'ifname':str, - 'flags':str, - 'mtu':int, - 'qdisc':str, - 'operstate':str, - 'linkmode':str, - 'group':str, - 'txqlen':int, - 'link_type':str, - 'address':str, - 'broadcast':str, - 'promiscuity':int, - 'min_mtu':int, - 'max_mtu':int, - 'inet6_addr_gen_mode':str, - 'num_tx_queues':int, - 'num_rx_queues':int, - 'gso_max_size':int, - 'gso_max_segs':int, - 'phys_port_name':str, - 'phys_switch_id':str, - 'device':str, - 'arp':bool, - 'allmulticast':bool, - 'dynamic':bool, - 'multicast':bool, - 'txqueuelen':int, - 'name':str, - 'netns':int, - 'alias':str, - 'vf':int, - 'mac':str, - 'qos':int, - 'vlan':int, - 'rate':int, - 'max_tx_rate':int, - 'min_tx_rate':int, - 'spoofchk':int, - 'state':str, - 'master':str, - 'nomaster':bool, - 'options':str, + 'ageing_time': int, + 'ifindex': int, + 'ifname': str, + 'flags': str, + 'mtu': int, + 'qdisc': str, + 'operstate': str, + 'linkmode': str, + 'group': str, + 'txqlen': int, + 'link_type': str, + 'address': str, + 'broadcast': str, + 'promiscuity': int, + 'min_mtu': int, + 'max_mtu': int, + 'inet6_addr_gen_mode': str, + 'num_tx_queues': int, + 'num_rx_queues': int, + 'gso_max_size': int, + 'gso_max_segs': int, + 'phys_port_name': str, + 'phys_switch_id': str, + 'device': str, + 'arp': bool, + 'allmulticast': bool, + 'dynamic': bool, + 'multicast': bool, + 'txqueuelen': int, + 'name': str, + 'netns': int, + 'alias': str, + 'vf': int, + 'mac': str, + 'qos': int, + 'vlan': int, + 'rate': int, + 'max_tx_rate': int, + 'min_tx_rate': int, + 'spoofchk': int, + 'state': str, + 'master': str, + 'nomaster': bool, + 'options': str, } @@ -565,24 +565,24 @@ class InterfacesSchemaDict(SchemaDict): Refer ./gen/model/dent/network/network.yaml interfaces """ __schema_slots__ = { - 'name':str, - 'speed':int, - 'media':str, - 'configured_state':str, - 'peer_device_id':str, - 'peer_interface':str, - 'operstate':str, - 'flags':list, - 'mtu':int, - 'index':int, - 'qdisc':str, - 'group':str, - 'txqlen':int, - 'link_type':str, - 'address':str, - 'broadcast':str, - 'sfp':SfpSchemaDict, - 'addr_info':InterfaceAddrSchemaList, + 'name': str, + 'speed': int, + 'media': str, + 'configured_state': str, + 'peer_device_id': str, + 'peer_interface': str, + 'operstate': str, + 'flags': list, + 'mtu': int, + 'index': int, + 'qdisc': str, + 'group': str, + 'txqlen': int, + 'link_type': str, + 'address': str, + 'broadcast': str, + 'sfp': SfpSchemaDict, + 'addr_info': InterfaceAddrSchemaList, } @@ -598,10 +598,10 @@ class LldpSchemaDict(SchemaDict): Refer ./gen/model/dent/platform/lldp/lldp.yaml lldp """ __schema_slots__ = { - 'interface':str, - 'options':str, - 'remote_host':str, - 'remote_interface':str, + 'interface': str, + 'options': str, + 'remote_host': str, + 'remote_interface': str, } @@ -617,14 +617,14 @@ class OnlpSfpInfoSchemaDict(SchemaDict): Refer ./gen/model/dent/platform/onlp/onlpdump.yaml onlp_sfp_info """ __schema_slots__ = { - 'port':int, - 'type':str, - 'media':str, - 'status':str, - 'len':str, - 'vendor':str, - 'model':str, - 'serial_number':str, + 'port': int, + 'type': str, + 'media': str, + 'status': str, + 'len': str, + 'vendor': str, + 'model': str, + 'serial_number': str, } @@ -640,20 +640,20 @@ class OnlpSystemInfoSchemaDict(SchemaDict): Refer ./gen/model/dent/platform/onlp/onlpdump.yaml onlp_system_info """ __schema_slots__ = { - 'product_name':str, - 'serial_number':str, - 'mac':str, - 'mac_range':str, - 'manufacturer':str, - 'manufacturer_date':str, - 'vendor':str, - 'platform_name':str, - 'device_version':str, - 'label_revision':str, - 'country_code':str, - 'diag_version':str, - 'service_tag':str, - 'onie_version':str, + 'product_name': str, + 'serial_number': str, + 'mac': str, + 'mac_range': str, + 'manufacturer': str, + 'manufacturer_date': str, + 'vendor': str, + 'platform_name': str, + 'device_version': str, + 'label_revision': str, + 'country_code': str, + 'diag_version': str, + 'service_tag': str, + 'onie_version': str, } @@ -663,18 +663,18 @@ class PoectlSchemaDict(SchemaDict): Refer ./gen/model/dent/platform/poe/peoctl.yaml poectl """ __schema_slots__ = { - 'port':str, - 'cmd_options':str, - 'status':str, - 'priority':str, - 'power':str, - 'pd_type':str, - 'current':str, - 'state':str, - 'voltage':str, - 'pd_class':str, - 'allocated_power':str, - 'error_str':str, + 'port': str, + 'cmd_options': str, + 'status': str, + 'priority': str, + 'power': str, + 'pd_type': str, + 'current': str, + 'state': str, + 'voltage': str, + 'pd_class': str, + 'allocated_power': str, + 'error_str': str, } @@ -690,9 +690,9 @@ class FruItemSchemaDict(SchemaDict): Refer ./gen/model/dent/platform/platform.yaml fru_item """ __schema_slots__ = { - 'name':str, - 'model':str, - 'serial':str, + 'name': str, + 'model': str, + 'serial': str, } @@ -708,11 +708,11 @@ class PartitionItemSchemaDict(SchemaDict): Refer ./gen/model/dent/platform/platform.yaml partition_item """ __schema_slots__ = { - 'mount':str, - 'device':str, - 'size':int, - 'free':int, - 'opts':str, + 'mount': str, + 'device': str, + 'size': int, + 'free': int, + 'opts': str, } @@ -728,7 +728,7 @@ class TestbedOspfSchemaDict(SchemaDict): Refer ./gen/model/dent/testbed/testbed.yaml testbed_ospf """ __schema_slots__ = { - 'routers':TestbedOspfRoutersSchemaList, + 'routers': TestbedOspfRoutersSchemaList, } @@ -738,7 +738,7 @@ class TestbedBgpSchemaDict(SchemaDict): Refer ./gen/model/dent/testbed/testbed.yaml testbed_bgp """ __schema_slots__ = { - 'routers':TestbedBgpRoutersSchemaList, + 'routers': TestbedBgpRoutersSchemaList, } @@ -748,9 +748,9 @@ class TestbedVlansSchemaDict(SchemaDict): Refer ./gen/model/dent/testbed/testbed.yaml testbed_vlans """ __schema_slots__ = { - 'vlan_id':str, - 'access_port':TestbedInterfacesSchemaList, - 'trunk_port':TestbedInterfacesSchemaList, + 'vlan_id': str, + 'access_port': TestbedInterfacesSchemaList, + 'trunk_port': TestbedInterfacesSchemaList, } @@ -766,11 +766,11 @@ class OperatingSystemSchemaDict(SchemaDict): Refer ./gen/model/dent/system/system.yaml operating_system """ __schema_slots__ = { - 'cpu':CpuUsageSchemaList, - 'memory':MemoryUsageSchemaDict, - 'processes':ProcessSchemaList, - 'services':ServiceSchemaList, - 'disk':DiskFreeSchemaList, + 'cpu': CpuUsageSchemaList, + 'memory': MemoryUsageSchemaDict, + 'processes': ProcessSchemaList, + 'services': ServiceSchemaList, + 'disk': DiskFreeSchemaList, } @@ -780,13 +780,13 @@ class L3SchemaDict(SchemaDict): Refer ./gen/model/dent/network/network.yaml l3 """ __schema_slots__ = { - 'management_ip':str, - 'addresses':IpAddressSchemaList, - 'routes':IpRouteSchemaList, - 'iptables':IpTablesSchemaList, - 'acls':LeafSchemaDict, - 'bgp':BgpSchemaList, - 'ospf':OspfSchemaList, + 'management_ip': str, + 'addresses': IpAddressSchemaList, + 'routes': IpRouteSchemaList, + 'iptables': IpTablesSchemaList, + 'acls': LeafSchemaDict, + 'bgp': BgpSchemaList, + 'ospf': OspfSchemaList, } @@ -796,8 +796,8 @@ class L2SchemaDict(SchemaDict): Refer ./gen/model/dent/network/network.yaml l2 """ __schema_slots__ = { - 'vlans':VlansSchemaList, - 'bridges':BridgeSchemaList, + 'vlans': VlansSchemaList, + 'bridges': BridgeSchemaList, } @@ -807,10 +807,10 @@ class L1SchemaDict(SchemaDict): Refer ./gen/model/dent/network/network.yaml l1 """ __schema_slots__ = { - 'management_mac':str, - 'interfaces':InterfacesSchemaList, - 'links':IpLinkSchemaList, - 'lags':LagsSchemaList, + 'management_mac': str, + 'interfaces': InterfacesSchemaList, + 'links': IpLinkSchemaList, + 'lags': LagsSchemaList, } @@ -820,7 +820,7 @@ class LldpSchemaDict(SchemaDict): Refer ./gen/model/dent/platform/platform.yaml lldp """ __schema_slots__ = { - 'interfaces':LldpSchemaList, + 'interfaces': LldpSchemaList, } @@ -830,8 +830,8 @@ class OnlpSchemaDict(SchemaDict): Refer ./gen/model/dent/platform/platform.yaml onlp """ __schema_slots__ = { - 'system_information':OnlpSystemInfoSchemaDict, - 'sfps':OnlpSfpInfoSchemaList, + 'system_information': OnlpSystemInfoSchemaDict, + 'sfps': OnlpSfpInfoSchemaList, } @@ -841,7 +841,7 @@ class PoeSchemaDict(SchemaDict): Refer ./gen/model/dent/platform/platform.yaml poe """ __schema_slots__ = { - 'ports':PoectlSchemaList, + 'ports': PoectlSchemaList, } @@ -851,9 +851,9 @@ class FruSchemaDict(SchemaDict): Refer ./gen/model/dent/platform/platform.yaml fru """ __schema_slots__ = { - 'fans':FruItemSchemaList, - 'psus':FruItemSchemaList, - 'serial':FruItemSchemaList, + 'fans': FruItemSchemaList, + 'psus': FruItemSchemaList, + 'serial': FruItemSchemaList, } @@ -863,14 +863,14 @@ class BaseboardSchemaDict(SchemaDict): Refer ./gen/model/dent/platform/platform.yaml baseboard """ __schema_slots__ = { - 'platform':str, - 'serial':str, - 'cpu_type':str, - 'cpu_speed':int, - 'cpu_core_count':int, - 'memory_total':int, - 'memory_free':int, - 'partitions':PartitionItemSchemaList, + 'platform': str, + 'serial': str, + 'cpu_type': str, + 'cpu_speed': int, + 'cpu_core_count': int, + 'memory_total': int, + 'memory_free': int, + 'partitions': PartitionItemSchemaList, } @@ -880,13 +880,13 @@ class TrafficGenSchemaDict(SchemaDict): Refer ./gen/model/dent/traffic/traffic.yaml traffic_gen """ __schema_slots__ = { - 'client_addr':str, - 'config_file_name':str, - 'protocols':str, - 'traffic_names':str, - 'ports':str, - 'src_ip':str, - 'dst_ip':str, + 'client_addr': str, + 'config_file_name': str, + 'protocols': str, + 'traffic_names': str, + 'ports': str, + 'src_ip': str, + 'dst_ip': str, } @@ -896,8 +896,8 @@ class TestbedL3SchemaDict(SchemaDict): Refer ./gen/model/dent/testbed/testbed.yaml testbed_l3 """ __schema_slots__ = { - 'bgp':TestbedBgpSchemaDict, - 'ospf':TestbedOspfSchemaDict, + 'bgp': TestbedBgpSchemaDict, + 'ospf': TestbedOspfSchemaDict, } @@ -907,7 +907,7 @@ class TestbedL2SchemaDict(SchemaDict): Refer ./gen/model/dent/testbed/testbed.yaml testbed_l2 """ __schema_slots__ = { - 'vlans':TestbedVlansSchemaList, + 'vlans': TestbedVlansSchemaList, } @@ -917,7 +917,7 @@ class DeviceSystemSchemaDict(SchemaDict): Refer ./gen/model/dent/system/system.yaml device_system """ __schema_slots__ = { - 'os':OperatingSystemSchemaDict, + 'os': OperatingSystemSchemaDict, } @@ -927,9 +927,9 @@ class DeviceNetworkSchemaDict(SchemaDict): Refer ./gen/model/dent/network/network.yaml device_network """ __schema_slots__ = { - 'layer1':L1SchemaDict, - 'layer2':L2SchemaDict, - 'layer3':L3SchemaDict, + 'layer1': L1SchemaDict, + 'layer2': L2SchemaDict, + 'layer3': L3SchemaDict, } @@ -939,12 +939,12 @@ class PlatformSchemaDict(SchemaDict): Refer ./gen/model/dent/platform/platform.yaml platform """ __schema_slots__ = { - 'baseboard':BaseboardSchemaDict, - 'software':LeafSchemaDict, - 'fru':FruSchemaDict, - 'poe':PoeSchemaDict, - 'onlp':OnlpSchemaDict, - 'lldp':LldpSchemaDict, + 'baseboard': BaseboardSchemaDict, + 'software': LeafSchemaDict, + 'fru': FruSchemaDict, + 'poe': PoeSchemaDict, + 'onlp': OnlpSchemaDict, + 'lldp': LldpSchemaDict, } @@ -954,7 +954,7 @@ class TrafficGeneratorsSchemaDict(SchemaDict): Refer ./gen/model/dent/traffic/traffic.yaml traffic_generators """ __schema_slots__ = { - 'generator':TrafficGenSchemaDict, + 'generator': TrafficGenSchemaDict, } @@ -964,8 +964,8 @@ class TestbedNetworkSchemaDict(SchemaDict): Refer ./gen/model/dent/testbed/testbed.yaml testbed_network """ __schema_slots__ = { - 'layer2':TestbedL2SchemaDict, - 'layer3':TestbedL3SchemaDict, + 'layer2': TestbedL2SchemaDict, + 'layer3': TestbedL3SchemaDict, } @@ -975,8 +975,8 @@ class InfrastructureSchemaDict(SchemaDict): Refer ./gen/model/dent/base/base.yaml infrastructure """ __schema_slots__ = { - 'device_id':str, - 'network':DeviceNetworkSchemaDict, + 'device_id': str, + 'network': DeviceNetworkSchemaDict, } @@ -992,10 +992,10 @@ class DutsSchemaDict(SchemaDict): Refer ./gen/model/dent/base/base.yaml duts """ __schema_slots__ = { - 'device_id':str, - 'platform':PlatformSchemaDict, - 'network':DeviceNetworkSchemaDict, - 'system':DeviceSystemSchemaDict, + 'device_id': str, + 'platform': PlatformSchemaDict, + 'network': DeviceNetworkSchemaDict, + 'system': DeviceSystemSchemaDict, } @@ -1011,11 +1011,11 @@ class ReportSchemaDict(SchemaDict): Refer ./gen/model/dent/base/base.yaml base """ __schema_slots__ = { - 'attributes':LeafSchemaDict, - 'duts':DutsSchemaList, - 'infrastructure':InfrastructureSchemaList, - 'network':TestbedNetworkSchemaDict, - 'traffic_genertors':TrafficGeneratorsSchemaDict, + 'attributes': LeafSchemaDict, + 'duts': DutsSchemaList, + 'infrastructure': InfrastructureSchemaList, + 'network': TestbedNetworkSchemaDict, + 'traffic_genertors': TrafficGeneratorsSchemaDict, } diff --git a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_cpu_usage.py b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_cpu_usage.py index 0ee80cfaf..acd3820f8 100644 --- a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_cpu_usage.py +++ b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_cpu_usage.py @@ -14,7 +14,7 @@ class CpuUsageMod(Module): def set_cpu_usage(self, src, dst): - for i,cpu_usage in enumerate(src): + for i, cpu_usage in enumerate(src): if 'cpu' in cpu_usage: dst[i].cpu = cpu_usage.get('cpu') if 'usr' in cpu_usage: dst[i].usr = cpu_usage.get('usr') if 'nice' in cpu_usage: dst[i].nice = cpu_usage.get('nice') @@ -37,7 +37,7 @@ async def discover(self): continue print('Running cpu_usage Discovery on ' + dev.host_name) out = await CpuUsage.show( - input_data=[{dev.host_name: [{'dut_discovery':True}]}], + input_data=[{dev.host_name: [{'dut_discovery': True}]}], device_obj={dev.host_name: dev}, parse_output=True ) diff --git a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_disk_free.py b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_disk_free.py index 0b8bb0f3b..e6ab9621f 100644 --- a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_disk_free.py +++ b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_disk_free.py @@ -14,7 +14,7 @@ class DiskFreeMod(Module): def set_disk_free(self, src, dst): - for i,disk_free in enumerate(src): + for i, disk_free in enumerate(src): if 'filesystem' in disk_free: dst[i].filesystem = disk_free.get('filesystem') if 'size' in disk_free: dst[i].size = disk_free.get('size') if 'used' in disk_free: dst[i].used = disk_free.get('used') @@ -33,7 +33,7 @@ async def discover(self): continue print('Running disk_free Discovery on ' + dev.host_name) out = await DiskFree.show( - input_data=[{dev.host_name: [{'dut_discovery':True}]}], + input_data=[{dev.host_name: [{'dut_discovery': True}]}], device_obj={dev.host_name: dev}, parse_output=True ) diff --git a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_ip_address.py b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_ip_address.py index 191e6586e..e1154732d 100644 --- a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_ip_address.py +++ b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_ip_address.py @@ -14,7 +14,7 @@ class IpAddressMod(Module): def set_ip_address_info(self, src, dst): - for i,ip_address_info in enumerate(src): + for i, ip_address_info in enumerate(src): if 'family' in ip_address_info: dst[i].family = ip_address_info.get('family') if 'local' in ip_address_info: dst[i].local = ip_address_info.get('local') if 'prefixlen' in ip_address_info: dst[i].prefixlen = ip_address_info.get('prefixlen') @@ -25,7 +25,7 @@ def set_ip_address_info(self, src, dst): def set_ip_address(self, src, dst): - for i,ip_address in enumerate(src): + for i, ip_address in enumerate(src): if 'ifindex' in ip_address: dst[i].ifindex = ip_address.get('ifindex') if 'ifname' in ip_address: dst[i].ifname = ip_address.get('ifname') if 'mtu' in ip_address: dst[i].mtu = ip_address.get('mtu') @@ -63,7 +63,7 @@ async def discover(self): continue print('Running ip_address Discovery on ' + dev.host_name) out = await IpAddress.show( - input_data=[{dev.host_name: [{'dut_discovery':True}]}], + input_data=[{dev.host_name: [{'dut_discovery': True}]}], device_obj={dev.host_name: dev}, parse_output=True ) diff --git a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_ip_link.py b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_ip_link.py index ef572a425..b526f0e03 100644 --- a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_ip_link.py +++ b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_ip_link.py @@ -14,7 +14,7 @@ class IpLinkMod(Module): def set_ip_link(self, src, dst): - for i,ip_link in enumerate(src): + for i, ip_link in enumerate(src): if 'ageing_time' in ip_link: dst[i].ageing_time = ip_link.get('ageing_time') if 'ifindex' in ip_link: dst[i].ifindex = ip_link.get('ifindex') if 'ifname' in ip_link: dst[i].ifname = ip_link.get('ifname') @@ -65,7 +65,7 @@ async def discover(self): continue print('Running ip_link Discovery on ' + dev.host_name) out = await IpLink.show( - input_data=[{dev.host_name: [{'dut_discovery':True}]}], + input_data=[{dev.host_name: [{'dut_discovery': True}]}], device_obj={dev.host_name: dev}, parse_output=True ) diff --git a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_ip_route.py b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_ip_route.py index 310665e02..9974e1167 100644 --- a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_ip_route.py +++ b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_ip_route.py @@ -14,14 +14,14 @@ class IpRouteMod(Module): def set_nexthop(self, src, dst): - for i,nexthop in enumerate(src): + for i, nexthop in enumerate(src): if 'via' in nexthop: dst[i].via = nexthop.get('via') if 'dev' in nexthop: dst[i].dev = nexthop.get('dev') if 'weight' in nexthop: dst[i].weight = nexthop.get('weight') def set_ip_route(self, src, dst): - for i,ip_route in enumerate(src): + for i, ip_route in enumerate(src): if 'type' in ip_route: dst[i].type = ip_route.get('type') if 'dst' in ip_route: dst[i].dst = ip_route.get('dst') if 'dev' in ip_route: dst[i].dev = ip_route.get('dev') @@ -61,7 +61,7 @@ async def discover(self): continue print('Running ip_route Discovery on ' + dev.host_name) out = await IpRoute.show( - input_data=[{dev.host_name: [{'dut_discovery':True}]}], + input_data=[{dev.host_name: [{'dut_discovery': True}]}], device_obj={dev.host_name: dev}, parse_output=True ) diff --git a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_lldp.py b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_lldp.py index c314f07bc..6276ccd98 100644 --- a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_lldp.py +++ b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_lldp.py @@ -14,7 +14,7 @@ class LldpMod(Module): def set_lldp(self, src, dst): - for i,lldp in enumerate(src): + for i, lldp in enumerate(src): if 'interface' in lldp: dst[i].interface = lldp.get('interface') if 'options' in lldp: dst[i].options = lldp.get('options') if 'remote_host' in lldp: dst[i].remote_host = lldp.get('remote_host') @@ -31,7 +31,7 @@ async def discover(self): continue print('Running lldp Discovery on ' + dev.host_name) out = await Lldp.show( - input_data=[{dev.host_name: [{'dut_discovery':True}]}], + input_data=[{dev.host_name: [{'dut_discovery': True}]}], device_obj={dev.host_name: dev}, parse_output=True ) diff --git a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_memory_usage.py b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_memory_usage.py index 05740f0b4..44dcb316b 100644 --- a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_memory_usage.py +++ b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_memory_usage.py @@ -14,7 +14,7 @@ class MemoryUsageMod(Module): def set_memory_usage(self, src, dst): - for i,memory_usage in enumerate([src]): + for i, memory_usage in enumerate([src]): if 'mem_total' in memory_usage: dst.mem_total = memory_usage.get('mem_total') if 'mem_free' in memory_usage: dst.mem_free = memory_usage.get('mem_free') if 'mem_available' in memory_usage: dst.mem_available = memory_usage.get('mem_available') @@ -35,7 +35,7 @@ async def discover(self): continue print('Running memory_usage Discovery on ' + dev.host_name) out = await MemoryUsage.show( - input_data=[{dev.host_name: [{'dut_discovery':True}]}], + input_data=[{dev.host_name: [{'dut_discovery': True}]}], device_obj={dev.host_name: dev}, parse_output=True ) diff --git a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_onlp_sfp_info.py b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_onlp_sfp_info.py index fed31b9a8..3ced56666 100644 --- a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_onlp_sfp_info.py +++ b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_onlp_sfp_info.py @@ -14,7 +14,7 @@ class OnlpSfpInfoMod(Module): def set_onlp_sfp_info(self, src, dst): - for i,onlp_sfp_info in enumerate(src): + for i, onlp_sfp_info in enumerate(src): if 'port' in onlp_sfp_info: dst[i].port = onlp_sfp_info.get('port') if 'type' in onlp_sfp_info: dst[i].type = onlp_sfp_info.get('type') if 'media' in onlp_sfp_info: dst[i].media = onlp_sfp_info.get('media') @@ -35,7 +35,7 @@ async def discover(self): continue print('Running onlp_sfp_info Discovery on ' + dev.host_name) out = await OnlpSfpInfo.show( - input_data=[{dev.host_name: [{'dut_discovery':True}]}], + input_data=[{dev.host_name: [{'dut_discovery': True}]}], device_obj={dev.host_name: dev}, parse_output=True ) diff --git a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_onlp_system_info.py b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_onlp_system_info.py index 5283c3a21..ecafe2459 100644 --- a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_onlp_system_info.py +++ b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_onlp_system_info.py @@ -14,7 +14,7 @@ class OnlpSystemInfoMod(Module): def set_onlp_system_info(self, src, dst): - for i,onlp_system_info in enumerate([src]): + for i, onlp_system_info in enumerate([src]): if 'product_name' in onlp_system_info: dst.product_name = onlp_system_info.get('product_name') if 'serial_number' in onlp_system_info: dst.serial_number = onlp_system_info.get('serial_number') if 'mac' in onlp_system_info: dst.mac = onlp_system_info.get('mac') @@ -41,7 +41,7 @@ async def discover(self): continue print('Running onlp_system_info Discovery on ' + dev.host_name) out = await OnlpSystemInfo.show( - input_data=[{dev.host_name: [{'dut_discovery':True}]}], + input_data=[{dev.host_name: [{'dut_discovery': True}]}], device_obj={dev.host_name: dev}, parse_output=True ) diff --git a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_poectl.py b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_poectl.py index 500f7fe06..a0b2dff3b 100644 --- a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_poectl.py +++ b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_poectl.py @@ -14,7 +14,7 @@ class PoectlMod(Module): def set_poectl(self, src, dst): - for i,poectl in enumerate(src): + for i, poectl in enumerate(src): if 'port' in poectl: dst[i].port = poectl.get('port') if 'cmd_options' in poectl: dst[i].cmd_options = poectl.get('cmd_options') if 'status' in poectl: dst[i].status = poectl.get('status') @@ -39,7 +39,7 @@ async def discover(self): continue print('Running poectl Discovery on ' + dev.host_name) out = await Poectl.show( - input_data=[{dev.host_name: [{'dut_discovery':True}]}], + input_data=[{dev.host_name: [{'dut_discovery': True}]}], device_obj={dev.host_name: dev}, parse_output=True ) diff --git a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_process.py b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_process.py index ba93e42cd..17e9918e2 100644 --- a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_process.py +++ b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_process.py @@ -14,7 +14,7 @@ class ProcessMod(Module): def set_process(self, src, dst): - for i,process in enumerate(src): + for i, process in enumerate(src): if 'pid' in process: dst[i].pid = process.get('pid') if 'command' in process: dst[i].command = process.get('command') if 'elapsed' in process: dst[i].elapsed = process.get('elapsed') @@ -38,7 +38,7 @@ async def discover(self): continue print('Running process Discovery on ' + dev.host_name) out = await Process.show( - input_data=[{dev.host_name: [{'dut_discovery':True}]}], + input_data=[{dev.host_name: [{'dut_discovery': True}]}], device_obj={dev.host_name: dev}, parse_output=True ) diff --git a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_service.py b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_service.py index 79ad39b25..2c5bee1df 100644 --- a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_service.py +++ b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/discovery/modules/mod_service.py @@ -14,7 +14,7 @@ class ServiceMod(Module): def set_service(self, src, dst): - for i,service in enumerate(src): + for i, service in enumerate(src): if 'name' in service: dst[i].name = service.get('name') if 'loaded' in service: dst[i].loaded = service.get('loaded') if 'active' in service: dst[i].active = service.get('active') @@ -32,7 +32,7 @@ async def discover(self): continue print('Running service Discovery on ' + dev.host_name) out = await Service.show( - input_data=[{dev.host_name: [{'dut_discovery':True}]}], + input_data=[{dev.host_name: [{'dut_discovery': True}]}], device_obj={dev.host_name: dev}, parse_output=True ) diff --git a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/test/test_suite/generated/test_attr_set_unset_ip.py b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/test/test_suite/generated/test_attr_set_unset_ip.py index 63690f14a..bc58f6601 100644 --- a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/test/test_suite/generated/test_attr_set_unset_ip.py +++ b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/test/test_suite/generated/test_attr_set_unset_ip.py @@ -32,13 +32,13 @@ def dev_object_filter(obj=None): return re.compile('swp*').match(obj.ifname) and obj.operstate == 'UP' def dev_object_set_params(obj=None): - return {'device': obj.ifname, 'operstate':'down'} + return {'device': obj.ifname, 'operstate': 'down'} def dev_object_show_params(obj=None): return {'device': obj.ifname} def dev_object_reset_params(obj=None): - return {'device': obj.ifname, 'operstate':'up'} + return {'device': obj.ifname, 'operstate': 'up'} class IpLinkAttrSetAndUnset(AttrSetAndUnsetBase): @@ -47,7 +47,7 @@ class IpLinkAttrSetAndUnset(AttrSetAndUnsetBase): meta = IpLinkAttrSetAndUnsetMeta -@pytest.fixture(params=[IpLinkAttrSetAndUnset,]) +@pytest.fixture(params=[IpLinkAttrSetAndUnset, ]) def attr_set_unset_ip_class(request): return request.param diff --git a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/test/test_suite/generated/test_delete_add_ip.py b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/test/test_suite/generated/test_delete_add_ip.py index a806d4e3d..8b987d732 100644 --- a/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/test/test_suite/generated/test_delete_add_ip.py +++ b/DentOS_Framework/DentOsTestbedLib/src/dent_os_testbed/test/test_suite/generated/test_delete_add_ip.py @@ -99,7 +99,7 @@ class IpLinkDeleteAndAdd(DeleteAndAddBase): meta = IpLinkDeleteAndAddMeta -@pytest.fixture(params=[IpRouteDeleteAndAdd,IpAddressDeleteAndAdd,IpLinkDeleteAndAdd,]) +@pytest.fixture(params=[IpRouteDeleteAndAdd, IpAddressDeleteAndAdd, IpLinkDeleteAndAdd, ]) def delete_add_ip_class(request): return request.param diff --git a/DentOS_Framework/DentOsTestbedLib/test/test_dent_dcb_app.py b/DentOS_Framework/DentOsTestbedLib/test/test_dent_dcb_app.py index 8c7b807ae..680a87725 100644 --- a/DentOS_Framework/DentOsTestbedLib/test/test_dent_dcb_app.py +++ b/DentOS_Framework/DentOsTestbedLib/test/test_dent_dcb_app.py @@ -17,7 +17,7 @@ def test_that_dcb_app_show(capfd): out = loop.run_until_complete(DcbApp.show(input_data=[{ # device 1 'test_dev' : [{}], - }], device_obj={'test_dev':dv1})) + }], device_obj={'test_dev': dv1})) print(out) assert 'command' in out[0]['test_dev'].keys() assert 'result' in out[0]['test_dev'].keys() @@ -29,26 +29,26 @@ def test_that_dcb_app_show(capfd): # device 1 'test_dev1' : [{ # command 1 - 'dev':'grjvikgf', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', - - },{ + 'dev': 'grjvikgf', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', + + }, { # command 2 - 'dev':'vaoohlzo', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', + 'dev': 'vaoohlzo', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() @@ -61,27 +61,27 @@ def test_that_dcb_app_show(capfd): out = loop.run_until_complete(DcbApp.show(input_data=[{ # device 1 'test_dev1' : [{ - 'dev':'grjvikgf', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', + 'dev': 'grjvikgf', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', }], # device 2 'test_dev2' : [{ - 'dev':'vaoohlzo', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', + 'dev': 'vaoohlzo', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() @@ -102,7 +102,7 @@ def test_that_dcb_app_flush(capfd): out = loop.run_until_complete(DcbApp.flush(input_data=[{ # device 1 'test_dev' : [{}], - }], device_obj={'test_dev':dv1})) + }], device_obj={'test_dev': dv1})) print(out) assert 'command' in out[0]['test_dev'].keys() assert 'result' in out[0]['test_dev'].keys() @@ -114,26 +114,26 @@ def test_that_dcb_app_flush(capfd): # device 1 'test_dev1' : [{ # command 1 - 'dev':'slvrkgyg', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', - - },{ + 'dev': 'slvrkgyg', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', + + }, { # command 2 - 'dev':'sxlqptce', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', + 'dev': 'sxlqptce', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() @@ -146,27 +146,27 @@ def test_that_dcb_app_flush(capfd): out = loop.run_until_complete(DcbApp.flush(input_data=[{ # device 1 'test_dev1' : [{ - 'dev':'slvrkgyg', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', + 'dev': 'slvrkgyg', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', }], # device 2 'test_dev2' : [{ - 'dev':'sxlqptce', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', + 'dev': 'sxlqptce', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() @@ -187,7 +187,7 @@ def test_that_dcb_app_add(capfd): out = loop.run_until_complete(DcbApp.add(input_data=[{ # device 1 'test_dev' : [{}], - }], device_obj={'test_dev':dv1})) + }], device_obj={'test_dev': dv1})) print(out) assert 'command' in out[0]['test_dev'].keys() assert 'result' in out[0]['test_dev'].keys() @@ -199,26 +199,26 @@ def test_that_dcb_app_add(capfd): # device 1 'test_dev1' : [{ # command 1 - 'dev':'zsewizgk', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', - - },{ + 'dev': 'zsewizgk', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', + + }, { # command 2 - 'dev':'apzgccxw', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', + 'dev': 'apzgccxw', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() @@ -231,27 +231,27 @@ def test_that_dcb_app_add(capfd): out = loop.run_until_complete(DcbApp.add(input_data=[{ # device 1 'test_dev1' : [{ - 'dev':'zsewizgk', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', + 'dev': 'zsewizgk', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', }], # device 2 'test_dev2' : [{ - 'dev':'apzgccxw', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', + 'dev': 'apzgccxw', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() @@ -272,7 +272,7 @@ def test_that_dcb_app_delete(capfd): out = loop.run_until_complete(DcbApp.delete(input_data=[{ # device 1 'test_dev' : [{}], - }], device_obj={'test_dev':dv1})) + }], device_obj={'test_dev': dv1})) print(out) assert 'command' in out[0]['test_dev'].keys() assert 'result' in out[0]['test_dev'].keys() @@ -284,26 +284,26 @@ def test_that_dcb_app_delete(capfd): # device 1 'test_dev1' : [{ # command 1 - 'dev':'qmhrjard', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', - - },{ + 'dev': 'qmhrjard', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', + + }, { # command 2 - 'dev':'pzcioafr', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', + 'dev': 'pzcioafr', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() @@ -316,27 +316,27 @@ def test_that_dcb_app_delete(capfd): out = loop.run_until_complete(DcbApp.delete(input_data=[{ # device 1 'test_dev1' : [{ - 'dev':'qmhrjard', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', + 'dev': 'qmhrjard', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', }], # device 2 'test_dev2' : [{ - 'dev':'pzcioafr', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', + 'dev': 'pzcioafr', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() @@ -357,7 +357,7 @@ def test_that_dcb_app_replace(capfd): out = loop.run_until_complete(DcbApp.replace(input_data=[{ # device 1 'test_dev' : [{}], - }], device_obj={'test_dev':dv1})) + }], device_obj={'test_dev': dv1})) print(out) assert 'command' in out[0]['test_dev'].keys() assert 'result' in out[0]['test_dev'].keys() @@ -369,26 +369,26 @@ def test_that_dcb_app_replace(capfd): # device 1 'test_dev1' : [{ # command 1 - 'dev':'jkdlzioq', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', - - },{ + 'dev': 'jkdlzioq', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', + + }, { # command 2 - 'dev':'ckdmewks', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', + 'dev': 'ckdmewks', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() @@ -401,27 +401,27 @@ def test_that_dcb_app_replace(capfd): out = loop.run_until_complete(DcbApp.replace(input_data=[{ # device 1 'test_dev1' : [{ - 'dev':'jkdlzioq', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', + 'dev': 'jkdlzioq', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', }], # device 2 'test_dev2' : [{ - 'dev':'ckdmewks', - 'default-prio':'', - 'dscp-prio':'', - 'ethtype-prio':'', - 'port-prio':'', - 'stream-port-prio':'', - 'dgram-port-prio':'', + 'dev': 'ckdmewks', + 'default-prio': '', + 'dscp-prio': '', + 'ethtype-prio': '', + 'port-prio': '', + 'stream-port-prio': '', + 'dgram-port-prio': '', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() diff --git a/DentOS_Framework/DentOsTestbedLib/test/test_dent_devlink_port.py b/DentOS_Framework/DentOsTestbedLib/test/test_dent_devlink_port.py index 47691d289..2b1b1919a 100644 --- a/DentOS_Framework/DentOsTestbedLib/test/test_dent_devlink_port.py +++ b/DentOS_Framework/DentOsTestbedLib/test/test_dent_devlink_port.py @@ -17,7 +17,7 @@ def test_that_devlink_port_set(capfd): out = loop.run_until_complete(DevlinkPort.set(input_data=[{ # device 1 'test_dev' : [{}], - }], device_obj={'test_dev':dv1})) + }], device_obj={'test_dev': dv1})) print(out) assert 'command' in out[0]['test_dev'].keys() assert 'result' in out[0]['test_dev'].keys() @@ -29,20 +29,20 @@ def test_that_devlink_port_set(capfd): # device 1 'test_dev1' : [{ # command 1 - 'dev':'jfonwshm', - 'name':'nxriflun', - 'value':'zbxvysfk', - 'cmode':'nwvidlmi', + 'dev': 'jfonwshm', + 'name': 'nxriflun', + 'value': 'zbxvysfk', + 'cmode': 'nwvidlmi', - },{ + }, { # command 2 - 'dev':'qvemwewh', - 'name':'iraczgpc', - 'value':'mdlmwisc', - 'cmode':'euflgsrp', + 'dev': 'qvemwewh', + 'name': 'iraczgpc', + 'value': 'mdlmwisc', + 'cmode': 'euflgsrp', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() @@ -55,21 +55,21 @@ def test_that_devlink_port_set(capfd): out = loop.run_until_complete(DevlinkPort.set(input_data=[{ # device 1 'test_dev1' : [{ - 'dev':'jfonwshm', - 'name':'nxriflun', - 'value':'zbxvysfk', - 'cmode':'nwvidlmi', + 'dev': 'jfonwshm', + 'name': 'nxriflun', + 'value': 'zbxvysfk', + 'cmode': 'nwvidlmi', }], # device 2 'test_dev2' : [{ - 'dev':'qvemwewh', - 'name':'iraczgpc', - 'value':'mdlmwisc', - 'cmode':'euflgsrp', + 'dev': 'qvemwewh', + 'name': 'iraczgpc', + 'value': 'mdlmwisc', + 'cmode': 'euflgsrp', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() @@ -90,7 +90,7 @@ def test_that_devlink_port_split(capfd): out = loop.run_until_complete(DevlinkPort.split(input_data=[{ # device 1 'test_dev' : [{}], - }], device_obj={'test_dev':dv1})) + }], device_obj={'test_dev': dv1})) print(out) assert 'command' in out[0]['test_dev'].keys() assert 'result' in out[0]['test_dev'].keys() @@ -106,7 +106,7 @@ def test_that_devlink_port_unsplit(capfd): out = loop.run_until_complete(DevlinkPort.unsplit(input_data=[{ # device 1 'test_dev' : [{}], - }], device_obj={'test_dev':dv1})) + }], device_obj={'test_dev': dv1})) print(out) assert 'command' in out[0]['test_dev'].keys() assert 'result' in out[0]['test_dev'].keys() @@ -122,7 +122,7 @@ def test_that_devlink_port_show(capfd): out = loop.run_until_complete(DevlinkPort.show(input_data=[{ # device 1 'test_dev' : [{}], - }], device_obj={'test_dev':dv1})) + }], device_obj={'test_dev': dv1})) print(out) assert 'command' in out[0]['test_dev'].keys() assert 'result' in out[0]['test_dev'].keys() @@ -134,16 +134,16 @@ def test_that_devlink_port_show(capfd): # device 1 'test_dev1' : [{ # command 1 - 'dev':'zdeyrtrt', - 'name':'uaelyfuw', + 'dev': 'zdeyrtrt', + 'name': 'uaelyfuw', - },{ + }, { # command 2 - 'dev':'yrqcphwy', - 'name':'vaqopkht', + 'dev': 'yrqcphwy', + 'name': 'vaqopkht', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() @@ -156,17 +156,17 @@ def test_that_devlink_port_show(capfd): out = loop.run_until_complete(DevlinkPort.show(input_data=[{ # device 1 'test_dev1' : [{ - 'dev':'zdeyrtrt', - 'name':'uaelyfuw', + 'dev': 'zdeyrtrt', + 'name': 'uaelyfuw', }], # device 2 'test_dev2' : [{ - 'dev':'yrqcphwy', - 'name':'vaqopkht', + 'dev': 'yrqcphwy', + 'name': 'vaqopkht', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() @@ -187,7 +187,7 @@ def test_that_devlink_port_health(capfd): out = loop.run_until_complete(DevlinkPort.health(input_data=[{ # device 1 'test_dev' : [{}], - }], device_obj={'test_dev':dv1})) + }], device_obj={'test_dev': dv1})) print(out) assert 'command' in out[0]['test_dev'].keys() assert 'result' in out[0]['test_dev'].keys() @@ -203,7 +203,7 @@ def test_that_devlink_port_add(capfd): out = loop.run_until_complete(DevlinkPort.add(input_data=[{ # device 1 'test_dev' : [{}], - }], device_obj={'test_dev':dv1})) + }], device_obj={'test_dev': dv1})) print(out) assert 'command' in out[0]['test_dev'].keys() assert 'result' in out[0]['test_dev'].keys() @@ -219,7 +219,7 @@ def test_that_devlink_port_delete(capfd): out = loop.run_until_complete(DevlinkPort.delete(input_data=[{ # device 1 'test_dev' : [{}], - }], device_obj={'test_dev':dv1})) + }], device_obj={'test_dev': dv1})) print(out) assert 'command' in out[0]['test_dev'].keys() assert 'result' in out[0]['test_dev'].keys() @@ -235,7 +235,7 @@ def test_that_devlink_port_function(capfd): out = loop.run_until_complete(DevlinkPort.function(input_data=[{ # device 1 'test_dev' : [{}], - }], device_obj={'test_dev':dv1})) + }], device_obj={'test_dev': dv1})) print(out) assert 'command' in out[0]['test_dev'].keys() assert 'result' in out[0]['test_dev'].keys() @@ -251,7 +251,7 @@ def test_that_devlink_port_param(capfd): out = loop.run_until_complete(DevlinkPort.param(input_data=[{ # device 1 'test_dev' : [{}], - }], device_obj={'test_dev':dv1})) + }], device_obj={'test_dev': dv1})) print(out) assert 'command' in out[0]['test_dev'].keys() assert 'result' in out[0]['test_dev'].keys() diff --git a/DentOS_Framework/DentOsTestbedLib/test/test_dent_sysctl.py b/DentOS_Framework/DentOsTestbedLib/test/test_dent_sysctl.py index 0792567c4..126c8a3bb 100644 --- a/DentOS_Framework/DentOsTestbedLib/test/test_dent_sysctl.py +++ b/DentOS_Framework/DentOsTestbedLib/test/test_dent_sysctl.py @@ -17,7 +17,7 @@ def test_that_sysctl_get(capfd): out = loop.run_until_complete(Sysctl.get(input_data=[{ # device 1 'test_dev' : [{}], - }], device_obj={'test_dev':dv1})) + }], device_obj={'test_dev': dv1})) print(out) assert 'command' in out[0]['test_dev'].keys() assert 'result' in out[0]['test_dev'].keys() @@ -29,14 +29,14 @@ def test_that_sysctl_get(capfd): # device 1 'test_dev1' : [{ # command 1 - 'variable':'wlmoznsp', + 'variable': 'wlmoznsp', - },{ + }, { # command 2 - 'variable':'dfxoranx', + 'variable': 'dfxoranx', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() @@ -49,15 +49,15 @@ def test_that_sysctl_get(capfd): out = loop.run_until_complete(Sysctl.get(input_data=[{ # device 1 'test_dev1' : [{ - 'variable':'wlmoznsp', + 'variable': 'wlmoznsp', }], # device 2 'test_dev2' : [{ - 'variable':'dfxoranx', + 'variable': 'dfxoranx', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() @@ -78,7 +78,7 @@ def test_that_sysctl_set(capfd): out = loop.run_until_complete(Sysctl.set(input_data=[{ # device 1 'test_dev' : [{}], - }], device_obj={'test_dev':dv1})) + }], device_obj={'test_dev': dv1})) print(out) assert 'command' in out[0]['test_dev'].keys() assert 'result' in out[0]['test_dev'].keys() @@ -90,16 +90,16 @@ def test_that_sysctl_set(capfd): # device 1 'test_dev1' : [{ # command 1 - 'variable':'eysjejvo', - 'value':'xttiqmtm', + 'variable': 'eysjejvo', + 'value': 'xttiqmtm', - },{ + }, { # command 2 - 'variable':'frknxnkx', - 'value':'hpizjqed', + 'variable': 'frknxnkx', + 'value': 'hpizjqed', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() @@ -112,17 +112,17 @@ def test_that_sysctl_set(capfd): out = loop.run_until_complete(Sysctl.set(input_data=[{ # device 1 'test_dev1' : [{ - 'variable':'eysjejvo', - 'value':'xttiqmtm', + 'variable': 'eysjejvo', + 'value': 'xttiqmtm', }], # device 2 'test_dev2' : [{ - 'variable':'frknxnkx', - 'value':'hpizjqed', + 'variable': 'frknxnkx', + 'value': 'hpizjqed', }], - }], device_obj={'test_dev1':dv1, 'test_dev2':dv2})) + }], device_obj={'test_dev1': dv1, 'test_dev2': dv2})) print(out) # check if the command was formed assert 'command' in out[0]['test_dev1'].keys() diff --git a/DentOS_Framework/DentOsTestbedLib/test/utils.py b/DentOS_Framework/DentOsTestbedLib/test/utils.py index 29e3e7cbe..1444d5e36 100644 --- a/DentOS_Framework/DentOsTestbedLib/test/utils.py +++ b/DentOS_Framework/DentOsTestbedLib/test/utils.py @@ -34,8 +34,8 @@ async def run_cmd(self, cmd): 'address':'00:00:00:00:00:00', 'broadcast':'00:00:00:00:00:00', 'addr_info':[ - {'family': 'inet', 'local': '127.0.0.1', 'prefixlen': 8, 'scope': 'host','label': 'lo', 'valid_life_time': 4294967295, 'preferred_life_time': 4294967295}, - {'family': 'inet', 'local': '10.1.0.1', 'prefixlen': 32, 'scope': 'global','label': 'lo', 'valid_life_time': 4294967295, 'preferred_life_time': 4294967295}, + {'family': 'inet', 'local': '127.0.0.1', 'prefixlen': 8, 'scope': 'host', 'label': 'lo', 'valid_life_time': 4294967295, 'preferred_life_time': 4294967295}, + {'family': 'inet', 'local': '10.1.0.1', 'prefixlen': 32, 'scope': 'global', 'label': 'lo', 'valid_life_time': 4294967295, 'preferred_life_time': 4294967295}, {'family': 'inet6', 'local': '::1', 'prefixlen': 128, 'scope': 'host', 'valid_life_time': 4294967295, 'preferred_life_time': 4294967295} ] },