Change in vdsm[master]: net: models: move models to configurators folder

phoracek at redhat.com phoracek at redhat.com
Fri Feb 26 15:58:34 UTC 2016


Petr Horáček has uploaded a new change for review.

Change subject: net: models: move models to configurators folder
......................................................................

net: models: move models to configurators folder

models.py are used only by configurators and linux networking code
which will be moved to configurators/ as well.

Change-Id: I59f9b829e393fbac4bea3e72ed5b5bd6196968fd
Signed-off-by: Petr Horáček <phoracek at redhat.com>
---
M debian/vdsm.install
M lib/vdsm/network/Makefile.am
M lib/vdsm/network/api.py
M lib/vdsm/network/configurators/Makefile.am
M lib/vdsm/network/configurators/__init__.py
M lib/vdsm/network/configurators/ifcfg.py
M lib/vdsm/network/configurators/iproute2.py
R lib/vdsm/network/configurators/models.py
M tests/network/config_network_test.py
M tests/network/models_test.py
M vdsm.spec.in
M vdsm_hooks/ovs/ovs_before_network_setup_ip.py
12 files changed, 16 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/87/54087/1

diff --git a/debian/vdsm.install b/debian/vdsm.install
index ec6fc06..8b33bde 100644
--- a/debian/vdsm.install
+++ b/debian/vdsm.install
@@ -56,13 +56,13 @@
 ./usr/share/vdsm/network/api.py
 ./usr/share/vdsm/network/errors.py
 ./usr/share/vdsm/network/canonize.py
-./usr/share/vdsm/network/models.py
 ./usr/share/vdsm/network/sourceroute.py
 ./usr/share/vdsm/network/sourceroutethread.py
 ./usr/share/vdsm/network/configurators/__init__.py
 ./usr/share/vdsm/network/configurators/ifcfg.py
 ./usr/share/vdsm/network/configurators/iproute2.py
 ./usr/share/vdsm/network/configurators/libvirt.py
+./usr/share/vdsm/network/configurators/models.py
 ./usr/share/vdsm/network/configurators/pyroute_two.py
 ./usr/share/vdsm/network/configurators/qos.py
 ./usr/share/vdsm/network/tc/__init__.py
diff --git a/lib/vdsm/network/Makefile.am b/lib/vdsm/network/Makefile.am
index ac54547..b4ebe6b 100644
--- a/lib/vdsm/network/Makefile.am
+++ b/lib/vdsm/network/Makefile.am
@@ -27,8 +27,7 @@
 	api.py \
 	errors.py \
 	canonize.py \
-	models.py \
 	sourceroute.py \
 	sourceroutethread.py \
 	utils.py \
-	$(NULL)
\ No newline at end of file
+	$(NULL)
diff --git a/lib/vdsm/network/api.py b/lib/vdsm/network/api.py
index 6b4e43d..8091154 100644
--- a/lib/vdsm/network/api.py
+++ b/lib/vdsm/network/api.py
@@ -43,10 +43,10 @@
 
 from . canonize import canonize_networks
 from .configurators import dhclient, libvirt
+from .configurators.models import Bond, Bridge, IPv4, IPv6, Nic, Vlan
+from .configurators.models import hierarchy_backing_device
 from .errors import ConfigNetworkError
 from . import errors as ne
-from .models import Bond, Bridge, IPv4, IPv6, Nic, Vlan
-from .models import hierarchy_backing_device
 
 CONNECTIVITY_TIMEOUT_DEFAULT = 4
 _SYSFS_SRIOV_NUMVFS = '/sys/bus/pci/devices/{}/sriov_numvfs'
diff --git a/lib/vdsm/network/configurators/Makefile.am b/lib/vdsm/network/configurators/Makefile.am
index f78d5f7..0e96336 100644
--- a/lib/vdsm/network/configurators/Makefile.am
+++ b/lib/vdsm/network/configurators/Makefile.am
@@ -27,6 +27,7 @@
 	ifcfg.py \
 	iproute2.py \
 	libvirt.py \
+	models.py \
 	pyroute_two.py \
 	qos.py \
 	$(NULL)
diff --git a/lib/vdsm/network/configurators/__init__.py b/lib/vdsm/network/configurators/__init__.py
index 69e97e7..7266056 100644
--- a/lib/vdsm/network/configurators/__init__.py
+++ b/lib/vdsm/network/configurators/__init__.py
@@ -30,7 +30,7 @@
 from .dhclient import DhcpClient
 from ..errors import ConfigNetworkError, ERR_FAILED_IFUP
 from . import qos
-from ..models import Bond, Bridge, hierarchy_vlan_tag, hierarchy_backing_device
+from .models import Bond, Bridge, hierarchy_vlan_tag, hierarchy_backing_device
 from ..sourceroute import StaticSourceRoute
 
 
diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py
index 395dd31..87aed50 100644
--- a/lib/vdsm/network/configurators/ifcfg.py
+++ b/lib/vdsm/network/configurators/ifcfg.py
@@ -54,7 +54,7 @@
 
 from . import Configurator, dhclient, getEthtoolOpts, libvirt, wait_for_device
 from ..errors import ConfigNetworkError, ERR_FAILED_IFUP
-from ..models import Nic, Bridge, IPv4, IPv6
+from .models import Nic, Bridge, IPv4, IPv6
 from ..sourceroute import StaticSourceRoute, DynamicSourceRoute
 from ..utils import remove_custom_bond_option
 
diff --git a/lib/vdsm/network/configurators/iproute2.py b/lib/vdsm/network/configurators/iproute2.py
index dbe5a23..80f161b 100644
--- a/lib/vdsm/network/configurators/iproute2.py
+++ b/lib/vdsm/network/configurators/iproute2.py
@@ -34,7 +34,7 @@
                wait_for_device)
 from .dhclient import DhcpClient
 from ..errors import ConfigNetworkError, ERR_FAILED_IFUP, ERR_FAILED_IFDOWN
-from ..models import Nic
+from .models import Nic
 from ..sourceroute import DynamicSourceRoute
 from ..utils import remove_custom_bond_option
 
diff --git a/lib/vdsm/network/models.py b/lib/vdsm/network/configurators/models.py
similarity index 100%
rename from lib/vdsm/network/models.py
rename to lib/vdsm/network/configurators/models.py
diff --git a/tests/network/config_network_test.py b/tests/network/config_network_test.py
index 0ad27a7..0594902 100644
--- a/tests/network/config_network_test.py
+++ b/tests/network/config_network_test.py
@@ -32,8 +32,8 @@
 from vdsm.network import api
 from vdsm.network import errors
 from vdsm.network.configurators import ifcfg
+from vdsm.network.configurators.models import Bond, Bridge, Nic, Vlan
 from vdsm.network.canonize import canonize_networks
-from vdsm.network.models import Bond, Bridge, Nic, Vlan
 
 
 def _fakeNetworks():
diff --git a/tests/network/models_test.py b/tests/network/models_test.py
index d586077..fdd299d 100644
--- a/tests/network/models_test.py
+++ b/tests/network/models_test.py
@@ -25,9 +25,11 @@
 from vdsm.netinfo import bonding, mtus
 from vdsm.netinfo.cache import CachingNetInfo
 from vdsm.network import errors
-from vdsm.network.models import Bond, Bridge, IPv4, IPv6, Nic, Vlan
-from vdsm.network.models import hierarchy_backing_device, hierarchy_vlan_tag
-from vdsm.network.models import _nicSort
+from vdsm.network.configurators.models import (Bond, Bridge, IPv4, IPv6, Nic,
+                                               Vlan)
+from vdsm.network.configurators.models import (hierarchy_backing_device,
+                                               hierarchy_vlan_tag)
+from vdsm.network.configurators.models import _nicSort
 
 from testlib import VdsmTestCase as TestCaseBase
 
diff --git a/vdsm.spec.in b/vdsm.spec.in
index d626a25..0f8b133 100644
--- a/vdsm.spec.in
+++ b/vdsm.spec.in
@@ -1129,11 +1129,11 @@
 %{python_sitelib}/%{vdsm_name}/network/configurators/ifcfg.py*
 %{python_sitelib}/%{vdsm_name}/network/configurators/iproute2.py*
 %{python_sitelib}/%{vdsm_name}/network/configurators/libvirt.py*
+%{python_sitelib}/%{vdsm_name}/network/configurators/models.py*
 %{python_sitelib}/%{vdsm_name}/network/configurators/pyroute_two.py*
 %{python_sitelib}/%{vdsm_name}/network/configurators/qos.py*
 %{python_sitelib}/%{vdsm_name}/network/errors.py*
 %{python_sitelib}/%{vdsm_name}/network/canonize.py*
-%{python_sitelib}/%{vdsm_name}/network/models.py*
 %{python_sitelib}/%{vdsm_name}/network/sourceroute.py*
 %{python_sitelib}/%{vdsm_name}/network/sourceroutethread.py*
 %{python_sitelib}/%{vdsm_name}/network/utils.py*
diff --git a/vdsm_hooks/ovs/ovs_before_network_setup_ip.py b/vdsm_hooks/ovs/ovs_before_network_setup_ip.py
index acfc04d..daf0b55 100644
--- a/vdsm_hooks/ovs/ovs_before_network_setup_ip.py
+++ b/vdsm_hooks/ovs/ovs_before_network_setup_ip.py
@@ -25,7 +25,7 @@
 from vdsm import ipwrapper, sysctl
 from vdsm.network.configurators.dhclient import DhcpClient, kill_dhclient
 from vdsm.network.configurators.iproute2 import Iproute2
-from vdsm.network.models import NetDevice, IPv4, IPv6
+from vdsm.network.configurators.models import NetDevice, IPv4, IPv6
 from vdsm.network.sourceroute import DynamicSourceRoute
 
 from ovs_utils import suppress, BRIDGE_NAME


-- 
To view, visit https://gerrit.ovirt.org/54087
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I59f9b829e393fbac4bea3e72ed5b5bd6196968fd
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček <phoracek at redhat.com>


More information about the vdsm-patches mailing list