From: t.moriyama <t.moriyama@users.sourceforge.jp>
Date: Sun, 1 Sep 2013 15:37:53 +0000 (+0900)
Subject: delete module version of collector agents
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=3e80d86313137203d05cda212e5d02cd7a3eb152;p=ti2%2Fti2.git

delete module version of collector agents
---

diff --git a/linkpair/collect/agent/commandrunner.py b/linkpair/collect/agent/commandrunner.py
index 69a5d21..292b64e 100755
--- a/linkpair/collect/agent/commandrunner.py
+++ b/linkpair/collect/agent/commandrunner.py
@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 #
 
-__version__ = '1.1'
-
 import sys
 import os
 import re
diff --git a/linkpair/collect/agent/libvirt_agent.py b/linkpair/collect/agent/libvirt_agent.py
index d6bddbd..ef69e91 100755
--- a/linkpair/collect/agent/libvirt_agent.py
+++ b/linkpair/collect/agent/libvirt_agent.py
@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 #
 
-__version__ = '1.1'
-
 import re
 from xml.dom import minidom
 import libvirt
diff --git a/linkpair/collect/agent/linux_agent.py b/linkpair/collect/agent/linux_agent.py
index ba727f2..3834877 100755
--- a/linkpair/collect/agent/linux_agent.py
+++ b/linkpair/collect/agent/linux_agent.py
@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 #
 
-__version__ = '1.1'
-
 import re
 from linkpair.device import Device
 from linkpair.port import Port
diff --git a/linkpair/collect/agent/linuxbridge_agent.py b/linkpair/collect/agent/linuxbridge_agent.py
index fa0e8f8..99a0c2d 100755
--- a/linkpair/collect/agent/linuxbridge_agent.py
+++ b/linkpair/collect/agent/linuxbridge_agent.py
@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 #
 
-__version__ = '1.1'
-
 import re
 from linkpair.device import Device
 from linkpair.port import Port
diff --git a/linkpair/collect/agent/linuxvlan_agent.py b/linkpair/collect/agent/linuxvlan_agent.py
index 95613e0..2eae178 100755
--- a/linkpair/collect/agent/linuxvlan_agent.py
+++ b/linkpair/collect/agent/linuxvlan_agent.py
@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 #
 
-__version__ = '1.1'
-
 import re
 import os
 from linkpair.device import Device
diff --git a/linkpair/collect/agent/namespace_agent.py b/linkpair/collect/agent/namespace_agent.py
index f2b903d..2a9ce43 100755
--- a/linkpair/collect/agent/namespace_agent.py
+++ b/linkpair/collect/agent/namespace_agent.py
@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 #
 
-__version__ = '1.1'
-
 import re
 from linkpair.device import Device
 from linkpair.port import Port
diff --git a/linkpair/collect/agent/ovs_agent.py b/linkpair/collect/agent/ovs_agent.py
index b5a0f76..4d37321 100755
--- a/linkpair/collect/agent/ovs_agent.py
+++ b/linkpair/collect/agent/ovs_agent.py
@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 #
 
-__version__ = '1.1'
-
 import re
 from linkpair.device import Device
 from linkpair.port import Port
diff --git a/linkpair/collect/agent/sspvxlan_agent.py b/linkpair/collect/agent/sspvxlan_agent.py
index a466655..4c26496 100755
--- a/linkpair/collect/agent/sspvxlan_agent.py
+++ b/linkpair/collect/agent/sspvxlan_agent.py
@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 #
 
-__version__ = '1.1'
-
 import re
 import os
 from linkpair.device import Device
diff --git a/linkpair/collect/agent/veth_agent.py b/linkpair/collect/agent/veth_agent.py
index 73e01dd..0bf25e1 100755
--- a/linkpair/collect/agent/veth_agent.py
+++ b/linkpair/collect/agent/veth_agent.py
@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 #
 
-__version__ = '1.1'
-
 import re
 from linkpair.device import Device
 from linkpair.port import Port
diff --git a/linkpair/collect/utils.py b/linkpair/collect/utils.py
index 26d3670..8a52ebc 100755
--- a/linkpair/collect/utils.py
+++ b/linkpair/collect/utils.py
@@ -2,8 +2,6 @@
 # -*- coding: utf-8 -*-
 #
 
-__version__ = '1.1'
-
 import sys
 import os
 import re
@@ -128,7 +126,7 @@ class CollectUtils(object):
                 and linkpair.device1.label == dev2_name \
                 and linkpair.port2.label == port1_name \
                 and linkpair.port1.label == port2_name:
-                    return linkpair            
+                    return linkpair
         return self.LINKPAIR_NOT_FOUND
 
     def delete_linkpair(self, dev1_name, dev2_name, port1_name, port2_name):