From a556b1c880243c5421fbd5fb75b99c01a31c37bd Mon Sep 17 00:00:00 2001 From: Peter Gubka Date: Tue, 15 Nov 2016 12:44:50 +0100 Subject: [PATCH] fixing pep8 problems for test verify tox job Change-Id: I09edf6c26cee77a6d35b1157ed2b5c7316dcd4b5 Signed-off-by: Peter Gubka --- csit/libraries/Common.py | 1 + csit/libraries/CrudLibrary.py | 1 + csit/libraries/MininetTopo/vlan_vtn_test.py | 1 + csit/libraries/Topology.py | 1 + csit/libraries/Topologynew.py | 1 + csit/libraries/XmlComparator.py | 1 + csit/libraries/ipaddr.py | 1 + csit/suites/groupbasedpolicy/common_scripts/dpdumpflows.py | 1 + .../groupbasedpolicy/common_scripts/infrastructure_launch.py | 1 + csit/suites/lacp/Lacp_Feature_OF13/LACP_custom1.py | 1 + csit/suites/vpnservice/custom.py | 1 + tools/clustering/cluster-deployer/deploy.py | 1 + tools/clustering/cluster-deployer/restart.py | 1 + tools/clustering/cluster-tools/cluster_check.py | 1 + tools/exabgp_files/exarpc.py | 1 + .../create_lisp_control_plane_pcap.py | 1 + tools/odl-lispflowmapping-performance-tests/mapping_blaster.py | 1 + .../clustering-functional-test/crud.py | 1 + .../clustering-performance-test/inventory_perf.py | 1 + .../clustering-performance-test/odl_tester.py | 1 + .../clustering-performance-test/onos_stats.py | 1 + .../clustering-performance-test/onos_tester.py | 1 + tools/odl-ovsdb-performance-tests/ovsdbconfigblaster.py | 1 + tools/wstools/wsreceiver.py | 1 + 24 files changed, 24 insertions(+) diff --git a/csit/libraries/Common.py b/csit/libraries/Common.py index 7cd9a0e30e..2304398f11 100644 --- a/csit/libraries/Common.py +++ b/csit/libraries/Common.py @@ -79,5 +79,6 @@ def num_of_links_for_node(nodeid, leaflist, fanout): return 1 return (fanout + 1) + if __name__ == '__main__': print(num_of_nodes(3, 4)) diff --git a/csit/libraries/CrudLibrary.py b/csit/libraries/CrudLibrary.py index b930d84afc..e92bf56116 100644 --- a/csit/libraries/CrudLibrary.py +++ b/csit/libraries/CrudLibrary.py @@ -321,6 +321,7 @@ def main(): call[sys.argv[2]](SettingsLibrary.hostname, SettingsLibrary.port, int(sys.argv[3])) + # # main invoked if __name__ == "__main__": diff --git a/csit/libraries/MininetTopo/vlan_vtn_test.py b/csit/libraries/MininetTopo/vlan_vtn_test.py index d0010f74e5..be3caa877d 100644 --- a/csit/libraries/MininetTopo/vlan_vtn_test.py +++ b/csit/libraries/MininetTopo/vlan_vtn_test.py @@ -60,4 +60,5 @@ class VlanTopo(Topo): self.addLink(s3, host5) self.addLink(s3, host6) + topos = {'vlantopo': (lambda: VlanTopo())} diff --git a/csit/libraries/Topology.py b/csit/libraries/Topology.py index dad09ce08b..4c2b066004 100644 --- a/csit/libraries/Topology.py +++ b/csit/libraries/Topology.py @@ -40,6 +40,7 @@ class Topology(object): else: return None + if __name__ == '__main__': topology = Topology() print topology.get_nodes_from_topology(2) diff --git a/csit/libraries/Topologynew.py b/csit/libraries/Topologynew.py index b3c6020f41..80c83f0a8a 100644 --- a/csit/libraries/Topologynew.py +++ b/csit/libraries/Topologynew.py @@ -99,6 +99,7 @@ class Topologynew(object): nodes += self._enumerate_nodes(currentdepth + 1, nodeid + nodes, i, fanout, depth, leafnodes) return nodes + if __name__ == '__main__': topologynew = Topologynew() # print topologynew.get_nodes_from_tree_topo(2) diff --git a/csit/libraries/XmlComparator.py b/csit/libraries/XmlComparator.py index 3b0b829767..8ad386e2e5 100644 --- a/csit/libraries/XmlComparator.py +++ b/csit/libraries/XmlComparator.py @@ -176,6 +176,7 @@ class XMLtoDictParserTools(): diff[key] = (KEY_NOT_FOUND, key) return diff + IGNORED_TAGS_FOR_OPERATIONAL_COMPARISON = ['id', 'flow-name', 'barrier', 'cookie_mask', 'installHw', 'flags', 'strict', 'byte-count', 'duration', 'packet-count', 'in-port', 'vlan-id-present', 'out_group', 'out_port', 'hard-timeout', 'idle-timeout', diff --git a/csit/libraries/ipaddr.py b/csit/libraries/ipaddr.py index 36a23c7ce4..dacd381531 100644 --- a/csit/libraries/ipaddr.py +++ b/csit/libraries/ipaddr.py @@ -371,6 +371,7 @@ def collapse_address_list(addresses): return _collapse_address_list_recursive(sorted( addrs + nets, key=_BaseNet._get_networks_key)) + # backwards compatibility CollapseAddrList = collapse_address_list diff --git a/csit/suites/groupbasedpolicy/common_scripts/dpdumpflows.py b/csit/suites/groupbasedpolicy/common_scripts/dpdumpflows.py index f0d37a2d90..5a61ffd289 100644 --- a/csit/suites/groupbasedpolicy/common_scripts/dpdumpflows.py +++ b/csit/suites/groupbasedpolicy/common_scripts/dpdumpflows.py @@ -8,6 +8,7 @@ def call_dpctl(): listcmd = cmd.split() return check_output(listcmd) + if __name__ == "__main__": flows = call_dpctl().split("recirc_id") for flow in flows: diff --git a/csit/suites/groupbasedpolicy/common_scripts/infrastructure_launch.py b/csit/suites/groupbasedpolicy/common_scripts/infrastructure_launch.py index 99c6c3090b..4a4bd866e1 100644 --- a/csit/suites/groupbasedpolicy/common_scripts/infrastructure_launch.py +++ b/csit/suites/groupbasedpolicy/common_scripts/infrastructure_launch.py @@ -268,6 +268,7 @@ def launch(switches, hosts, odl_ip='127.0.0.1'): print "Created container: %s with IP: %s. Connect using docker attach %s," \ "disconnect with 'ctrl-p-q'." % (host['name'], host['ip'], host['name']) + if __name__ == "__main__": if len(sys.argv) < 2 or len(sys.argv) > 3: print "Please, specify IP of ODL and switch index in arguments." diff --git a/csit/suites/lacp/Lacp_Feature_OF13/LACP_custom1.py b/csit/suites/lacp/Lacp_Feature_OF13/LACP_custom1.py index 6e35cb0573..e2386d08b5 100644 --- a/csit/suites/lacp/Lacp_Feature_OF13/LACP_custom1.py +++ b/csit/suites/lacp/Lacp_Feature_OF13/LACP_custom1.py @@ -59,4 +59,5 @@ class LacpTopo(Topo): CLI(net) net.stop() + topos = {'lacp': (lambda: LacpTopo())} diff --git a/csit/suites/vpnservice/custom.py b/csit/suites/vpnservice/custom.py index 2d07a47e64..6363a6845b 100755 --- a/csit/suites/vpnservice/custom.py +++ b/csit/suites/vpnservice/custom.py @@ -36,5 +36,6 @@ class Switch2(Topo): host = self.addHost('h%s' % (h + 3), mac="00:00:00:00:00:0" + str(h + 3), ip="10.0.0." + str(h + 3)) self.addLink(host, switch) + topos = {'Switch1': (lambda: Switch1()), 'Switch2': (lambda: Switch2())} diff --git a/tools/clustering/cluster-deployer/deploy.py b/tools/clustering/cluster-deployer/deploy.py index cd8962de17..a9819e0cfc 100755 --- a/tools/clustering/cluster-deployer/deploy.py +++ b/tools/clustering/cluster-deployer/deploy.py @@ -288,5 +288,6 @@ def main(): for x in range(0, len(hosts)): deployers[x].deploy() + # Run the script main() diff --git a/tools/clustering/cluster-deployer/restart.py b/tools/clustering/cluster-deployer/restart.py index c56092ac34..48bfa903e6 100755 --- a/tools/clustering/cluster-deployer/restart.py +++ b/tools/clustering/cluster-deployer/restart.py @@ -34,4 +34,5 @@ def main(): remote.exec_cmd("rm -rf " + args.rootdir + "/deploy/current/odl/snapshots") remote.start_controller(args.rootdir + "/deploy/current") + main() diff --git a/tools/clustering/cluster-tools/cluster_check.py b/tools/clustering/cluster-tools/cluster_check.py index 23525dcb83..b4848091d5 100755 --- a/tools/clustering/cluster-tools/cluster_check.py +++ b/tools/clustering/cluster-tools/cluster_check.py @@ -114,6 +114,7 @@ def list_entity_owners(ipaddress, entity_owner_list): print("IP Address", str(owner_role[0])) print("\n") + # Main Block if __name__ == '__main__': print('*****Cluster Status******') diff --git a/tools/exabgp_files/exarpc.py b/tools/exabgp_files/exarpc.py index 1d2a36c9d8..b6283f4405 100644 --- a/tools/exabgp_files/exarpc.py +++ b/tools/exabgp_files/exarpc.py @@ -357,5 +357,6 @@ def main(*argv): rpcserver.shutdown() trpc.join() + if __name__ == '__main__': main() diff --git a/tools/odl-lispflowmapping-performance-tests/create_lisp_control_plane_pcap.py b/tools/odl-lispflowmapping-performance-tests/create_lisp_control_plane_pcap.py index 5b3aa12572..d2784da71e 100755 --- a/tools/odl-lispflowmapping-performance-tests/create_lisp_control_plane_pcap.py +++ b/tools/odl-lispflowmapping-performance-tests/create_lisp_control_plane_pcap.py @@ -113,6 +113,7 @@ def generate_map_register(eid, rloc, key_id): xtr_id_low=netaddr.IPAddress(eid)) return packet + parser = argparse.ArgumentParser(description='Create a Map-Request trace file') parser.add_argument('--dst-mac', default='00:00:00:00:00:00', diff --git a/tools/odl-lispflowmapping-performance-tests/mapping_blaster.py b/tools/odl-lispflowmapping-performance-tests/mapping_blaster.py index 2fac5249e6..63c1a8e7f4 100755 --- a/tools/odl-lispflowmapping-performance-tests/mapping_blaster.py +++ b/tools/odl-lispflowmapping-performance-tests/mapping_blaster.py @@ -163,6 +163,7 @@ class MappingRPCBlaster(object): self.send_rpc(self.session, 'get-mapping', rpc_json) self.session.close() + if __name__ == "__main__": parser = argparse.ArgumentParser(description='Add simple IPv4 \ prefix-to-IPv4 locator LISP mappings to OpenDaylight') diff --git a/tools/odl-mdsal-clustering-tests/clustering-functional-test/crud.py b/tools/odl-mdsal-clustering-tests/clustering-functional-test/crud.py index dabf6a4b5f..25344c2444 100644 --- a/tools/odl-mdsal-clustering-tests/clustering-functional-test/crud.py +++ b/tools/odl-mdsal-clustering-tests/clustering-functional-test/crud.py @@ -231,6 +231,7 @@ def main(): call[sys.argv[2]](int(sys.argv[3])) + # # main invoked main() diff --git a/tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_perf.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_perf.py index a10914bdec..48d279f2ad 100644 --- a/tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_perf.py +++ b/tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_perf.py @@ -38,6 +38,7 @@ class Timer(object): if self.verbose: print("elapsed time: %f ms" % self.msecs) + # Initialize the totals over all threads total_requests = Counter(0) total_req_rate = Counter(0.0) diff --git a/tools/odl-mdsal-clustering-tests/clustering-performance-test/odl_tester.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/odl_tester.py index 3202bd7890..214e8aeaec 100644 --- a/tools/odl-mdsal-clustering-tests/clustering-performance-test/odl_tester.py +++ b/tools/odl-mdsal-clustering-tests/clustering-performance-test/odl_tester.py @@ -392,5 +392,6 @@ def main(*argv): fd.write("AddRate,DeleteRate\n") fd.write("{0},{1}\n".format(addrate, delrate)) + if __name__ == "__main__": main(sys.argv[1:]) diff --git a/tools/odl-mdsal-clustering-tests/clustering-performance-test/onos_stats.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/onos_stats.py index 96613a2bc1..86d860f538 100644 --- a/tools/odl-mdsal-clustering-tests/clustering-performance-test/onos_stats.py +++ b/tools/odl-mdsal-clustering-tests/clustering-performance-test/onos_stats.py @@ -296,5 +296,6 @@ def main(*argv): print "\n\nSome stats monitoring ...." print get_flow_simple_stats(controller=in_args.host) + if __name__ == "__main__": main(sys.argv[1:]) diff --git a/tools/odl-mdsal-clustering-tests/clustering-performance-test/onos_tester.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/onos_tester.py index 3c06430b7b..0e00655dfe 100644 --- a/tools/odl-mdsal-clustering-tests/clustering-performance-test/onos_tester.py +++ b/tools/odl-mdsal-clustering-tests/clustering-performance-test/onos_tester.py @@ -485,5 +485,6 @@ def main(*argv): fd.write("AddRate,DeleteRate\n") fd.write("{0},{1}\n".format(addrate, delrate)) + if __name__ == "__main__": main(sys.argv[1:]) diff --git a/tools/odl-ovsdb-performance-tests/ovsdbconfigblaster.py b/tools/odl-ovsdb-performance-tests/ovsdbconfigblaster.py index 4c4362f3d4..bcadef3b82 100644 --- a/tools/odl-ovsdb-performance-tests/ovsdbconfigblaster.py +++ b/tools/odl-ovsdb-performance-tests/ovsdbconfigblaster.py @@ -324,6 +324,7 @@ class OvsdbConfigBlaster (object): json_body) return ret.status_code + if __name__ == "__main__": parser = argparse.ArgumentParser(description='Add:delete bridge/port/term-points to OpenDaylight') diff --git a/tools/wstools/wsreceiver.py b/tools/wstools/wsreceiver.py index 898cead9fa..9f63ea70fc 100644 --- a/tools/wstools/wsreceiver.py +++ b/tools/wstools/wsreceiver.py @@ -72,6 +72,7 @@ class WSReceiver(object): logger.info("Data received:\n%s", data) return data + if __name__ == "__main__": args = parse_arguments() logger = logging.getLogger("logger") -- 2.36.6