SONAR: fix iface.py: Import only needed names or import the module and then use its...

Signed-off-by: Julien Fortin <jfortin@nvidia.com>

diff --git a/ifupdown2/addons/address.py b/ifupdown2/addons/address.py
index ac88a5e37a7643d6283f1fe8ec6d249bebe3f7cb..feedfb8c39668306556087b6484c97372cf6e755 100644 (file)
--- a/ifupdown2/addons/address.py
+++ b/ifupdown2/addons/address.py
@@ -15,7 +15,7 @@ try:
     from ifupdown2.lib.addon import AddonWithIpBlackList
     from ifupdown2.nlmanager.nlmanager import Link
 
-    from ifupdown2.ifupdown.iface import *
+    from ifupdown2.ifupdown.iface import ifaceType, ifaceLinkKind, ifaceLinkPrivFlags, ifaceStatus, iface
     from ifupdown2.ifupdown.utils import utils
 
     from ifupdown2.ifupdownaddons.dhclient import dhclient
@@ -31,7 +31,7 @@ except (ImportError, ModuleNotFoundError):
     from lib.addon import AddonWithIpBlackList
     from nlmanager.nlmanager import Link
 
-    from ifupdown.iface import *
+    from ifupdown.iface import ifaceType, ifaceLinkKind, ifaceLinkPrivFlags, ifaceStatus, iface
     from ifupdown.utils import utils
 
     from ifupdownaddons.dhclient import dhclient

diff --git a/ifupdown2/addons/addressvirtual.py b/ifupdown2/addons/addressvirtual.py
index 3f7394d904df1671e7294660ca7d5d17e3b9a49f..de2855571391e03536d44e798e274d48dd782dde 100644 (file)
--- a/ifupdown2/addons/addressvirtual.py
+++ b/ifupdown2/addons/addressvirtual.py
@@ -13,7 +13,7 @@ from collections import deque
 
 try:
     from ifupdown2.lib.addon import AddonWithIpBlackList
-    from ifupdown2.ifupdown.iface import *
+    from ifupdown2.ifupdown.iface import ifaceType, ifaceLinkKind, ifaceLinkPrivFlags, ifaceStatus
     from ifupdown2.ifupdown.utils import utils
 
     from ifupdown2.nlmanager.nlpacket import Link
@@ -28,7 +28,7 @@ try:
     import ifupdown2.ifupdown.ifupdownconfig as ifupdownconfig
 except (ImportError, ModuleNotFoundError):
     from lib.addon import AddonWithIpBlackList
-    from ifupdown.iface import *
+    from ifupdown.iface import ifaceType, ifaceLinkKind, ifaceLinkPrivFlags, ifaceStatus
     from ifupdown.utils import utils
 
     from nlmanager.nlpacket import Link

diff --git a/ifupdown2/addons/bond.py b/ifupdown2/addons/bond.py
index ce9b01a064f8a94780763e33b80c1beaf6c2e7ce..50ca9281f8b6a640edc088ba51b46b719893da36 100644 (file)
--- a/ifupdown2/addons/bond.py
+++ b/ifupdown2/addons/bond.py
@@ -7,13 +7,14 @@
 #
 
 import os
+from collections import OrderedDict
 
 try:
     from ifupdown2.nlmanager.ipnetwork import IPv4Address
     from ifupdown2.lib.addon import Addon
     from ifupdown2.nlmanager.nlmanager import Link
 
-    from ifupdown2.ifupdown.iface import *
+    from ifupdown2.ifupdown.iface import ifaceRole, ifaceLinkKind, ifaceLinkPrivFlags, ifaceLinkType, ifaceDependencyType, ifaceStatus
     from ifupdown2.ifupdown.utils import utils
     from ifupdown2.ifupdown.statemanager import statemanager_api as statemanager
 
@@ -26,7 +27,7 @@ except (ImportError, ModuleNotFoundError):
     from lib.addon import Addon
     from nlmanager.nlmanager import Link
 
-    from ifupdown.iface import *
+    from ifupdown.iface import ifaceRole, ifaceLinkKind, ifaceLinkPrivFlags, ifaceLinkType, ifaceDependencyType, ifaceStatus
     from ifupdown.utils import utils
     from ifupdown.statemanager import statemanager_api as statemanager
 

diff --git a/ifupdown2/addons/bridge.py b/ifupdown2/addons/bridge.py
index 753638edd829b1d9e75dc3eeef19062cf7776517..3ce4142b7da647d1e5c32255f1c0029a8af11fa2 100644 (file)
--- a/ifupdown2/addons/bridge.py
+++ b/ifupdown2/addons/bridge.py
@@ -19,7 +19,7 @@ try:
 
     from ifupdown2.nlmanager.nlmanager import Link
 
-    from ifupdown2.ifupdown.iface import *
+    from ifupdown2.ifupdown.iface import ifaceRole, ifaceLinkKind, ifaceLinkPrivFlags, ifaceLinkType, ifaceDependencyType, ifaceStatus, iface
     from ifupdown2.ifupdown.utils import utils
 
     from ifupdown2.ifupdownaddons.cache import *
@@ -33,7 +33,7 @@ except (ImportError, ModuleNotFoundError):
 
     from nlmanager.nlmanager import Link
 
-    from ifupdown.iface import *
+    from ifupdown.iface import ifaceRole, ifaceLinkKind, ifaceLinkPrivFlags, ifaceLinkType, ifaceDependencyType, ifaceStatus, iface
     from ifupdown.utils import utils
 
     from ifupdownaddons.cache import *

diff --git a/ifupdown2/addons/bridgevlan.py b/ifupdown2/addons/bridgevlan.py
index d844de4f2aa6365da4dd7027c569c4fe3407903b..6b75dc383103d48bde24b4c7bcc16cae4745e62b 100644 (file)
--- a/ifupdown2/addons/bridgevlan.py
+++ b/ifupdown2/addons/bridgevlan.py
@@ -7,7 +7,7 @@
 try:
     from ifupdown2.lib.addon import Addon
 
-    from ifupdown2.ifupdown.iface import *
+    from ifupdown2.ifupdown.iface import ifaceType, ifaceLinkKind, ifaceStatus
 
     from ifupdown2.ifupdownaddons.modulebase import moduleBase
 
@@ -15,7 +15,7 @@ try:
 except (ImportError, ModuleNotFoundError):
     from lib.addon import Addon
 
-    from ifupdown.iface import *
+    from ifupdown.iface import ifaceType, ifaceLinkKind, ifaceStatus
 
     from ifupdownaddons.modulebase import moduleBase
 

diff --git a/ifupdown2/addons/dhcp.py b/ifupdown2/addons/dhcp.py
index 4d1da1a483d988dc8c1943de7a32db121f34f900..a5bf860551607b38bf59eac5c382debb66024af3 100644 (file)
--- a/ifupdown2/addons/dhcp.py
+++ b/ifupdown2/addons/dhcp.py
@@ -7,6 +7,7 @@
 import re
 import time
 import socket
+import logging
 
 try:
     from ifupdown2.lib.addon import Addon
@@ -15,7 +16,7 @@ try:
     import ifupdown2.ifupdown.policymanager as policymanager
     import ifupdown2.ifupdown.ifupdownflags as ifupdownflags
 
-    from ifupdown2.ifupdown.iface import *
+    from ifupdown2.ifupdown.iface import ifaceLinkPrivFlags, ifaceStatus
     from ifupdown2.ifupdown.utils import utils
 
     from ifupdown2.ifupdownaddons.dhclient import dhclient
@@ -27,7 +28,7 @@ except (ImportError, ModuleNotFoundError):
     import ifupdown.policymanager as policymanager
     import ifupdown.ifupdownflags as ifupdownflags
 
-    from ifupdown.iface import *
+    from ifupdown.iface import ifaceLinkPrivFlags, ifaceStatus
     from ifupdown.utils import utils
 
     from ifupdownaddons.dhclient import dhclient

diff --git a/ifupdown2/addons/ethtool.py b/ifupdown2/addons/ethtool.py
index 34369d94544da5703534a47ac7d518d25126e93b..2134329c91a07c08d0e58bda52878335342b1539 100644 (file)
--- a/ifupdown2/addons/ethtool.py
+++ b/ifupdown2/addons/ethtool.py
@@ -13,7 +13,7 @@ try:
     import ifupdown2.ifupdown.policymanager as policymanager
     import ifupdown2.ifupdown.statemanager as statemanager
 
-    from ifupdown2.ifupdown.iface import *
+    from ifupdown2.ifupdown.iface import ifaceLinkPrivFlags
     from ifupdown2.ifupdown.utils import utils
     from ifupdown2.ifupdown.exceptions import moduleNotSupported
 
@@ -26,7 +26,7 @@ except (ImportError, ModuleNotFoundError):
     import ifupdown.policymanager as policymanager
     import ifupdown.statemanager as statemanager
 
-    from ifupdown.iface import *
+    from ifupdown.iface import ifaceLinkPrivFlags
     from ifupdown.utils import utils
     from ifupdown.exceptions import moduleNotSupported
 

diff --git a/ifupdown2/addons/link.py b/ifupdown2/addons/link.py
index 74a4ef025d9686fda9bbfdb1ebe32fe55411d8ed..da2a3cc0a560fb4ddd747fc96fab82932b75ef75 100644 (file)
--- a/ifupdown2/addons/link.py
+++ b/ifupdown2/addons/link.py
@@ -11,7 +11,7 @@
 
 try:
     from ifupdown2.lib.addon import Addon
-    from ifupdown2.ifupdown.iface import *
+    from ifupdown2.ifupdown.iface import ifaceLinkKind, ifaceLinkPrivFlags, ifaceStatus
     from ifupdown2.ifupdown.utils import utils
 
     from ifupdown2.ifupdownaddons.modulebase import moduleBase
@@ -20,7 +20,7 @@ try:
     import ifupdown2.ifupdown.policymanager as policymanager
 except (ImportError, ModuleNotFoundError):
     from lib.addon import Addon
-    from ifupdown.iface import *
+    from ifupdown.iface import ifaceLinkKind, ifaceLinkPrivFlags, ifaceStatus
     from ifupdown.utils import utils
 
     from ifupdownaddons.modulebase import moduleBase

diff --git a/ifupdown2/addons/mstpctl.py b/ifupdown2/addons/mstpctl.py
index 82430a5b3f29ba09af6557375efa902acba3221b..1853a4bcb7ac8131584adc4d260302ec847c2e44 100644 (file)
--- a/ifupdown2/addons/mstpctl.py
+++ b/ifupdown2/addons/mstpctl.py
@@ -6,10 +6,12 @@
 
 import os
 
+from collections import OrderedDict
+
 try:
     from ifupdown2.lib.addon import Addon
 
-    from ifupdown2.ifupdown.iface import *
+    from ifupdown2.ifupdown.iface import ifaceType, ifaceLinkKind, ifaceLinkPrivFlags, ifaceStatus
     from ifupdown2.ifupdown.utils import utils
 
     import ifupdown2.ifupdown.ifupdownflags as ifupdownflags
@@ -22,7 +24,7 @@ try:
 except (ImportError, ModuleNotFoundError):
     from lib.addon import Addon
 
-    from ifupdown.iface import *
+    from ifupdown.iface import ifaceType, ifaceLinkKind, ifaceLinkPrivFlags, ifaceStatus
     from ifupdown.utils import utils
 
     import ifupdown.ifupdownflags as ifupdownflags

diff --git a/ifupdown2/addons/vlan.py b/ifupdown2/addons/vlan.py
index 06e87bbed0a763c75985018e0e85e11b9d9cdce7..4380dd8a27cec0b94f7d1dcd5e63f65c8d40214b 100644 (file)
--- a/ifupdown2/addons/vlan.py
+++ b/ifupdown2/addons/vlan.py
@@ -6,7 +6,7 @@
 
 try:
     from ifupdown2.lib.addon import Addon
-    from ifupdown2.ifupdown.iface import *
+    from ifupdown2.ifupdown.iface import ifaceType, ifaceLinkKind, ifaceStatus
     from ifupdown2.nlmanager.nlmanager import Link
     from ifupdown2.ifupdownaddons.modulebase import moduleBase
     from ifupdown2.ifupdown.utils import utils
@@ -15,7 +15,7 @@ try:
     import ifupdown2.ifupdown.policymanager as policymanager
 except (ImportError, ModuleNotFoundError):
     from lib.addon import Addon
-    from ifupdown.iface import *
+    from ifupdown.iface import ifaceType, ifaceLinkKind, ifaceStatus
     from nlmanager.nlmanager import Link
     from ifupdownaddons.modulebase import moduleBase
     from ifupdown.utils import utils

diff --git a/ifupdown2/addons/vrf.py b/ifupdown2/addons/vrf.py
index 637281f6286ba01272ec4c4efdfbd5ca8a38d40d..f0ee503429a5c89964ff9d5074f5ecc44a13bbc1 100644 (file)
--- a/ifupdown2/addons/vrf.py
+++ b/ifupdown2/addons/vrf.py
@@ -17,7 +17,7 @@ try:
     import ifupdown2.ifupdown.ifupdownflags as ifupdownflags
     from ifupdown2.ifupdown.statemanager import statemanager_api as statemanager
 
-    from ifupdown2.ifupdown.iface import *
+    from ifupdown2.ifupdown.iface import ifaceRole, ifaceLinkKind, ifaceLinkPrivFlags, ifaceLinkType
     from ifupdown2.ifupdown.utils import utils
 
     from ifupdown2.nlmanager.nlmanager import Link
@@ -32,7 +32,7 @@ except (ImportError, ModuleNotFoundError):
     import ifupdown.ifupdownflags as ifupdownflags
     from ifupdown.statemanager import statemanager_api as statemanager
 
-    from ifupdown.iface import *
+    from ifupdown.iface import ifaceRole, ifaceLinkKind, ifaceLinkPrivFlags, ifaceLinkType
     from ifupdown.utils import utils
 
     from nlmanager.nlmanager import Link

diff --git a/ifupdown2/addons/vxlan.py b/ifupdown2/addons/vxlan.py
index 11cc75edeadd7b6f8447b0722f97e99cf393549e..54738ef59146da626560c05fd71215caf01827e3 100644 (file)
--- a/ifupdown2/addons/vxlan.py
+++ b/ifupdown2/addons/vxlan.py
@@ -15,7 +15,7 @@ try:
 
     from ifupdown2.nlmanager.nlmanager import Link
 
-    from ifupdown2.ifupdown.iface import *
+    from ifupdown2.ifupdown.iface import ifaceLinkKind, ifaceLinkPrivFlags, ifaceStatus, iface
     from ifupdown2.ifupdown.utils import utils
     from ifupdown2.ifupdown.statemanager import statemanager_api as statemanager
     from ifupdown2.ifupdownaddons.cache import *
@@ -31,7 +31,7 @@ except (ImportError, ModuleNotFoundError):
 
     from nlmanager.nlmanager import Link
 
-    from ifupdown.iface import *
+    from ifupdown.iface import ifaceLinkKind, ifaceLinkPrivFlags, ifaceStatus, iface
     from ifupdown.utils import utils
     from ifupdown.statemanager import statemanager_api as statemanager
 

diff --git a/ifupdown2/ifupdown/ifupdownmain.py b/ifupdown2/ifupdown/ifupdownmain.py
index 9b787ed3a009f87f0e7133f86035d9c0b16824d2..a0b19fa59f9fb6e4e18c91d707bae1a9eab90d19 100644 (file)
--- a/ifupdown2/ifupdown/ifupdownmain.py
+++ b/ifupdown2/ifupdown/ifupdownmain.py
@@ -29,7 +29,7 @@ try:
     import ifupdown2.ifupdown.ifupdownconfig as ifupdownConfig
 
     from ifupdown2.ifupdown.graph import *
-    from ifupdown2.ifupdown.iface import *
+    from ifupdown2.ifupdown.iface import ifaceStatusUserStrs, ifaceType, ifaceRole, ifaceLinkKind, ifaceLinkPrivFlags, ifaceLinkType, ifaceDependencyType, ifaceStatus, iface
     from ifupdown2.ifupdown.scheduler import *
     from ifupdown2.ifupdown.exceptions import *
     from ifupdown2.ifupdown.networkinterfaces import *
@@ -48,7 +48,7 @@ except (ImportError, ModuleNotFoundError):
     import ifupdown.ifupdownconfig as ifupdownConfig
 
     from ifupdown.graph import *
-    from ifupdown.iface import *
+    from ifupdown.iface import ifaceStatusUserStrs, ifaceType, ifaceRole, ifaceLinkKind, ifaceLinkPrivFlags, ifaceLinkType, ifaceDependencyType, ifaceStatus, iface
     from ifupdown.scheduler import *
     from ifupdown.exceptions import *
     from ifupdown.networkinterfaces import *

diff --git a/ifupdown2/ifupdown/networkinterfaces.py b/ifupdown2/ifupdown/networkinterfaces.py
index c49e68bda90b9927b4922783c33e027f3a8f1113..ea38a3b2e985aa3837627a36b6713e570eeff076 100644 (file)
--- a/ifupdown2/ifupdown/networkinterfaces.py
+++ b/ifupdown2/ifupdown/networkinterfaces.py
@@ -15,11 +15,11 @@ import os
 import re
 
 try:
-    from ifupdown2.ifupdown.iface import *
+    from ifupdown2.ifupdown.iface import ifaceType, ifaceJsonDecoder, iface
     from ifupdown2.ifupdown.utils import utils
     from ifupdown2.ifupdown.template import templateEngine
 except (ImportError, ModuleNotFoundError):
-    from ifupdown.iface import *
+    from ifupdown.iface import ifaceType, ifaceJsonDecoder, iface
     from ifupdown.utils import utils
     from ifupdown.template import templateEngine
 

diff --git a/ifupdown2/ifupdown/scheduler.py b/ifupdown2/ifupdown/scheduler.py
index 8b3c087b22e70c54f6e486d0120bd5d143e4ee94..154e557e3d50fe2ad9de31a13af9f0f1f2eaf1d4 100644 (file)
--- a/ifupdown2/ifupdown/scheduler.py
+++ b/ifupdown2/ifupdown/scheduler.py
@@ -10,9 +10,12 @@
 import os
 import sys
 
+from collections import OrderedDict
+
+
 try:
     from ifupdown2.ifupdown.graph import *
-    from ifupdown2.ifupdown.iface import *
+    from ifupdown2.ifupdown.iface import ifaceType, ifaceLinkKind, ifaceStatus, ifaceState
     from ifupdown2.ifupdown.utils import utils
     from ifupdown2.ifupdown.statemanager import *
 
@@ -20,7 +23,7 @@ try:
     import ifupdown2.ifupdown.ifupdownflags as ifupdownflags
 except (ImportError, ModuleNotFoundError):
     from ifupdown.graph import *
-    from ifupdown.iface import *
+    from ifupdown.iface import ifaceType, ifaceLinkKind, ifaceStatus, ifaceState
     from ifupdown.utils import utils
     from ifupdown.statemanager import *
 

diff --git a/ifupdown2/ifupdown/utils.py b/ifupdown2/ifupdown/utils.py
index a474ed831c83d7872160a917774d55db8836dcfe..05c7e48e49eac6aa7e90583737b37ac687680589 100644 (file)
--- a/ifupdown2/ifupdown/utils.py
+++ b/ifupdown2/ifupdown/utils.py
@@ -20,12 +20,12 @@ from functools import partial
 from ipaddress import IPv4Address
 
 try:
-    from ifupdown2.ifupdown.iface import *
+    from ifupdown2.ifupdown.iface import ifaceRole, ifaceLinkKind, ifaceLinkPrivFlags
 
     import ifupdown2.ifupdown.policymanager as policymanager
     import ifupdown2.ifupdown.ifupdownflags as ifupdownflags
 except (ImportError, ModuleNotFoundError):
-    from ifupdown.iface import *
+    from ifupdown.iface import ifaceRole, ifaceLinkKind, ifaceLinkPrivFlags
 
     import ifupdown.policymanager as policymanager
     import ifupdown.ifupdownflags as ifupdownflags

diff --git a/ifupdown2/ifupdownaddons/modulebase.py b/ifupdown2/ifupdownaddons/modulebase.py
index 5f1ecfc20bb2d6aad8a8aca3326129a6ca7511d8..2ec8b7e07040fbe77baa44bee59ce87854943946 100644 (file)
--- a/ifupdown2/ifupdownaddons/modulebase.py
+++ b/ifupdown2/ifupdownaddons/modulebase.py
@@ -11,14 +11,14 @@ import traceback
 from functools import reduce
 
 try:
-    from ifupdown2.ifupdown.iface import *
+    from ifupdown2.ifupdown.iface import ifaceStatus
     from ifupdown2.ifupdown.utils import utils
 
     import ifupdown2.ifupdown.exceptions as exceptions
     import ifupdown2.ifupdown.policymanager as policymanager
     import ifupdown2.ifupdown.ifupdownflags as ifupdownflags
 except (ImportError, ModuleNotFoundError):
-    from ifupdown.iface import *
+    from ifupdown.iface import ifaceStatus
     from ifupdown.utils import utils
 
     import ifupdown.exceptions as exceptions