Change in vdsm[master]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-03-24 Thread danken 
Dan Kenigsberg has submitted this change and it was merged.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


tests: ovs: mock setupNetworks in OVSNetworkTests class

Until now we marked networks and bonds as OVS ones in OVSVdsProxy.
It is easier to do so on OVSNetworkTests class.

Change-Id: I07127bb335da9462b8b439b3853f7e89eaef3064
Signed-off-by: Petr Horáček 
Reviewed-on: https://gerrit.ovirt.org/54889
Continuous-Integration: Jenkins CI
Reviewed-by: Edward Haas 
Reviewed-by: Dan Kenigsberg 
---
M tests/functional/networkTestsOVS.py
1 file changed, 22 insertions(+), 39 deletions(-)

Approvals:
  Jenkins CI: Passed CI tests
  Petr Horáček: Verified
  Dan Kenigsberg: Looks good to me, approved
  Edward Haas: Looks good to me, but someone else must approve



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

Gerrit-MessageType: merged
Gerrit-Change-Id: I07127bb335da9462b8b439b3853f7e89eaef3064
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
Gerrit-Reviewer: Petr Horáček 
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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-03-24 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Patch Set 7:

* Update tracker: IGNORE, no Bug-Url found
* Set MODIFIED::IGNORE, no Bug-Url found.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I07127bb335da9462b8b439b3853f7e89eaef3064
Gerrit-PatchSet: 7
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-03-24 Thread danken 
Dan Kenigsberg has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Patch Set 6: Code-Review+2

raising score

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I07127bb335da9462b8b439b3853f7e89eaef3064
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-03-24 Thread edwardh 
Edward Haas has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Patch Set 6: Code-Review+1

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I07127bb335da9462b8b439b3853f7e89eaef3064
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-03-23 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Patch Set 6:

* 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', 
'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I07127bb335da9462b8b439b3853f7e89eaef3064
Gerrit-PatchSet: 6
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-03-22 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Patch Set 5:

* 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', 
'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I07127bb335da9462b8b439b3853f7e89eaef3064
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-03-20 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


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', 
'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I07127bb335da9462b8b439b3853f7e89eaef3064
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-03-19 Thread phoracek 
Petr Horáček has uploaded a new change for review.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..

tests: ovs: mock setupNetworks in OVSNetworkTests class

Until now we marked networks and bonds as OVS ones in OVSVdsProxy.
It is easier to do so on OVSNetworkTests class.

Change-Id: I07127bb335da9462b8b439b3853f7e89eaef3064
Signed-off-by: Petr Horáček 
---
M tests/functional/networkTestsOVS.py
1 file changed, 22 insertions(+), 39 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/89/54889/1

diff --git a/tests/functional/networkTestsOVS.py 
b/tests/functional/networkTestsOVS.py
index 848ebba..166f205 100644
--- a/tests/functional/networkTestsOVS.py
+++ b/tests/functional/networkTestsOVS.py
@@ -32,7 +32,6 @@
   _get_source_route, NETWORK_NAME,
   IP_ADDRESS, IP_MASK, IP_CIDR, IP_GATEWAY,
   IPv6_ADDRESS, IPv6_CIDR, VLAN_ID, NOCHK, SUCCESS)
-from utils import VdsProxy
 
 # WARNING: because of this module changes networkTests module, we cannot run
 # networkTests.py and networkTestsOVS.py in one run
@@ -153,37 +152,6 @@
 networkTests._waitForKnownOperstate = _fakeWaitForOperstate
 
 
-class OVSVdsProxy(VdsProxy):
-
-def setupNetworks(self, networks, bonds, options):
-if options.pop('ovs', True):
-# skip non-bridged networks and networks without a nic/bonding,
-# such tests should be listed in not_suported list
-for _, attrs in networks.items():
-if not attrs.get('bridged', True):
-raise SkipTest('OVS does not support bridgeless networks')
-
-# setup every network as OVS network
-for network, attrs in networks.items():
-if 'remove' not in attrs:
-networks[network].update({'custom': {'ovs': True}})
-for bond, attrs in bonds.items():
-if 'remove' not in attrs:
-bond_opts = bonds[bond].get('options', '').split()
-modified = False
-for i in range(len(bond_opts)):
-if bond_opts[i].startswith('custom='):
-bond_opts[i] = ('custom=%s,ovs=True' %
-bond_opts[i].split('=', 1)[1])
-modified = True
-break
-if not modified:
-bond_opts.append('custom=ovs=True')
-bonds[bond]['options'] = ' '.join(bond_opts)
-
-return super(OVSVdsProxy, self).setupNetworks(networks, bonds, options)
-
-
 @expandPermutations
 class OVSNetworkTest(NetworkTest):
 __test__ = True
@@ -202,14 +170,29 @@
 func(*args, **kwargs)
 return wrapper
 
-def setUp(self):
-self.vdsm_net = OVSVdsProxy()
+def setupNetworks(self, nets, bonds, opts, **kwargs):
+if opts.pop('ovs', True):
+# setup every network as OVS network
+for net, attrs in nets.items():
+if not attrs.get('bridged', True):
+raise SkipTest('OVS does not support bridgeless networks')
+if 'remove' not in attrs:
+nets[net].update({'custom': {'ovs': True}})
+for bond, attrs in bonds.items():
+if 'remove' not in attrs:
+bond_opts = bonds[bond].get('options', '').split()
+modified = False
+for i in range(len(bond_opts)):
+if bond_opts[i].startswith('custom='):
+bond_opts[i] = ('custom=%s,ovs=True' %
+bond_opts[i].split('=', 1)[1])
+modified = True
+break
+if not modified:
+bond_opts.append('custom=ovs=True')
+bonds[bond]['options'] = ' '.join(bond_opts)
 
-def setupNetworks(self, *args, **kwargs):
-# Do not run test_kernel_config
-if 'test_kernel_config' in kwargs:
-kwargs.pop('test_kernel_config')
-return self.vdsm_net.setupNetworks(*args, **kwargs)
+return self.vdsm_net.setupNetworks(nets, bonds, opts)
 
 @cleanupNet
 def test_ovirtmgmtm_to_ovs(self):


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I07127bb335da9462b8b439b3853f7e89eaef3064
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-03-19 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Patch Set 5:

* 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', 
'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia90cee83633b12a5bb40b58fc15864a3646018b5
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-03-19 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Patch Set 2:

* 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', 
'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I07127bb335da9462b8b439b3853f7e89eaef3064
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-03-19 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Patch Set 3:

* 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', 
'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I07127bb335da9462b8b439b3853f7e89eaef3064
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-03-18 Thread phoracek 
Petr Horáček has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Patch Set 1: Verified+1

OVS tests are running again.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I07127bb335da9462b8b439b3853f7e89eaef3064
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-03-18 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Patch Set 5:

* Update tracker: IGNORE, no Bug-Url found

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia90cee83633b12a5bb40b58fc15864a3646018b5
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-03-18 Thread phoracek 
Petr Horáček has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Patch Set 5: Verified+1

OVS tests are running again.

Output:

[root@centos7-vdsmbox ~]# cat ovs_tests.log 
functional.networkTestsOVS.OVSNetworkTest
testHonorBlockingDhcp   SKIP: Slow 
tests are disabled
testLowerMtuDoesNotOverride OK
testNoBridgeLeftovers   OK
testSelectiveRestoreIgnoresVdsmRegParamsOK
testSetupNetworkOutboundQos(True)   ERROR
testSetupNetworksAddBadParams(True) OK
testSetupNetworksAddBondWithManyVlans(True) OK
testSetupNetworksAddDelBondedNetwork(True)  OK
testSetupNetworksAddDelDhcp(True, (4, 6))   FAIL
testSetupNetworksAddDelDhcp(True, (4,)) FAIL
testSetupNetworksAddDelDhcp(True, (6,)) FAIL
testSetupNetworksAddManyVlans(True) OK
testSetupNetworksAddNetworkToNicAfterBondBreaking(True) OK
testSetupNetworksAddVlan(True)  ERROR
testSetupNetworksConnectivityCheck  OK
testSetupNetworksConnectivityCheckOverExistingBond  OK
testSetupNetworksEmergencyDevicesCleanupBondOverwrite(True) SKIP: Slow 
tests are disabled
testSetupNetworksEmergencyDevicesCleanupVlanOverwrite(True) SKIP: Slow 
tests are disabled
testSetupNetworksKeepNetworkOnBondAfterBondResizing(True)   OK
testSetupNetworksMtus(True) FAIL
testSetupNetworksMultiMTUsOverBond(True)FAIL
testSetupNetworksMultiMTUsOverNic(True) FAIL
testSetupNetworksNiclessOK
testSetupNetworksOverExistingBridge OK
testSetupNetworksReconfigureBridge  FAIL
testStaticNetworkConfig((4, 6)) FAIL
testStaticNetworkConfig((4,))   OK
testStaticNetworkConfig((6,))   FAIL
testStaticSourceRouting(True)   OK
test_bond_mode0_caps_aggregator_id  OK
test_bond_mode4_caps_aggregator_id  FAIL
test_bondmode_in_capabilities({'options': 'mode=0'})OK
test_bondmode_in_capabilities({'options': 'mode=1'})OK
test_bondmode_in_capabilities({})   FAIL
test_drop_initial_bond_slaves_ip_config OK
test_drop_initial_network_nic_ip_config OK
test_ovirtmgmtm_to_ovs  OK
test_remove_bond_under_network  SKIP: OVS does 
not support bridgeless networks
test_rollback   OK
test_setupNetworks_swap_slaves_between_bondsFAIL

==
ERROR: testSetupNetworkOutboundQos(True) 
(functional.networkTestsOVS.OVSNetworkTest)
--
Traceback (most recent call last):
  File "/usr/share/vdsm/tests/testlib.py", line 73, in wrapper
return f(self, *args)
  File "/usr/share/vdsm/tests/functional/networkTests.py", line 212, in wrapper
func(*args, **kwargs)
  File "/usr/share/vdsm/tests/functional/networkTests.py", line 2493, in 
testSetupNetworkOutboundQos
self.assertNetworkExists(NETWORK_NAME, hostQos=hostQos)
  File "/usr/share/vdsm/tests/functional/networkTests.py", line 231, in 
assertNetworkExists
reported_qos = network_netinfo['hostQos']
KeyError: 'hostQos'
 >> begin captured logging << 
SuperVdsmProxy: DEBUG: Trying to connect to Super Vdsm
- >> end captured logging << -

==
ERROR: testSetupNetworksAddVlan(True) 
(functional.networkTestsOVS.OVSNetworkTest)
--
Traceback (most recent call last):
  File "/usr/share/vdsm/tests/testlib.py", line 73, in wrapper
return f(self, *args)
  File "/usr/share/vdsm/tests/functional/networkTests.py", line 212, in wrapper
func(*args, **kwargs)
  File "/usr/share/vdsm/tests/functional/networkTests.py", line 744, in 
testSetupNetworksAddVlan
self.assertNetworkExists(NETWORK_NAME, bridgeOpts=BRIDGE_OPTS)
  File "/usr/share/vdsm/tests/functional/networkTests.py", line 229, in 
assertNetworkExists
self.assertEqual(value, appliedOpts[opt])
KeyError: 'multicast_router'

Change in vdsm[master]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-03-18 Thread phoracek 
Petr Horáček has abandoned this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Abandoned

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

Gerrit-MessageType: abandon
Gerrit-Change-Id: Ia90cee83633b12a5bb40b58fc15864a3646018b5
Gerrit-PatchSet: 5
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-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 
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-03-18 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Patch Set 4:

* 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', 
'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: I07127bb335da9462b8b439b3853f7e89eaef3064
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Jenkins CI
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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-02-17 Thread phoracek 
Petr Horáček has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Patch Set 4: Verified+1

functional/networkTestsOVS.py are now working again.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia90cee83633b12a5bb40b58fc15864a3646018b5
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-02-17 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Patch Set 4:

* 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', 
'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia90cee83633b12a5bb40b58fc15864a3646018b5
Gerrit-PatchSet: 4
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-02-17 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Patch Set 3:

* 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', 
'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia90cee83633b12a5bb40b58fc15864a3646018b5
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
Gerrit-Reviewer: Ondřej Svoboda 
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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-02-17 Thread phoracek 
Petr Horáček has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Patch Set 3: Verified+1

functional/networkTestsOVS.py are working again.

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia90cee83633b12a5bb40b58fc15864a3646018b5
Gerrit-PatchSet: 3
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
Gerrit-Reviewer: Dan Kenigsberg 
Gerrit-Reviewer: Edward Haas 
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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-02-17 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


Patch Set 2:

* 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', 
'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia90cee83633b12a5bb40b58fc15864a3646018b5
Gerrit-PatchSet: 2
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: 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]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-02-17 Thread phoracek 
Petr Horáček has uploaded a new change for review.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..

tests: ovs: mock setupNetworks in OVSNetworkTests class

Until now we marked networks and bonds as OVS ones in OVSVdsProxy.
It is easier to do so on OVSNetworkTests class.

Change-Id: Ia90cee83633b12a5bb40b58fc15864a3646018b5
Signed-off-by: Petr Horáček 
---
M tests/functional/networkTestsOVS.py
1 file changed, 30 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/67/53667/1

diff --git a/tests/functional/networkTestsOVS.py 
b/tests/functional/networkTestsOVS.py
index ed8dcaa..89bf2d0 100644
--- a/tests/functional/networkTestsOVS.py
+++ b/tests/functional/networkTestsOVS.py
@@ -32,7 +32,6 @@
   _get_source_route, dnsmasqDhcp, NETWORK_NAME,
   IP_ADDRESS, IP_MASK, IP_CIDR, IP_GATEWAY,
   IPv6_ADDRESS, IPv6_CIDR, VLAN_ID, NOCHK, SUCCESS)
-from utils import VdsProxy
 import dhcp
 
 # WARNING: because of this module changes networkTests module, we cannot run
@@ -148,6 +147,7 @@
 networkTests._waitForKnownOperstate = _fakeWaitForKnownOperstate
 
 
+<<< HEAD
 class OVSVdsProxy(VdsProxy):
 
 def setupNetworks(self, networks, bonds, options):
@@ -179,6 +179,8 @@
 return super(OVSVdsProxy, self).setupNetworks(networks, bonds, options)
 
 
+===
+>>> 5ce5878... tests: ovs: mock setupNetworks in OVSNetworkTests class
 @expandPermutations
 class OVSNetworkTest(NetworkTest):
 __test__ = True
@@ -197,14 +199,38 @@
 func(*args, **kwargs)
 return wrapper
 
+<<< HEAD
 def setUp(self):
 self.vdsm_net = OVSVdsProxy()
 
 def setupNetworks(self, *args, **kwargs):
+===
+def setupNetworks(self, nets, bonds, opts):
+>>> 5ce5878... tests: ovs: mock setupNetworks in OVSNetworkTests class
 # Do not run test_kernel_config
-if 'test_kernel_config' in kwargs:
-kwargs.pop('test_kernel_config')
-return self.vdsm_net.setupNetworks(*args, **kwargs)
+opts['test_kernel_config'] = False
+
+# setup every network as OVS network
+for net, attrs in nets.items():
+if not attrs.get('bridged', True):
+raise SkipTest('OVS does not support bridgeless networks')
+if 'remove' not in attrs:
+nets[net].update({'custom': {'ovs': True}})
+for bond, attrs in bonds.items():
+if 'remove' not in attrs:
+bond_opts = bonds[bond].get('options', '').split()
+modified = False
+for i in range(len(bond_opts)):
+if bond_opts[i].startswith('custom='):
+bond_opts[i] = ('custom=%s,ovs=True' %
+bond_opts[i].split('=', 1)[1])
+modified = True
+break
+if not modified:
+bond_opts.append('custom=ovs=True')
+bonds[bond]['options'] = ' '.join(bond_opts)
+
+return self.vdsm_net.setupNetworks(nets, bonds, opts)
 
 @cleanupNet
 def test_ovirtmgmtm_to_ovs(self):


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia90cee83633b12a5bb40b58fc15864a3646018b5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Petr Horáček 
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches

Change in vdsm[master]: tests: ovs: mock setupNetworks in OVSNetworkTests class

2016-02-17 Thread automation 
gerrit-hooks has posted comments on this change.

Change subject: tests: ovs: mock setupNetworks in OVSNetworkTests class
..


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', 
'ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

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

Gerrit-MessageType: comment
Gerrit-Change-Id: Ia90cee83633b12a5bb40b58fc15864a3646018b5
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: 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