X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=linkpair%2Fcollect%2Fagent%2Fovs_agent.py;fp=linkpair%2Fcollect%2Fagent%2Fovs_agent.py;h=f59e3595f9178d7a3050acbfa897676d6c83b15f;hb=fcfb9d6d5d5a2dc184623e928451f5528a7ecccb;hp=b22190e2be93567c9c6017748beb62e5302c3299;hpb=2259df6d156fa0a12e8fa56644873b55927bbb18;p=ti2%2Fti2.git diff --git a/linkpair/collect/agent/ovs_agent.py b/linkpair/collect/agent/ovs_agent.py index b22190e..f59e359 100755 --- 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: