Fix pep8 failures

Change-Id: Ibe42d4bf9199b6755ba603947dc4ffcee44cb9b9
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/csit/libraries/ConfGen.py b/csit/libraries/ConfGen.py
index e9ff96196ba03af119399370a80ca05ab0acd5dc..d97bbdb77178a47f2e74370876c254d2d0bac2f8 100644 (file)
--- a/csit/libraries/ConfGen.py
+++ b/csit/libraries/ConfGen.py
@@ -35,7 +35,7 @@ def generate_akka(original_file, node_idx=1, nodes_ip_list=['127.0.0.1']):
     """
 
     conf = _parse_input(original_file)
-    conf['odl-cluster-data']['akka']['remote']['netty']['tcp']['hostname'] = nodes_ip_list[node_idx-1]
+    conf['odl-cluster-data']['akka']['remote']['netty']['tcp']['hostname'] = nodes_ip_list[node_idx - 1]
     seed_nodes = [u'akka.tcp://opendaylight-cluster-data@{}:2550'.format(ip) for ip in nodes_ip_list]
     conf['odl-cluster-data']['akka']['cluster']['seed-nodes'] = seed_nodes
     conf['odl-cluster-data']['akka']['cluster']['roles'] = ["member-{}".format(node_idx)]
@@ -84,7 +84,7 @@ def generate_module_shards(original_file, nodes=1, shard_name='', replicas=[]):
     """
     conf = _parse_input(original_file)
     for module_shard in conf['module-shards']:
-        module_shard["shards"][0]["replicas"] = ["member-{}".format(i+1) for i in range(int(nodes))]
+        module_shard["shards"][0]["replicas"] = ["member-{}".format(i + 1) for i in range(int(nodes))]
     if shard_name != '' and replicas != []:
         conf['module-shards'].append(
             pyhocon.ConfigTree([("name", shard_name),

diff --git a/csit/libraries/IoTDM/client_libs/onem2m_http.py b/csit/libraries/IoTDM/client_libs/onem2m_http.py
index a4c21bef526d549493b01c9c8fac231ee6f33a29..d64ace24091a74887c263cdf634933a22460c640 100644 (file)
--- a/csit/libraries/IoTDM/client_libs/onem2m_http.py
+++ b/csit/libraries/IoTDM/client_libs/onem2m_http.py
@@ -466,7 +466,7 @@ class OneM2MHttpJsonDecoderRx(IoTDataDecoder):
 
         if protocol_message.method:
             operation = OneM2MHttpDecodeUtils.translate_http_method_to_onem2m_operation(
-                            protocol_message.method, builder.has_param(OneM2M.short_resource_type))
+                protocol_message.method, builder.has_param(OneM2M.short_resource_type))
             builder.set_param(OneM2M.short_operation, operation)
 
         return builder.build()

diff --git a/csit/libraries/IoTDM/client_libs/testing/test_onem2m_json_primitive.py b/csit/libraries/IoTDM/client_libs/testing/test_onem2m_json_primitive.py
index 2c4e0fef4997ced43466aa6ce8d428234416cd10..b5a0e517b1a366696526b328f17d48fff96e2912 100644 (file)
--- a/csit/libraries/IoTDM/client_libs/testing/test_onem2m_json_primitive.py
+++ b/csit/libraries/IoTDM/client_libs/testing/test_onem2m_json_primitive.py
@@ -35,9 +35,9 @@ class TestOneM2MJsonPrimitive(unittest.TestCase):
 
     def _create_primitive(self):
         builder = OneM2MJsonPrimitiveBuilder()\
-               .set_parameters(self.params)\
-               .set_content(self.content)\
-               .set_protocol_specific_parameters(self.proto_params)
+            .set_parameters(self.params)\
+            .set_content(self.content)\
+            .set_protocol_specific_parameters(self.proto_params)
         return builder.build()
 
     def test_primitive_build_with_content(self):

diff --git a/csit/libraries/IoTDM/iotdm_comm.py b/csit/libraries/IoTDM/iotdm_comm.py
index 003deb4f836af786840583034bf5da2896461cbb..500f23ef34db6dae99b269fb9b17d1d759f9a9cc 100644 (file)
--- a/csit/libraries/IoTDM/iotdm_comm.py
+++ b/csit/libraries/IoTDM/iotdm_comm.py
@@ -420,9 +420,9 @@ def get_local_ip_from_list(iotdm_ip, local_ip_list_str):
 def create_http_default_communication_parameters(address, port, content_type):
     """Returns JSON string including default HTTP specific parameters"""
     return '{{"{}": "{}", "{}": {}, "Content-Type": "{}"}}'.format(
-                onem2m_http.protocol_address, address,
-                onem2m_http.protocol_port, port,
-                content_type)
+        onem2m_http.protocol_address, address,
+        onem2m_http.protocol_port, port,
+        content_type)
 
 
 def create_iotdm_http_connection(entity_id, address, port, content_type, rx_port=None, allias="default"):

diff --git a/csit/libraries/MdsalLowlevelPy.py b/csit/libraries/MdsalLowlevelPy.py
index 5a124ecd734d8adc0b7cac7087bd7f8966c5ae60..d6a4bd2dd17ec78a7f886ce9865de28a5b601800 100644 (file)
--- a/csit/libraries/MdsalLowlevelPy.py
+++ b/csit/libraries/MdsalLowlevelPy.py
@@ -54,7 +54,7 @@ def _initiate_rpcs(host_list, index_list, url_templ, data_templ, subst_dict):
     lthreads = _globals.pop('threads', [])
     for i, host in enumerate(host_list):
         url = url_templ.substitute({'HOST': host})
-        timeout = int(subst_dict['DURATION']) + 3*125+10
+        timeout = int(subst_dict['DURATION']) + 3 * 125 + 10
         prefix_id = subst_dict['ID_PREFIX'] + str(index_list[i])
         subst_dict['ID'] = prefix_id
         data = data_templ.substitute(subst_dict)
@@ -127,7 +127,7 @@ def start_produce_transactions_on_nodes(host_list, index_list, id_prefix,
         _globals.clear()
 
     msg = "host_list:{}, index_list:{} ,id_prefix:{}, duration:{}, rate:{}, isolated_transactions:{}".format(
-            host_list, index_list, id_prefix, duration, rate, isolated_transactions_flag)
+        host_list, index_list, id_prefix, duration, rate, isolated_transactions_flag)
     msg = "Input parameters: " + msg
     logger.info(msg)
     datat = string.Template('''<input xmlns="tag:opendaylight.org,2017:controller:yang:lowlevel:control">

diff --git a/csit/libraries/Sxp.py b/csit/libraries/Sxp.py
index 6cd5d52e37ce830ef3c2c85a189588a9a4c81b70..645d315663505bea4a4115b05755b2acd8ffcc29 100644 (file)
--- a/csit/libraries/Sxp.py
+++ b/csit/libraries/Sxp.py
@@ -441,7 +441,7 @@ def find_connection(connections_json, version, mode, ip, port, state):
     """
     for connection in parse_connections(connections_json):
         if (connection['peer-address'] == ip and connection['tcp-port'] == int(port) and (
-                        mode.strip() == 'any' or connection['mode'] == mode) and connection['version'] == version):
+                mode.strip() == 'any' or connection['mode'] == mode) and connection['version'] == version):
             if state == 'none':
                 return True
             elif connection['state'] == state:

diff --git a/csit/variables/genius/Modules.py b/csit/variables/genius/Modules.py
index 539308f40b10976971fdc41b611f541e3fd9410f..9cf022885c3466906efb65acc7a60add7026611b 100644 (file)
--- a/csit/variables/genius/Modules.py
+++ b/csit/variables/genius/Modules.py
@@ -1,16 +1,16 @@
 bfd_data_models = [
-        'config/itm-config:tunnel-monitor-enabled',
-        'config/itm-config:tunnel-monitor-interval',
-        'config/itm-state:dpn-endpoints',
-        'config/itm-state:external-tunnel-list',
-        'config/itm:transport-zones',
-        'config/network-topology:network-topology',
-        'config/opendaylight-inventory:nodes',
-        'operational/ietf-interfaces:interfaces',
-        'operational/ietf-interfaces:interfaces-state',
-        'operational/itm-config:tunnel-monitor-enabled',
-        'operational/itm-config:tunnel-monitor-interval',
-        'operational/itm-state:tunnels_state',
-        'operational/network-topology:network-topology',
-        'operational/odl-interface-meta:bridge-ref-info',
+    'config/itm-config:tunnel-monitor-enabled',
+    'config/itm-config:tunnel-monitor-interval',
+    'config/itm-state:dpn-endpoints',
+    'config/itm-state:external-tunnel-list',
+    'config/itm:transport-zones',
+    'config/network-topology:network-topology',
+    'config/opendaylight-inventory:nodes',
+    'operational/ietf-interfaces:interfaces',
+    'operational/ietf-interfaces:interfaces-state',
+    'operational/itm-config:tunnel-monitor-enabled',
+    'operational/itm-config:tunnel-monitor-interval',
+    'operational/itm-state:tunnels_state',
+    'operational/network-topology:network-topology',
+    'operational/odl-interface-meta:bridge-ref-info',
 ]

diff --git a/csit/variables/netvirt/Modules.py b/csit/variables/netvirt/Modules.py
index 205fd824ad266ac9d4c938dbdc205cffaeb60b78..c1057f60d203c5f14526664d6ed50f88b8b3e46e 100644 (file)
--- a/csit/variables/netvirt/Modules.py
+++ b/csit/variables/netvirt/Modules.py
@@ -1,67 +1,67 @@
 netvirt_data_models = [
-        'config/elan:elan-instances',
-        'config/elan:elan-interfaces',
-        'config/id-manager:id-pools',
-        'config/ietf-access-control-list:access-lists',
-        'config/ietf-interfaces:interfaces',
-        'config/interface-service-bindings:service-bindings',
-        'config/itm-state:dpn-endpoints',
-        'config/itm-state:tunnel-list',
-        'config/itm:transport-zones',
-        'config/l3vpn:vpn-instances',
-        'config/l3vpn:vpn-interfaces',
-        'config/network-topology:network-topology/topology/ovsdb:1',
-        'config/neutron:neutron',
-        'config/neutron:neutron/routers',
-        'config/neutronvpn:networkMaps',
-        'config/neutronvpn:neutron-vpn-portip-port-data',
-        'config/neutronvpn:router-interfaces-map',
-        'config/neutronvpn:subnetmaps',
-        'config/neutronvpn:vpnMaps',
-        'config/odl-fib:fibEntries',
-        'config/odl-interface-meta:interface-child-info',
-        'config/odl-l3vpn:router-interfaces',
-        'config/odl-l3vpn:vpn-id-to-vpn-instance',
-        'config/odl-l3vpn:vpn-instance-to-vpn-id',
-        'config/odl-nat:external-networks',
-        'config/odl-nat:ext-routers',
-        'config/odl-nat:external-subnets',
-        'config/odl-nat:floating-ip-info',
-        'config/odl-nat:intext-ip-port-map',
-        'config/odl-nat:napt-switches',
-        'config/odl-nat:router-id-name',
-        'config/odl-nat:snatint-ip-port-map',
-        'config/opendaylight-inventory:nodes',
-        'config/service-function-chain:service-function-chains',
-        'config/service-function-classifier:service-function-classifiers',
-        'config/service-function-forwarder:service-function-forwarders',
-        'config/service-function-group:service-function-groups',
-        'config/service-function:service-functions',
-        'config/service-function-mapping:sff-dpl-by-sf-dpl-mappings',
-        'config/service-function-path:service-function-paths',
-        'config/service-function-path-metadata:service-function-metadata',
-        'config/service-function-type:service-function-types',
-        'config/sfc-of-renderer:sfc-of-renderer-config',
-        'operational/elan:elan-dpn-interfaces',
-        'operational/elan:elan-forwarding-tables',
-        'operational/elan:elan-interfaces',
-        'operational/elan:elan-state',
-        'operational/ietf-interfaces:interfaces-state',
-        'operational/itm-state:tunnels_state',
-        'operational/l3nexthop:l3nexthop',
-        'operational/l3vpn:vpn-interfaces',
-        'operational/network-topology:network-topology/topology/ovsdb:1',
-        'operational/neutron:neutron/neutron:ports',
-        'operational/odl-fib:label-route-map',
-        'operational/odl-l3vpn:learnt-vpn-vip-to-port-data',
-        'operational/odl-l3vpn:neutron-router-dpns',
-        'operational/odl-l3vpn:port-op-data',
-        'operational/odl-l3vpn:prefix-to-interface',
-        'operational/odl-l3vpn:subnet-op-data',
-        'operational/odl-l3vpn:vpn-instance-op-data',
-        'operational/odl-l3vpn:vpn-to-extraroute',
-        'operational/odl-nat:external-ips-counter',
-        'operational/odl-nat:floating-ip-info',
-        'operational/odl-nat:intext-ip-map',
-        'operational/rendered-service-path:rendered-service-path',
+    'config/elan:elan-instances',
+    'config/elan:elan-interfaces',
+    'config/id-manager:id-pools',
+    'config/ietf-access-control-list:access-lists',
+    'config/ietf-interfaces:interfaces',
+    'config/interface-service-bindings:service-bindings',
+    'config/itm-state:dpn-endpoints',
+    'config/itm-state:tunnel-list',
+    'config/itm:transport-zones',
+    'config/l3vpn:vpn-instances',
+    'config/l3vpn:vpn-interfaces',
+    'config/network-topology:network-topology/topology/ovsdb:1',
+    'config/neutron:neutron',
+    'config/neutron:neutron/routers',
+    'config/neutronvpn:networkMaps',
+    'config/neutronvpn:neutron-vpn-portip-port-data',
+    'config/neutronvpn:router-interfaces-map',
+    'config/neutronvpn:subnetmaps',
+    'config/neutronvpn:vpnMaps',
+    'config/odl-fib:fibEntries',
+    'config/odl-interface-meta:interface-child-info',
+    'config/odl-l3vpn:router-interfaces',
+    'config/odl-l3vpn:vpn-id-to-vpn-instance',
+    'config/odl-l3vpn:vpn-instance-to-vpn-id',
+    'config/odl-nat:external-networks',
+    'config/odl-nat:ext-routers',
+    'config/odl-nat:external-subnets',
+    'config/odl-nat:floating-ip-info',
+    'config/odl-nat:intext-ip-port-map',
+    'config/odl-nat:napt-switches',
+    'config/odl-nat:router-id-name',
+    'config/odl-nat:snatint-ip-port-map',
+    'config/opendaylight-inventory:nodes',
+    'config/service-function-chain:service-function-chains',
+    'config/service-function-classifier:service-function-classifiers',
+    'config/service-function-forwarder:service-function-forwarders',
+    'config/service-function-group:service-function-groups',
+    'config/service-function:service-functions',
+    'config/service-function-mapping:sff-dpl-by-sf-dpl-mappings',
+    'config/service-function-path:service-function-paths',
+    'config/service-function-path-metadata:service-function-metadata',
+    'config/service-function-type:service-function-types',
+    'config/sfc-of-renderer:sfc-of-renderer-config',
+    'operational/elan:elan-dpn-interfaces',
+    'operational/elan:elan-forwarding-tables',
+    'operational/elan:elan-interfaces',
+    'operational/elan:elan-state',
+    'operational/ietf-interfaces:interfaces-state',
+    'operational/itm-state:tunnels_state',
+    'operational/l3nexthop:l3nexthop',
+    'operational/l3vpn:vpn-interfaces',
+    'operational/network-topology:network-topology/topology/ovsdb:1',
+    'operational/neutron:neutron/neutron:ports',
+    'operational/odl-fib:label-route-map',
+    'operational/odl-l3vpn:learnt-vpn-vip-to-port-data',
+    'operational/odl-l3vpn:neutron-router-dpns',
+    'operational/odl-l3vpn:port-op-data',
+    'operational/odl-l3vpn:prefix-to-interface',
+    'operational/odl-l3vpn:subnet-op-data',
+    'operational/odl-l3vpn:vpn-instance-op-data',
+    'operational/odl-l3vpn:vpn-to-extraroute',
+    'operational/odl-nat:external-ips-counter',
+    'operational/odl-nat:floating-ip-info',
+    'operational/odl-nat:intext-ip-map',
+    'operational/rendered-service-path:rendered-service-path',
 ]

diff --git a/csit/variables/vtn/Modules.py b/csit/variables/vtn/Modules.py
index bd49e987c9c960e7f86dbfa3d7fe657d04ffaa12..e6b55e0b57ad240e7f248676a823135a43ec5801 100644 (file)
--- a/csit/variables/vtn/Modules.py
+++ b/csit/variables/vtn/Modules.py
@@ -1,8 +1,8 @@
 vtn_data_models = [
-        'config/network-topology:network-topology/topology/ovsdb:1',
-        'config/opendaylight-inventory:nodes',
-        'operational/opendaylight-inventory:nodes',
-        'operational/entity-owners:entity-owners',
-        'operational/vtn-inventory:vtn-nodes',
-        'operational/network-topology:network-topology/topology/ovsdb:1'
+    'config/network-topology:network-topology/topology/ovsdb:1',
+    'config/opendaylight-inventory:nodes',
+    'operational/opendaylight-inventory:nodes',
+    'operational/entity-owners:entity-owners',
+    'operational/vtn-inventory:vtn-nodes',
+    'operational/network-topology:network-topology/topology/ovsdb:1'
 ]

diff --git a/tools/distchanges/changes.py b/tools/distchanges/changes.py
index d497301bb7d0bb0ea79ae2a3a562b418f4e3eccb..3fcafb88fa07f7d12c31b0a6363bc3e5093bbbb3 100644 (file)
--- a/tools/distchanges/changes.py
+++ b/tools/distchanges/changes.py
@@ -269,7 +269,7 @@ class Changes(object):
         if msg:
             lines = str(msg.group()).split("\\n")
             cli = next((i for i, line in enumerate(lines[:-1]) if '* changes\\:' in line), None)
-            first_msg = lines[cli+1] if cli else None
+            first_msg = lines[cli + 1] if cli else None
         if first_msg:
             if self.verbose >= 1:
                 print("did not find Change-Id or commit-msg in %s, trying with merge commit-msg: %s"