[PATCH v2] nics/net_device: fix pylama errors

[Juraj Linkeš <juraj.linkes@pantheon.tech>]

Pylama found the following errors:
nics/net_device.py:104: [E] E0213 Method should have "self" as first argument [pylint]
nics/net_device.py:114: [E] E1102 func is not callable [pylint]
- moved the decorator outside class definition, which is the standard
way to define decorators
nics/net_device.py:206: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint]
nics/net_device.py:297: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint]
nics/net_device.py:309: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint]
nics/net_device.py:321: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint]
nics/net_device.py:401: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint]
nics/net_device.py:441: [E] E0602 Undefined variable 'bus_id' [pylint]
nics/net_device.py:461: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint]
nics/net_device.py:490: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint]
nics/net_device.py:516: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint]
nics/net_device.py:519: [E] E0102 method already defined line 510 [pylint]
nics/net_device.py:525: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint]
nics/net_device.py:622: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint]
nics/net_device.py:696: [E] E1101 Instance of 'NetDevice' has no 'current_driver' member [pylint]

Signed-off-by: Juraj Linkeš <juraj.linkes@pantheon.tech>
---
Lijuan, please add additional people to review if needed.
---
 nics/net_device.py | 43 +++++++++++++++++++------------------------
 1 file changed, 19 insertions(+), 24 deletions(-)

diff --git a/nics/net_device.py b/nics/net_device.py
index 96f31327..19e239e4 100644
--- a/nics/net_device.py
+++ b/nics/net_device.py
@@ -45,6 +45,22 @@ NICS_LIST = []      # global list for save nic objects
 MIN_MTU = 68
 
 
+def nic_has_driver(func):
+    """
+    Check if the NIC has a driver.
+    """
+
+    @wraps(func)
+    def wrapper(*args, **kwargs):
+        nic_instance = args[0]
+        nic_instance.current_driver = nic_instance.get_nic_driver()
+        if not nic_instance.current_driver:
+            return ''
+        return func(*args, **kwargs)
+
+    return wrapper
+
+
 class NetDevice(object):
 
     """
@@ -73,6 +89,7 @@ class NetDevice(object):
         self.driver_version = ''
         self.firmware = ''
         self.pkg = None
+        self.current_driver = None
 
     def stop(self):
         pass
@@ -101,19 +118,6 @@ class NetDevice(object):
         """
         return True
 
-    def nic_has_driver(func):
-        """
-        Check if the NIC has a driver.
-        """
-        @wraps(func)
-        def wrapper(*args, **kwargs):
-            nic_instance = args[0]
-            nic_instance.current_driver = nic_instance.get_nic_driver()
-            if not nic_instance.current_driver:
-                return ''
-            return func(*args, **kwargs)
-        return wrapper
-
     def get_nic_driver(self):
         """
         Get the NIC driver.
@@ -273,7 +277,7 @@ class NetDevice(object):
         """
         Get the interface name by the default way on freebsd.
         """
-        pci_str = "%s:%s:%s" % (domain_id, bus_id, devfun_id) 
+        pci_str = "%s:%s:%s" % (domain_id, bus_id, devfun_id)
         out = self.__send_expect("pciconf -l", "# ")
         rexp = r"(\w*)@pci0:%s" % pci_str
         pattern = re.compile(rexp)
@@ -438,7 +442,7 @@ class NetDevice(object):
                 'get_ipv4_addr_freebsd_%s' %
                 generic_driver)
 
-        return get_ipv4_addr_freebsd(intf, bus_id, devfun_id)
+        return get_ipv4_addr_freebsd(intf)
 
     def get_ipv4_addr_freebsd_generic(self, intf):
         """
@@ -515,15 +519,6 @@ class NetDevice(object):
             self, 'get_ipv6_addr_%s' % self.__get_os_type())
         return get_ipv6_addr(self.intf_name, self.current_driver)
 
-    @nic_has_driver
-    def get_ipv6_addr(self):
-        """
-        Get ipv6 address of specified pci device.
-        """
-        get_ipv6_addr = getattr(
-            self, 'get_ipv6_addr_%s' % self.__get_os_type())
-        return get_ipv6_addr(self.intf_name, self.current_driver)
-
     def get_ipv6_addr_linux(self, intf, driver):
         """
         Get ipv6 address of specified pci device on linux.
-- 
2.20.1