Change in vdsm[ovirt-3.5]: ifcfg: make default route network be started by sysV

asegurap at redhat.com asegurap at redhat.com
Thu Jun 26 22:50:30 UTC 2014


Antoni Segura Puimedon has posted comments on this change.

Change subject: ifcfg: make default route network be started by sysV
......................................................................


Patch Set 1: Verified+1

Tested manually to see if the ovirtmgmt network survives reboot with vdsmd
disabled
    toniel602 tests (f3f1f22*) # vdsClient -s 0 addNetwork bridge=ovirtmgmt nics=eth1 bootproto=dhcp
    Done
    toniel602 tests (f3f1f22*) # vdsClient -s 0 addNetwork bridge=foo nics=eth2 bootproto=dhcp
    Done
    toniel602 tests (f3f1f22*) # cat /etc/sysconfig/network-scripts/ifcfg-eth2
    # Generated by VDSM version 4.14.1-532.gitf3f1f22.el6
    DEVICE=eth2
    HWADDR=00:01:a4:ac:87:01
    BRIDGE=foo
    ONBOOT=no
    NM_CONTROLLED=no
    toniel602 tests (f3f1f22*) # cat /etc/sysconfig/network-scripts/ifcfg-foo
    # Generated by VDSM version 4.14.1-532.gitf3f1f22.el6
    DEVICE=foo
    TYPE=Bridge
    DELAY=0
    STP=off
    ONBOOT=no
    BOOTPROTO=dhcp
    DEFROUTE=no
    NM_CONTROLLED=no
    HOTPLUG=no
    toniel602 tests (f3f1f22*) # cat /etc/sysconfig/network-scripts/ifcfg-eth1
    # Generated by VDSM version 4.14.1-532.gitf3f1f22.el6
    DEVICE=eth1
    HWADDR=00:01:a4:ac:87:02
    BRIDGE=ovirtmgmt
    ONBOOT=yes
    NM_CONTROLLED=no
    toniel602 tests (f3f1f22*) # cat /etc/sysconfig/network-scripts/ifcfg-ovirtmgmt
    # Generated by VDSM version 4.14.1-532.gitf3f1f22.el6
    DEVICE=ovirtmgmt
    TYPE=Bridge
    DELAY=0
    STP=off
    ONBOOT=yes
    BOOTPROTO=dhcp
    DEFROUTE=yes
    NM_CONTROLLED=no
    HOTPLUG=no
    toniel602 tests (f3f1f22*) # vdsClient -s 0 setSafeNetworkConfig
    Done
    toniel602 tests (f3f1f22*) # chkconfig vdsmd off
    toniel602 tests (f3f1f22*) # chkconfig supervdsmd off
    toniel602 tests (f3f1f22*) # chkconfig | grep vdsmd
    supervdsmd      0:off   1:off   2:off   3:off   4:off   5:off   6:off
    vdsmd           0:off   1:off   2:off   3:off   4:off   5:off   6:off
    toniel602 tests (f3f1f22*) # reboot

    ~/c/ovirt-node ❯❯❯ ssh toniel602
    Last login: Fri Jun 27 00:44:27 2014 from xxxxxxxxxxxxxxxxxxx

    CPU      => Westmere E56xx/L56xx/X56xx (Nehalem-C)
    uptime   => 00:48:53 up 0 min, 1 user, load average: 0.16, 0.06, 0.02
    RAM      => Total 1.8 GB  / Free 1.6 GB
    swap     => Total 2.0 GB  / Free 2.0 GB
    OS       => Red Hat Enterprise Linux Server release 6.5 (Santiago)
    IP/s     => eth1: addr ovirtmgmt: 10.34.61.221
    Bridge/s => ovirtmgmt => eth1
    VDSM     => vdsm-4.14.1-532.gitf3f1f22.el6.x86_64
    libvirt  => libvirt-0.10.2-29.el6_5.9.x86_64
    qemu     => qemu-kvm-rhev-0.12.1.2-2.415.el6_5.11.x86_64

We can see that only ovirtmgmt survived and that it got the ip right as before

Also ran the functional tests on el6
    toniel602 tests (f3f1f22*) # ./run_tests_local.sh -x functional/networkTests.py
    NetworkTest
        testAddDelBondedNetwork(kwargs=False)                       OK
        testAddDelBondedNetwork(kwargs=True)                        OK
        testAddDelNetwork(kwargs=False)                             OK
        testAddDelNetwork(kwargs=True)                              OK
        testAddNetworkBondWithManyVlans(kwargs=False)               OK
        testAddNetworkBondWithManyVlans(kwargs=True)                OK
        testAddNetworkManyVlans(kwargs=False)                       OK
        testAddNetworkManyVlans(kwargs=True)                        OK
        testAddNetworkVlan(kwargs=False)                            OK
        testAddNetworkVlan(kwargs=True)                             OK
        testAddNetworkVlanBond(kwargs=False)                        OK
        testAddNetworkVlanBond(kwargs=True)                         OK
        testAddVlanedBridgeless                                     OK
        testAddVlanedBridgeless_oneCommand                          OK
        testAfterNetworkSetupHook                                   OK
        testBeforeNetworkSetupHook                                  OK
        testBondHwAddress(kwargs=False)                             OK
        testBondHwAddress(kwargs=True)                              OK
        testBrokenBridgelessNetReplacement                          OK
        testDelNetworkBondAccumulation                              OK
        testDelNetworkWithMTU(kwargs=False)                         OK
        testDelNetworkWithMTU(kwargs=True)                          OK
        testDelWithoutAdd(kwargs=False)                             OK
        testDelWithoutAdd(kwargs=True)                              OK
        testDhclientLeases(kwargs='default')                        OK
        testDhclientLeases(kwargs='local')                          OK
        testEditWithoutAdd(kwargs=False)                            OK
        testEditWithoutAdd(kwargs=True)                             OK
        testFailWithInvalidBondingName(kwargs=False)                OK
        testFailWithInvalidBondingName(kwargs=True)                 OK
        testFailWithInvalidBridgeName                               OK
        testFailWithInvalidIpConfig                                 OK
        testFailWithInvalidNic(kwargs=False)                        OK
        testFailWithInvalidNic(kwargs=True)                         OK
        testFailWithInvalidParams(kwargs=False)                     OK
        testFailWithInvalidParams(kwargs=True)                      OK
        testGetRouteDeviceTo                                        OK
        testHonorBlockingDhcp                                       OK
        testIPv6ConfigNetwork                                       OK
        testIpLinkWrapper                                           OK
        testLegacyBonds                                             OK
        testLowerMtuDoesNotOverride                                 OK
        testNoBridgeLeftovers                                       OK
        testQosNetwork                                              OK
        testReconfigureBrNetWithVanishedPort                        OK
        testRedefineBondedNetworkIPs                                OK
        testRouteExists                                             OK
        testRuleExists                                              OK
        testSafeNetworkConfig(kwargs=False)                         OK
        testSafeNetworkConfig(kwargs=True)                          OK
        testSetupNetworksAddBadParams(bridged=False)                OK
        testSetupNetworksAddBadParams(bridged=True)                 OK
        testSetupNetworksAddBondWithManyVlans(kwargs=False)         OK
        testSetupNetworksAddBondWithManyVlans(kwargs=True)          OK
        testSetupNetworksAddDelBondedNetwork(kwargs=False)          OK
        testSetupNetworksAddDelBondedNetwork(kwargs=True)           OK
        testSetupNetworksAddDelDhcp(kwargs=False)                   OK
        testSetupNetworksAddDelDhcp(kwargs=True)                    OK
        testSetupNetworksAddManyVlans(kwargs=False)                 OK
        testSetupNetworksAddManyVlans(kwargs=True)                  OK
        testSetupNetworksAddNetworkToNicAfterBondBreaking(kwargs=False)OK
        testSetupNetworksAddNetworkToNicAfterBondBreaking(kwargs=True)OK
        testSetupNetworksAddNetworkToNicAfterBondResizing(kwargs=False)OK
        testSetupNetworksAddNetworkToNicAfterBondResizing(kwargs=True)OK
        testSetupNetworksAddOverExistingBond(kwargs=False)          OK
        testSetupNetworksAddOverExistingBond(kwargs=True)           OK
        testSetupNetworksAddVlan(kwargs=False)                      OK
        testSetupNetworksAddVlan(kwargs=True)                       SKIP: This test is known to break until initscripts-9.03.41-1.el6 is released to fix https://bugzilla.redhat.com/1086897
        testSetupNetworksConvertVlanNetBridgeness                   OK
        testSetupNetworksDelOneOfBondNets                           OK
        testSetupNetworksKeepNetworkOnBondAfterBondResizing(kwargs=False)OK
        testSetupNetworksKeepNetworkOnBondAfterBondResizing(kwargs=True)OK
        testSetupNetworksMtus(kwargs=False)                         OK
        testSetupNetworksMtus(kwargs=True)                          OK
        testSetupNetworksMultiMTUsOverBond(kwargs=False)            OK
        testSetupNetworksMultiMTUsOverBond(kwargs=True)             OK
        testSetupNetworksMultiMTUsOverNic(kwargs=False)             OK
        testSetupNetworksMultiMTUsOverNic(kwargs=True)              OK
        testSetupNetworksNetCompatibilityBondSingleBridge           OK
        testSetupNetworksNetCompatibilityBondSingleBridgeless       OK
        testSetupNetworksNetCompatibilityNicSingleBridge            OK
        testSetupNetworksNetCompatibilityNicSingleBridgeless        OK
        testSetupNetworksNicless                                    OK
        testSetupNetworksNiclessBridgeless                          OK
        testSetupNetworksOverDhcpIface                              OK
        testSetupNetworksResizeBond(kwargs=False)                   OK
        testSetupNetworksResizeBond(kwargs=True)                    OK
        testSetupNetworksStableBond(kwargs=False)                   OK
        testSetupNetworksStableBond(kwargs=True)                    OK
        testStaticSourceRouting(kwargs=False)                       OK
        testStaticSourceRouting(kwargs=True)                        OK
        testTwiceAdd(kwargs=False)                                  OK
        testTwiceAdd(kwargs=True)                                   OK
        testVolatileConfig(kwargs=False)                            OK
        testVolatileConfig(kwargs=True)                             OK

    ----------------------------------------------------------------------
    Ran 95 tests in 506.335s

    OK (SKIP=1)
    toniel602 tests (f3f1f22*) #

-- 
To view, visit http://gerrit.ovirt.org/29312
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: comment
Gerrit-Change-Id: Iaf656958e8ddfdd7e8be9a8bcb51962e073ae26a
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.5
Gerrit-Owner: Antoni Segura Puimedon <asegurap at redhat.com>
Gerrit-Reviewer: Antoni Segura Puimedon <asegurap at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-HasComments: No


More information about the vdsm-patches mailing list