Change in vdsm[master]: net: Move netlink under vdsm.network
gerrit-hooks has posted comments on this change. Change subject: net: Move netlink under vdsm.network .. Patch Set 2: * Update tracker: IGNORE, no Bug-Url found * Set MODIFIED::IGNORE, no Bug-Url found. -- To view, visit https://gerrit.ovirt.org/57170 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97559234dc5595fe90d5258c31450858560246ce Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: Move netlink under vdsm.network
Dan Kenigsberg has submitted this change and it was merged. Change subject: net: Move netlink under vdsm.network .. net: Move netlink under vdsm.network Change-Id: I97559234dc5595fe90d5258c31450858560246ce Signed-off-by: Edward HaasReviewed-on: https://gerrit.ovirt.org/57170 Continuous-Integration: Jenkins CI Reviewed-by: Dan Kenigsberg --- M configure.ac M init/wait_for_ipv4s M lib/vdsm/Makefile.am M lib/vdsm/ipwrapper.py M lib/vdsm/network/Makefile.am M lib/vdsm/network/configurators/__init__.py M lib/vdsm/network/configurators/ifcfg.py M lib/vdsm/network/netinfo/addresses.py M lib/vdsm/network/netinfo/cache.py M lib/vdsm/network/netinfo/routes.py M lib/vdsm/network/netinfo/vlans.py R lib/vdsm/network/netlink/Makefile.am R lib/vdsm/network/netlink/__init__.py R lib/vdsm/network/netlink/addr.py R lib/vdsm/network/netlink/link.py R lib/vdsm/network/netlink/monitor.py R lib/vdsm/network/netlink/route.py M tests/functional/networkTests.py M tests/network/ipwrapper_test.py M tests/network/link_test.py M tests/network/netinfo_test.py M tests/network/nettestlib.py M vdsm.spec.in 23 files changed, 33 insertions(+), 31 deletions(-) Approvals: Jenkins CI: Passed CI tests Dan Kenigsberg: Looks good to me, approved Edward Haas: Verified -- To view, visit https://gerrit.ovirt.org/57170 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I97559234dc5595fe90d5258c31450858560246ce Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward Haas Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: gerrit-hooks ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: Move netlink under vdsm.network
Dan Kenigsberg has posted comments on this change. Change subject: net: Move netlink under vdsm.network .. Patch Set 1: Code-Review+2 (1 comment) https://gerrit.ovirt.org/#/c/57170/1/lib/vdsm/ipwrapper.py File lib/vdsm/ipwrapper.py: Line 13: # You should have received a copy of the GNU General Public License Line 14: # along with this program; if not, write to the Free Software Line 15: # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA Line 16: # Line 17: # Refer to the README and COPYING files for full details of the license this file begs to be moved, too... Line 18: # Line 19: Line 20: from __future__ import absolute_import Line 21: from contextlib import closing -- To view, visit https://gerrit.ovirt.org/57170 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97559234dc5595fe90d5258c31450858560246ce Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: Yes ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: Move netlink under vdsm.network
Edward Haas has posted comments on this change. Change subject: net: Move netlink under vdsm.network .. Patch Set 1: Verified+1 Unit and Functional tests are passing -- To view, visit https://gerrit.ovirt.org/57170 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97559234dc5595fe90d5258c31450858560246ce Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Edward Haas Gerrit-Reviewer: Jenkins CI Gerrit-Reviewer: Ondřej Svoboda Gerrit-Reviewer: Petr Horáček Gerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: net: Move netlink under vdsm.network
Edward Haas has uploaded a new change for review. Change subject: net: Move netlink under vdsm.network .. net: Move netlink under vdsm.network Change-Id: I97559234dc5595fe90d5258c31450858560246ce Signed-off-by: Edward Haas--- M configure.ac M init/wait_for_ipv4s M lib/vdsm/Makefile.am M lib/vdsm/ipwrapper.py M lib/vdsm/network/Makefile.am M lib/vdsm/network/configurators/__init__.py M lib/vdsm/network/configurators/ifcfg.py M lib/vdsm/network/netinfo/addresses.py M lib/vdsm/network/netinfo/cache.py M lib/vdsm/network/netinfo/routes.py M lib/vdsm/network/netinfo/vlans.py R lib/vdsm/network/netlink/Makefile.am R lib/vdsm/network/netlink/__init__.py R lib/vdsm/network/netlink/addr.py R lib/vdsm/network/netlink/link.py R lib/vdsm/network/netlink/monitor.py R lib/vdsm/network/netlink/route.py M tests/functional/networkTests.py M tests/network/ipwrapper_test.py M tests/network/link_test.py M tests/network/netinfo_test.py M tests/network/nettestlib.py M vdsm.spec.in 23 files changed, 33 insertions(+), 31 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/70/57170/1 diff --git a/configure.ac b/configure.ac index 5a076c9..c43ab5d 100644 --- a/configure.ac +++ b/configure.ac @@ -382,7 +382,6 @@ lib/vdsm/Makefile lib/vdsm/common/Makefile lib/vdsm/common/network/Makefile - lib/vdsm/netlink/Makefile lib/vdsm/profiling/Makefile lib/vdsm/tool/Makefile lib/vdsm/tool/configurators/Makefile @@ -397,6 +396,7 @@ lib/vdsm/network/configurators/Makefile lib/vdsm/network/ip/Makefile lib/vdsm/network/netinfo/Makefile + lib/vdsm/network/netlink/Makefile lib/vdsm/network/ovs/Makefile lib/vdsm/network/ovs/driver/Makefile lib/vdsm/rpc/Makefile diff --git a/init/wait_for_ipv4s b/init/wait_for_ipv4s index bf75acb..3d04ee8 100755 --- a/init/wait_for_ipv4s +++ b/init/wait_for_ipv4s @@ -10,10 +10,10 @@ from os.path import isfile, join import sys -from vdsm.network.netinfo.addresses import getIpInfo -from vdsm.netlink import monitor from vdsm.network.configurators.ifcfg import NET_CONF_DIR from vdsm.network.configurators.ifcfg import ConfigWriter +from vdsm.network.netinfo.addresses import getIpInfo +from vdsm.network.netlink import monitor def _get_vdsm_ip_onboot_devs(): diff --git a/lib/vdsm/Makefile.am b/lib/vdsm/Makefile.am index 6f38995..7696bd1 100644 --- a/lib/vdsm/Makefile.am +++ b/lib/vdsm/Makefile.am @@ -19,7 +19,7 @@ # include $(top_srcdir)/build-aux/Makefile.subs -SUBDIRS=common netlink tool infra profiling rpc tc network virt storage +SUBDIRS=common tool infra profiling rpc tc network virt storage dist_vdsmpylib_PYTHON = \ __init__.py \ diff --git a/lib/vdsm/ipwrapper.py b/lib/vdsm/ipwrapper.py index 499fa42..d9f52b9 100644 --- a/lib/vdsm/ipwrapper.py +++ b/lib/vdsm/ipwrapper.py @@ -31,11 +31,12 @@ from netaddr import IPAddress from netaddr import IPNetwork +from vdsm.network.netlink import link + from .config import config from .utils import anyFnmatch from .utils import CommandPath from .commands import execCmd -from .netlink import link _IP_BINARY = CommandPath('ip', '/sbin/ip') diff --git a/lib/vdsm/network/Makefile.am b/lib/vdsm/network/Makefile.am index ca5deab..e0fc55f 100644 --- a/lib/vdsm/network/Makefile.am +++ b/lib/vdsm/network/Makefile.am @@ -17,7 +17,7 @@ # Refer to the README and COPYING files for full details of the license # -SUBDIRS = configurators ip netinfo ovs +SUBDIRS = configurators ip netinfo netlink ovs include $(top_srcdir)/build-aux/Makefile.subs diff --git a/lib/vdsm/network/configurators/__init__.py b/lib/vdsm/network/configurators/__init__.py index 8472f2d..6246c1a 100644 --- a/lib/vdsm/network/configurators/__init__.py +++ b/lib/vdsm/network/configurators/__init__.py @@ -23,9 +23,9 @@ from vdsm.config import config from vdsm import ipwrapper -from vdsm.network.netinfo import mtus -from vdsm.netlink import monitor from vdsm.network.netconfpersistence import RunningConfig +from vdsm.network.netinfo import mtus +from vdsm.network.netlink import monitor from .dhclient import DhcpClient from ..errors import ConfigNetworkError, RollbackIncomplete, ERR_FAILED_IFUP diff --git a/lib/vdsm/network/configurators/ifcfg.py b/lib/vdsm/network/configurators/ifcfg.py index baf3d8d..1b7f7d1 100644 --- a/lib/vdsm/network/configurators/ifcfg.py +++ b/lib/vdsm/network/configurators/ifcfg.py @@ -41,18 +41,19 @@ from vdsm import dsaversion from vdsm import hooks from vdsm import ipwrapper +from vdsm import sysctl +from vdsm import utils + +from vdsm.network.ip.address import IPv4, IPv6 +from vdsm.network.netconfpersistence import RunningConfig, PersistentConfig from vdsm.network.netinfo import (bonding as netinfo_bonding, mtus, nics, vlans, misc, NET_PATH) from vdsm.network.netinfo.cache import
Change in vdsm[master]: net: Move netlink under vdsm.network
gerrit-hooks has posted comments on this change. Change subject: net: Move netlink under vdsm.network .. Patch Set 1: * Update tracker: IGNORE, no Bug-Url found * Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url. * Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.6']) -- To view, visit https://gerrit.ovirt.org/57170 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I97559234dc5595fe90d5258c31450858560246ce Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Edward HaasGerrit-Reviewer: gerrit-hooks Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches