X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=linkpair%2Fcollect%2Fagent%2Fovs_agent.py;h=ba64ab715a73b4b5648f3e1bb0e425efa6715f1c;hb=9d57de90b5b2354732b8b05726816221c7f8318a;hp=08f870f652e7dc72254967294cc08230ec3e5f60;hpb=9640bc9eb000865c9949fdb5f7881d542860ffef;p=ti2%2Fti2.git

diff --git a/linkpair/collect/agent/ovs_agent.py b/linkpair/collect/agent/ovs_agent.py
index 08f870f..ba64ab7 100755
--- a/linkpair/collect/agent/ovs_agent.py
+++ b/linkpair/collect/agent/ovs_agent.py
@@ -98,7 +98,7 @@ class OVSAgent(BaseAgent):
                     patch_src = port_name
                     patch_dst = self._cu.get_port_peer(port_meta)
                     patch_peers[patch_src + ":" + patch_dst] = self.PEER_FOUND
-                                        
+
                     if patch_dst + ":" + patch_src in patch_peers:
                         continue
 
@@ -188,7 +188,7 @@ class OVSAgent(BaseAgent):
                             if self._cu.get_port_vlan_master_if(port_meta) != self._cu.PORT_VLAN_UNSPECIFIED:
                                 master_if = self._cu.get_port_vlan_master_if(
                                     port_meta)
-                                if self._cu._port_to_br.has_key(master_if):
+                                if master_if in self._cu._port_to_br:
                                     self._cu._port_to_br[port_name] = br_src
                                     port_src = port_name
                                     port_src_meta = port_meta
@@ -197,12 +197,14 @@ class OVSAgent(BaseAgent):
                                     br_dst = self._cu._port_to_br[master_if]
                                     br_dst_obj = self._cu.get_device(br_dst)
                                     self._cu.add_linkpair(
-                                        Device(br_src, Device.BR_TYPE, br_src_meta),
+                                        Device(
+                                            br_src, Device.BR_TYPE, br_src_meta),
                                         br_dst_obj,
-                                        Port(port_src, Port.DEFAULT_TYPE, port_src_meta),
+                                        Port(
+                                            port_src, Port.DEFAULT_TYPE, port_src_meta),
                                         port_dst_obj,
                                         self._formatter.VLAN_DIST_FORMAT)
-                                          
+
                                 elif self._u.d_push(re.match(r'^eth\d+$', master_if)) \
                                     or self._u.d_push(re.match(r'^em\d+$', master_if)) \
                                         or self._u.d_push(re.match(r'^igb\d+$', master_if)) \