refactoring...

[ti2/ti2.git] / linkpair / collect / utils.py

diff --git a/linkpair/collect/utils.py b/linkpair/collect/utils.py
index 8a52ebc..faddce4 100755 (executable)
--- a/linkpair/collect/utils.py
+++ b/linkpair/collect/utils.py
@@ -15,6 +15,7 @@ from linkpair.collect.agent.commandrunner import CommandRunner
 
 
 class CollectUtils(object):
+
     '''LinkpPair collector utility
 
     This class
@@ -60,13 +61,14 @@ class CollectUtils(object):
             format = self._formatter.DEFAULT_FORMAT
 
         if self.exist_linkpair_by_ports(port1.label, port2.label) \
-            and port2.label != "INTERNAL":
-            exist_linkpair = self.get_linkpair_by_ports(port1.label, port2.label)
+                and port2.label != "INTERNAL":
+            exist_linkpair = self.get_linkpair_by_ports(
+                port1.label, port2.label)
             regist_dev1 = exist_linkpair.device1
             regist_dev2 = exist_linkpair.device2
             regist_port1 = exist_linkpair.port1
             regist_port2 = exist_linkpair.port2
-            
+
             if exist_linkpair.device2.label == "NOT CONNECTED":
                 if dev1.label == exist_linkpair.device1.label:
                     regist_dev1 = self._devices[dev1.label]
@@ -91,7 +93,7 @@ class CollectUtils(object):
                         regist_port1,
                         regist_port2,
                         format))
-            
+
         else:
             self._linkpairs.append(
                 LinkPair(
@@ -120,12 +122,12 @@ class CollectUtils(object):
             if linkpair.device1.label == dev1_name \
                 and linkpair.device2.label == dev2_name \
                 and linkpair.port1.label == port1_name \
-                and linkpair.port2.label == port2_name:
+                    and linkpair.port2.label == port2_name:
                     return linkpair
             elif linkpair.device2.label == dev1_name \
                 and linkpair.device1.label == dev2_name \
                 and linkpair.port2.label == port1_name \
-                and linkpair.port1.label == port2_name:
+                    and linkpair.port1.label == port2_name:
                     return linkpair
         return self.LINKPAIR_NOT_FOUND
 
@@ -134,35 +136,35 @@ class CollectUtils(object):
             if self._linkpairs[i].device1.label == dev1_name \
                 and self._linkpairs[i].device2.label == dev2_name \
                 and self._linkpairs[i].port1.label == port1_name \
-                and self._linkpairs[i].port2.label == port2_name:
+                    and self._linkpairs[i].port2.label == port2_name:
                     del self._linkpairs[i]
                     return True
             elif self._linkpairs[i].device2.label == dev1_name \
                 and self._linkpairs[i].device1.label == dev2_name \
                 and self._linkpairs[i].port2.label == port1_name \
-                and self._linkpairs[i].port1.label == port2_name:
+                    and self._linkpairs[i].port1.label == port2_name:
                     del self._linkpairs[i]
-                    return True            
+                    return True
         return False
 
     def get_linkpair_by_ports(self, port1_name, port2_name):
         for linkpair in self._linkpairs:
             if linkpair.port1.label == port1_name \
-                and linkpair.port2.label == port2_name:
+                    and linkpair.port2.label == port2_name:
+                    return linkpair
+            elif linkpair.port2.label == port1_name \
+                    and linkpair.port1.label == port2_name:
                     return linkpair
-            elif  linkpair.port2.label == port1_name \
-                and linkpair.port1.label == port2_name:
-                    return linkpair            
         return self.LINKPAIR_NOT_FOUND
-        
+
     def exist_linkpair_by_ports(self, port1_name, port2_name):
         for linkpair in self._linkpairs:
             if linkpair.port1.label == port1_name \
-                and linkpair.port2.label == port2_name:
+                    and linkpair.port2.label == port2_name:
+                    return True
+            elif linkpair.port2.label == port1_name \
+                    and linkpair.port1.label == port2_name:
                     return True
-            elif  linkpair.port2.label == port1_name \
-                and linkpair.port1.label == port2_name:
-                    return True            
         return False
 
     def exist_port(self, device_name):