Change in vdsm[master]: There is no need to decorate all tests with ValidateRunningA...
ibarkan at redhat.com
ibarkan at redhat.com
Wed Dec 10 09:45:57 UTC 2014
Ido Barkan has uploaded a new change for review.
Change subject: There is no need to decorate all tests with ValidateRunningAsRoot
......................................................................
There is no need to decorate all tests with ValidateRunningAsRoot
This is since setupModule already requires root previliges when
Adding dummy links. So even tests that are not decorated with
ValidateRunningAsRoot actually require root previliges.
Change-Id: I3f85ea9ed7a8dd19f012d65b884998e525aa2259
Signed-off-by: ibarkan <ibarkan at redhat.com>
---
M tests/functional/networkTests.py
1 file changed, 1 insertion(+), 54 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/36049/1
diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 37597fd..6418d30 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -80,6 +80,7 @@
NOCHK = {'connectivityCheck': False}
+ at ValidateRunningAsRoot
def setupModule():
"""Persists network configuration."""
vdsm = VdsProxy()
@@ -392,7 +393,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksAddBondWithManyVlans(self, bridged):
def assertDevStatsReported():
status, msg, hostStats = self.vdsm_net.getVdsStats()
@@ -435,7 +435,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksAddDelBondedNetwork(self, bridged):
with dummyIf(2) as nics:
status, msg = self.vdsm_net.setupNetworks(
@@ -455,7 +454,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksAddOverExistingBond(self, bridged=True):
with dummyIf(2) as nics:
status, msg = self.vdsm_net.setupNetworks(
@@ -490,7 +488,6 @@
@cleanupNet
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksDelOneOfBondNets(self):
NETA_NAME = NETWORK_NAME + 'A'
NETB_NAME = NETWORK_NAME + 'B'
@@ -529,7 +526,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testReorderBondingOptions(self, bridged):
with dummyIf(2) as nics:
status, msg = self.vdsm_net.addNetwork(
@@ -551,7 +547,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testAddDelBondedNetwork(self, bridged):
with dummyIf(2) as nics:
status, msg = self.vdsm_net.addNetwork(NETWORK_NAME,
@@ -570,7 +565,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testAddDelNetwork(self, bridged):
with dummyIf(1) as nics:
status, msg = self.vdsm_net.addNetwork(NETWORK_NAME,
@@ -588,7 +582,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testFailWithInvalidBondingName(self, bridged):
with dummyIf(1) as nics:
invalid_bond_names = ('bond', 'bonda', 'bond0a', 'jamesbond007')
@@ -647,7 +640,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testAddNetworkManyVlans(self, bridged):
opts = {'bridged': bridged}
VLAN_COUNT = 5
@@ -677,7 +669,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testAddNetworkVlan(self, bridged):
with dummyIf(1) as nics:
status, msg = self.vdsm_net.addNetwork(NETWORK_NAME, vlan=VLAN_ID,
@@ -695,7 +686,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testAddNetworkBondWithManyVlans(self, bridged):
opts = dict(bridged=bridged)
VLAN_COUNT = 5
@@ -730,7 +720,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testAddNetworkVlanBond(self, bridged):
with dummyIf(1) as nics:
vlan_id = '42'
@@ -758,7 +747,6 @@
raise errors.ConfigNetworkError(errors.ERR_FAILED_IFDOWN, err)
@cleanupNet
- @ValidateRunningAsRoot
@with_setup(_setup_overExistingBridge, _teardown_overExistingBridge)
def testSetupNetworksOverExistingBridge(self):
status, msg = self.vdsm_net.setupNetworks(
@@ -772,7 +760,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testDelNetworkWithMTU(self, bridged):
MTU = '1234'
with dummyIf(1) as nics:
@@ -795,7 +782,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testTwiceAdd(self, bridged):
with dummyIf(1) as nics:
status, msg = self.vdsm_net.addNetwork(NETWORK_NAME, nics=nics,
@@ -811,7 +797,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testDelWithoutAdd(self, bridged):
with dummyIf(1) as nics:
status, msg = self.vdsm_net.delNetwork(NETWORK_NAME, nics=nics,
@@ -821,7 +806,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testEditWithoutAdd(self, bridged):
with dummyIf(1) as nics:
status, msg = self.vdsm_net.editNetwork(NETWORK_NAME, NETWORK_NAME,
@@ -832,7 +816,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
@brokentest('This test is known to break until initscripts-9.03.41-1.el6 '
'is released to fix https://bugzilla.redhat.com/1086897')
def testSetupNetworksAddVlan(self, bridged):
@@ -879,7 +862,6 @@
@cleanupNet
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksConvertVlanNetBridgeness(self):
"Convert a bridged networks to a bridgeless one and viceversa"
@@ -904,7 +886,6 @@
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksAddManyVlans(self, bridged):
VLAN_COUNT = 5
NET_VLANS = [(NETWORK_NAME + str(index), str(index))
@@ -937,7 +918,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksNetCompatibilityMultipleNetsSameNic(self, bridged):
with dummyIf(3) as (nic, another_nic, yet_another_nic):
@@ -1010,7 +990,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksAddNetworkToNicAfterBondResizing(self, bridged):
with dummyIf(3) as nics:
networks = {NETWORK_NAME: dict(bonding=BONDING_NAME,
@@ -1052,7 +1031,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksMtus(self, bridged):
JUMBO = '9000'
MIDI = '4000'
@@ -1122,7 +1100,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksAddNetworkToNicAfterBondBreaking(self, bridged):
with dummyIf(2) as nics:
networks = {NETWORK_NAME: dict(bonding=BONDING_NAME,
@@ -1155,7 +1132,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksKeepNetworkOnBondAfterBondResizing(self, bridged):
with dummyIf(3) as nics:
networks = {NETWORK_NAME: dict(bonding=BONDING_NAME,
@@ -1205,7 +1181,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksStableBond(self, bridged):
with dummyIf(3) as nics:
with self.vdsm_net.pinger():
@@ -1257,7 +1232,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksMultiMTUsOverBond(self, bridged):
with dummyIf(2) as nics:
with self.vdsm_net.pinger():
@@ -1304,7 +1278,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksMultiMTUsOverNic(self, bridged):
with dummyIf(1) as nics:
nic, = nics
@@ -1340,7 +1313,6 @@
@cleanupNet
@RequireDummyMod
- @ValidateRunningAsRoot
def testDelNetworkBondAccumulation(self):
with dummyIf(1) as nics:
for bigBond in ('bond555', 'bond666', 'bond777'):
@@ -1360,7 +1332,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksResizeBond(self, bridged):
with dummyIf(3) as nics:
with self.vdsm_net.pinger():
@@ -1400,7 +1371,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testBondHwAddress(self, bridged=True):
"""
Test that bond mac address is independent of the ordering of nics arg
@@ -1427,7 +1397,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testSafeNetworkConfig(self, bridged):
"""
Checks that setSafeNetworkConfig saves
@@ -1454,7 +1423,6 @@
@cleanupNet
@permutations([[True], [False]])
@RequireDummyMod
- @ValidateRunningAsRoot
def testVolatileConfig(self, bridged):
"""
Checks that the network doesn't persist over restart
@@ -1474,7 +1442,6 @@
@permutations([[True], [False]])
@cleanupNet
@RequireDummyMod
- @ValidateRunningAsRoot
def testStaticSourceRouting(self, bridged=True):
with dummyIf(1) as nics:
status, msg = self.vdsm_net.setupNetworks(
@@ -1503,7 +1470,6 @@
@cleanupNet
@RequireDummyMod
- @ValidateRunningAsRoot
def testAddVlanedBridgeless(self):
# BZ# 980174
vlan_name = 'vlan_net'
@@ -1551,7 +1517,6 @@
@cleanupNet
@RequireDummyMod
- @ValidateRunningAsRoot
def testAddVlanedBridgeless_oneCommand(self):
vlan_name = 'vlan_net'
with dummyIf(1) as nics:
@@ -1580,7 +1545,6 @@
@cleanupNet
@RequireDummyMod
- @ValidateRunningAsRoot
@ValidatesHook('before_network_setup', 'testBeforeNetworkSetup.py', True,
"#!/usr/bin/env python\n"
"import json\n"
@@ -1625,7 +1589,6 @@
@cleanupNet
@RequireDummyMod
- @ValidateRunningAsRoot
@ValidatesHook('after_network_setup', 'testAfterNetworkSetup.sh', True,
"#!/bin/sh\n"
"cat $_hook_json > %(cookiefile)s\n"
@@ -1660,7 +1623,6 @@
@cleanupNet
@RequireDummyMod
- @ValidateRunningAsRoot
def testIPv6ConfigNetwork(self):
with dummyIf(1) as nics:
nic, = nics
@@ -1691,7 +1653,6 @@
@cleanupNet
@RequireDummyMod
- @ValidateRunningAsRoot
def testIpLinkWrapper(self):
"""Tests that the created devices are properly parsed by the ipwrapper
Link class."""
@@ -1735,7 +1696,6 @@
@permutations([[True], [False]])
@cleanupNet
@RequireVethMod
- @ValidateRunningAsRoot
def testSetupNetworksAddDelDhcp(self, bridged):
with vethIf() as (left, right):
veth.setIP(left, IP_ADDRESS, IP_CIDR)
@@ -1783,7 +1743,6 @@
@permutations([['default'], ['local']])
@cleanupNet
@RequireVethMod
- @ValidateRunningAsRoot
def testDhclientLeases(self, dateFormat):
dhcp4 = set()
with vethIf() as (server, client):
@@ -1806,7 +1765,6 @@
self.assertIn(client, dhcp4, 'Test iface not found in a lease file.')
@RequireDummyMod
- @ValidateRunningAsRoot
def testGetRouteDeviceTo(self):
with dummyIf(1) as nics:
nic, = nics
@@ -1833,7 +1791,6 @@
addrFlush(nic)
@RequireDummyMod
- @ValidateRunningAsRoot
def testBrokenBridgelessNetReplacement(self):
with dummyIf(1) as nics:
nic, = nics
@@ -1858,7 +1815,6 @@
@cleanupNet
@RequireDummyMod
- @ValidateRunningAsRoot
def testReconfigureBrNetWithVanishedPort(self):
"""Test for re-defining a bridged network for which the device
providing connectivity to the bridge had been removed from it"""
@@ -1889,7 +1845,6 @@
self.assertNetworkDoesntExist(NETWORK_NAME)
@RequireDummyMod
- @ValidateRunningAsRoot
def testNoBridgeLeftovers(self):
"""Test for https://bugzilla.redhat.com/1071398"""
with dummyIf(2) as nics:
@@ -1910,7 +1865,6 @@
self.assertEqual(status, SUCCESS, msg)
@RequireDummyMod
- @ValidateRunningAsRoot
def testRedefineBondedNetworkIPs(self):
"""Test for https://bugzilla.redhat.com/1097674"""
with dummyIf(2) as nics:
@@ -1957,7 +1911,6 @@
@cleanupNet
@RequireDummyMod
- @ValidateRunningAsRoot
def testLowerMtuDoesNotOverride(self):
"""Adding multiple vlanned networks with different mtus over a bond
should have each network with its own mtu and the bond with the maximum
@@ -1994,7 +1947,6 @@
@slowtest
@cleanupNet
- @ValidateRunningAsRoot
def testHonorBlockingDhcp(self):
status, msg = self.vdsm_net.setupNetworks(
{NETWORK_NAME: {'bridged': True, 'bootproto': 'dhcp',
@@ -2009,7 +1961,6 @@
@permutations([[True], [False]])
@cleanupNet
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksEmergencyDevicesCleanupVlanOverwrite(self, bridged):
with dummyIf(1) as nics:
nic, = nics
@@ -2036,7 +1987,6 @@
@permutations([[True], [False]])
@cleanupNet
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksEmergencyDevicesCleanupBondOverwrite(self, bridged):
with dummyIf(1) as nics:
nic, = nics
@@ -2061,7 +2011,6 @@
self.assertBondExists(BONDING_NAME, nics)
@cleanupNet
- @ValidateRunningAsRoot
def testSetupNetworksOverDhcpIface(self):
"""When asked to setupNetwork on top of an interface with a running
dhclient process, Vdsm is expected to stop that dhclient and start
@@ -2120,7 +2069,6 @@
@permutations([[True], [False]])
@cleanupNet
- @ValidateRunningAsRoot
def testSetupNetworkOutboundQos(self, bridged):
hostQos = {
'out': {
@@ -2156,7 +2104,6 @@
@cleanupNet
@RequireDummyMod
- @ValidateRunningAsRoot
def testSetupNetworksActiveSlave(self):
def create_bond_with_mode(nics, mode):
bonding = {BONDING_NAME: {'nics': nics}}
--
To view, visit http://gerrit.ovirt.org/36049
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3f85ea9ed7a8dd19f012d65b884998e525aa2259
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Ido Barkan <ibarkan at redhat.com>
More information about the vdsm-patches
mailing list