autopep8

diff --git a/linkpair/collect/agent/ovs_agent.py b/linkpair/collect/agent/ovs_agent.py
index b22190e..f59e359 100755 (executable)
--- a/linkpair/collect/agent/ovs_agent.py
+++ b/linkpair/collect/agent/ovs_agent.py
@@ -87,22 +87,22 @@ class OVSAgent(BaseAgent):
             return port_meta["peer"]
         else:
             return self.PORT_TYPE_UNSPECIFIED
-    
+
     def get_port_veth_peer(self, port_name):
         port = self._cu.get_port(port_name)
         if port != self._cu.PORT_NOT_FOUND:
             port_meta = port.metadata
-            if port_meta.has_key("veth_peer"):
+            if "veth_peer" in port_meta:
                 return port_meta["veth_peer"]
             else:
                 return self.PORT_PEER_UNSPECIFIED
         else:
             return self.PORT_PEER_UNSPECIFIED
-            
+
     def get_configuration(self):
         patch_peers = {}
         veth_peers = {}
-        
+
         result = self._runner.exec_cmd("ovs-vsctl list-br")
         for br_src in result:
             br_src = br_src.rstrip()
@@ -172,7 +172,6 @@ class OVSAgent(BaseAgent):
                             Port(peer_src, Port.DEFAULT_TYPE, peer_src_meta),
                             Port(peer_dst, Port.DEFAULT_TYPE, peer_dst_meta),
                             self._formatter.VETH_FORMAT)
-                    
 
                 # none patch port
                 else:

diff --git a/linkpair/collect/agent/veth_agent.py b/linkpair/collect/agent/veth_agent.py
index 7ef470c..04796c0 100755 (executable)
--- a/linkpair/collect/agent/veth_agent.py
+++ b/linkpair/collect/agent/veth_agent.py
@@ -37,7 +37,9 @@ class VethAgent(BaseAgent):
                                 match = self._u.d_pop()
                                 peer_if = match.group(1)
                                 self._veth_peers[if_name] = peer_if
-                                port_meta = {"veth_peer":peer_if}
-                                self._cu.add_port(Port(if_name, Port.DEFAULT_TYPE, port_meta))
-                                port_meta2 = {"veth_peer":if_name}
-                                self._cu.add_port(Port(peer_if, Port.DEFAULT_TYPE, port_meta2))
+                                port_meta = {"veth_peer": peer_if}
+                                self._cu.add_port(Port(
+                                    if_name, Port.DEFAULT_TYPE, port_meta))
+                                port_meta2 = {"veth_peer": if_name}
+                                self._cu.add_port(Port(
+                                    peer_if, Port.DEFAULT_TYPE, port_meta2))

diff --git a/linkpair/collect/utils.py b/linkpair/collect/utils.py
index bc94a29..786a9ed 100755 (executable)
--- a/linkpair/collect/utils.py
+++ b/linkpair/collect/utils.py
@@ -40,19 +40,19 @@ class CollectUtils(object):
         self._formatter = formatter
 
     def add_linkpair(self, dev1, dev2, port1, port2, format=""):
-        if self._devices.has_key(dev1.label):
+        if dev1.label in self._devices:
             self._devices[dev1.label].metadata.update(dev1.metadata)
         else:
             self.add_device(dev1)
-        if self._devices.has_key(dev2.label):
+        if dev2.label in self._devices:
             self._devices[dev2.label].metadata.update(dev2.metadata)
         else:
             self.add_device(dev2)
-        if self._ports.has_key(port1.label):
+        if port1.label in self._ports:
             self._ports[port1.label].metadata.update(port1.metadata)
         else:
             self.add_port(port1)
-        if self._ports.has_key(port2.label):
+        if port2.label in self._ports:
             self._ports[port2.label].metadata.update(port2.metadata)
         else:
             self.add_port(port2)
@@ -70,23 +70,23 @@ class CollectUtils(object):
 #            insert_record(fmt, src, src_style, label, dst, dst_style)
 
     def add_device(self, device):
-        if self._devices.has_key(device.label):
+        if device.label in self._devices:
             self._devices[device.label].metadata.update(device.metadata)
         else:
             self._devices[device.label] = device
-        
+
     def add_port(self, port):
-        if self._ports.has_key(port.label):
+        if port.label in self._ports:
             self._ports[port.label].metadata.update(port.metadata)
         else:
             self._ports[port.label] = port
-            
+
     def get_port(self, port_name):
-        if self._ports.has_key(port_name):
+        if port_name in self._ports:
             return self._ports[port_name]
         else:
             return self.PORT_NOT_FOUND
-            
+
     def get_linkpairs(self):
         return self._linkpairs