Antoni Segura Puimedon has uploaded a new change for review.
Change subject: Networking import reordering
......................................................................
Networking import reordering
Apply new ordering for vdsm imports (starting with just networking
code.
The imports will be split into sections:
- __future__
- stdlib
- site-packages
- vdsm package
- relative imports
This, together with absolute imports, will make it very easy and fast
to see what resources the current module makes use of and where those
resources come from.
this:
import glob
import libvirt
import logging
import os
import pipes
import pwd
import re
import selinux
import shutil
import threading
from . import Configurator
from ..neterrors import ConfigNetworkError
from ..netmodels import Nic, Bridge, IpConfig
from ..sourceRoute import DynamicSourceRoute
from vdsm.config import config
from vdsm import constants
from vdsm import netinfo
from vdsm import utils
from vdsm.netconfpersistence import RunningConfig
from .. import dsaversion
from . import libvirtCfg
from .. import neterrors as ne
becomes this: (annotations for explanation purposes, not in actual
code)
# stdlib
import glob
import logging
import os
import pipes
import pwd
import re
import shutil
import threading
# site-packages
import libvirt
import selinux
# vdsm package
from vdsm.config import config
from vdsm import constants
from vdsm import netinfo
from vdsm import utils
from vdsm.netconfpersistence import RunningConfig
# relative imports
from . import Configurator
from . import libvirtCfg
from .. import dsaversion
from .. import neterrors as ne
from ..neterrors import ConfigNetworkError
from ..netmodels import Nic, Bridge, IpConfig
from ..sourceRoute import DynamicSourceRoute
Change-Id: I1ea96f97bf89b10a0cd6e629210374d2cd211fe7
Signed-off-by: Antoni S. Puimedon <[email protected]>
---
M lib/vdsm/netconfpersistence.py
M lib/vdsm/netinfo.py
M vdsm/configNetwork.py
M vdsm/netconf/__init__.py
M vdsm/netconf/ifcfg.py
M vdsm/netconf/libvirtCfg.py
M vdsm/netmodels.py
M vdsm/sourceRouteThread.py
M vdsm/tc.py
M vdsm/vdsm-restore-net-config
10 files changed, 39 insertions(+), 32 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/62/20662/1
diff --git a/lib/vdsm/netconfpersistence.py b/lib/vdsm/netconfpersistence.py
index 2a72a04..9cfea52 100644
--- a/lib/vdsm/netconfpersistence.py
+++ b/lib/vdsm/netconfpersistence.py
@@ -24,11 +24,10 @@
import logging
import os
-from .config import config
-from .tool.restore_nets import restore
from . import constants
from . import utils
-
+from .config import config
+from .tool.restore_nets import restore
CONF_RUN_DIR = constants.P_VDSM_RUN + 'netconf/'
# The persistent path is inside of an extra "persistence" dir in order to get
diff --git a/lib/vdsm/netinfo.py b/lib/vdsm/netinfo.py
index 7e0a07a..0f6b2ef 100644
--- a/lib/vdsm/netinfo.py
+++ b/lib/vdsm/netinfo.py
@@ -20,25 +20,25 @@
from __future__ import absolute_import
from collections import namedtuple
-import errno
from fnmatch import fnmatch
from glob import iglob
from itertools import chain
+from xml.dom import minidom
+import errno
import logging
import os
import shlex
import socket
import struct
-from xml.dom import minidom
import ethtool
-from .config import config
from . import constants
+from . import libvirtconnection
+from .config import config
+from .ipwrapper import linkShowDev
from .ipwrapper import Route
from .ipwrapper import routeShowAllDefaultGateways
-from . import libvirtconnection
-from .ipwrapper import linkShowDev
NET_CONF_DIR = '/etc/sysconfig/network-scripts/'
# ifcfg persistence directories
diff --git a/vdsm/configNetwork.py b/vdsm/configNetwork.py
index d5ea840..e9059e7 100755
--- a/vdsm/configNetwork.py
+++ b/vdsm/configNetwork.py
@@ -20,29 +20,30 @@
from functools import wraps
import inspect
-import sys
-import os
-import traceback
-import time
import logging
+import os
+import sys
+import time
+import traceback
from vdsm.config import config
from vdsm import constants
+from vdsm import netinfo
from vdsm import utils
from vdsm.utils import execCmd
+
+from . import hooks
from . import neterrors as ne
-from .neterrors import ConfigNetworkError
-from vdsm import netinfo
from .netconf.ifcfg import ConfigWriter
from .netconf.ifcfg import Ifcfg
+from .neterrors import ConfigNetworkError
from .netmodels import Bond
from .netmodels import Bridge
+from .netmodels import IpConfig
from .netmodels import IPv4
from .netmodels import IPv6
-from .netmodels import IpConfig
from .netmodels import Nic
from .netmodels import Vlan
-from . import hooks
CONNECTIVITY_TIMEOUT_DEFAULT = 4
diff --git a/vdsm/netconf/__init__.py b/vdsm/netconf/__init__.py
index 0ce6364..1e20706 100644
--- a/vdsm/netconf/__init__.py
+++ b/vdsm/netconf/__init__.py
@@ -20,12 +20,13 @@
import logging
+from vdsm.config import config
+from vdsm import netinfo
+from vdsm.netconfpersistence import RunningConfig
+
from ..netmodels import Bond, Bridge
from ..sourceRoute import DynamicSourceRoute
from ..sourceRoute import StaticSourceRoute
-from vdsm import netinfo
-from vdsm.config import config
-from vdsm.netconfpersistence import RunningConfig
class Configurator(object):
diff --git a/vdsm/netconf/ifcfg.py b/vdsm/netconf/ifcfg.py
index 3f2e092..bc09de8 100644
--- a/vdsm/netconf/ifcfg.py
+++ b/vdsm/netconf/ifcfg.py
@@ -19,28 +19,30 @@
from __future__ import absolute_import
import glob
-import libvirt
import logging
import os
import pipes
import pwd
import re
-import selinux
import shutil
import threading
-from . import Configurator
-from ..neterrors import ConfigNetworkError
-from ..netmodels import Nic, Bridge, IpConfig
-from ..sourceRoute import DynamicSourceRoute
+import libvirt
+import selinux
+
from vdsm.config import config
from vdsm import constants
from vdsm import netinfo
from vdsm import utils
from vdsm.netconfpersistence import RunningConfig
-from .. import dsaversion
+
+from . import Configurator
from . import libvirtCfg
+from .. import dsaversion
from .. import neterrors as ne
+from ..neterrors import ConfigNetworkError
+from ..netmodels import Nic, Bridge, IpConfig
+from ..sourceRoute import DynamicSourceRoute
class Ifcfg(Configurator):
diff --git a/vdsm/netconf/libvirtCfg.py b/vdsm/netconf/libvirtCfg.py
index b81231d..74d9b65 100644
--- a/vdsm/netconf/libvirtCfg.py
+++ b/vdsm/netconf/libvirtCfg.py
@@ -16,10 +16,11 @@
#
# Refer to the README and COPYING files for full details of the license
#
-import libvirt
from xml.dom.minidom import Document
from xml.sax.saxutils import escape
+import libvirt
+
from vdsm import libvirtconnection
from vdsm import netinfo
diff --git a/vdsm/netmodels.py b/vdsm/netmodels.py
index c0347ab..5ea5052 100644
--- a/vdsm/netmodels.py
+++ b/vdsm/netmodels.py
@@ -26,9 +26,10 @@
import socket
import struct
-from .neterrors import ConfigNetworkError
from vdsm import netinfo
+
from . import neterrors as ne
+from .neterrors import ConfigNetworkError
class NetDevice(object):
diff --git a/vdsm/sourceRouteThread.py b/vdsm/sourceRouteThread.py
index c1da9a5..5b686a1 100644
--- a/vdsm/sourceRouteThread.py
+++ b/vdsm/sourceRouteThread.py
@@ -5,9 +5,10 @@
import pyinotify
+from vdsm.constants import P_VDSM_RUN
+
from .netconf.iproute2 import Iproute2
from .sourceRoute import DynamicSourceRoute
-from vdsm.constants import P_VDSM_RUN
SOURCE_ROUTES_FOLDER = P_VDSM_RUN + 'sourceRoutes'
diff --git a/vdsm/tc.py b/vdsm/tc.py
index b47342e..f457176 100644
--- a/vdsm/tc.py
+++ b/vdsm/tc.py
@@ -1,5 +1,5 @@
#
-# Copyright 2012 Red Hat, Inc.
+# Copyright 2012-2013 Red Hat, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -26,8 +26,8 @@
import ethtool
-from vdsm.utils import execCmd
from vdsm.constants import EXT_TC
+from vdsm.utils import execCmd
ERR_DEV_NOEXIST = 2
diff --git a/vdsm/vdsm-restore-net-config b/vdsm/vdsm-restore-net-config
index 2a23ebc..4fff50f 100755
--- a/vdsm/vdsm-restore-net-config
+++ b/vdsm/vdsm-restore-net-config
@@ -23,10 +23,11 @@
import logging
import logging.config
-from .netconf import ifcfg
from vdsm.config import config
from vdsm.netconfpersistence import RunningConfig, PersistentConfig
+
from .configNetwork import setupNetworks
+from .netconf import ifcfg
def ifcfg_restoration():
--
To view, visit http://gerrit.ovirt.org/20662
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1ea96f97bf89b10a0cd6e629210374d2cd211fe7
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Antoni Segura Puimedon <[email protected]>
_______________________________________________
vdsm-patches mailing list
[email protected]
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
