Change in vdsm[master]: net: tests: test_rollback

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

Change subject: net: tests: test_rollback
......................................................................

net: tests: test_rollback

A simple rollback test. Created mainly for OVS testing.

Change-Id: I71bc067c5f9f828a0a8899005be51c3695d81c20
Signed-off-by: Petr Horáček 
---
M tests/functional/networkTests.py
1 file changed, 37 insertions(+), 0 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/75/46875/1

diff --git a/tests/functional/networkTests.py b/tests/functional/networkTests.py
index 674c479..21565db 100644
--- a/tests/functional/networkTests.py
+++ b/tests/functional/networkTests.py
@@ -2775,3 +2775,40 @@
             self.assertEqual(status, SUCCESS, msg)
             self.assertNetworkDoesntExist(NETWORK_NAME)
             self.assertBondDoesntExist(BONDING_NAME, nics)
+
+    @cleanupNet
+    @ValidateRunningAsRoot
+    def test_rollback(self):
+        with dummyIf(3) as nics:
+            NET1 = NETWORK_NAME + '1'
+            NET2 = NETWORK_NAME + '2'
+
+            # setup initial network
+            status, msg = self.setupNetworks(
+                {NET1:
+                 {'bonding': BONDING_NAME, 'bridged': True}},
+                {BONDING_NAME: {'nics': nics[:2]}}, NOCHK)
+            self.assertEqual(status, SUCCESS, msg)
+            self.assertNetworkExists(NET1)
+            self.assertBondExists(BONDING_NAME, nics[:2])
+
+            # setup network with invalid IP, expecting failture
+            status, msg = self.setupNetworks(
+                {NET2:
+                 {'nic': nics[2], 'bridged': True, 'vlan': VLAN_ID,
+                  'netmask': '300.300.300.300', 'ipaddr': '300.300.300.300'}},
+                {}, NOCHK)
+            self.assertNotEqual(status, SUCCESS, msg)
+            self.assertNetworkDoesntExist(NET2)
+
+            # test if initial network is still there
+            self.assertNetworkExists(NET1)
+            self.assertBondExists(BONDING_NAME, nics[:2])
+
+            # cleanup
+            status, msg = self.vdsm_net.setupNetworks(
+                {NET1: {'remove': True}},
+                {BONDING_NAME: {'remove': True}}, NOCHK)
+            self.assertEqual(status, SUCCESS, msg)
+            self.assertNetworkDoesntExist(NET1)
+            self.assertBondDoesntExist(BONDING_NAME, nics)

[e-mail] has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

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

[e-mail] has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

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

[e-mail] has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

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

[e-mail] has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

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

[e-mail] has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

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

Petr Horáček has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

Patch Set 5: Verified+1

Passed with ifcfg configurator

[e-mail] has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

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

Ido Barkan has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

Patch Set 6: Code-Review-1

(3 comments)

https://gerrit.ovirt.org/#/c/46875/6//COMMIT_MSG
Commit Message:

Line 5: CommitDate: 2015-10-09 10:31:16 +0200
Line 6: 
Line 7: net: tests: test_rollback
Line 8: 
Line 9: A simple rollback test. Created mainly for OVS testing.
This test is important in general. not just OVS.
Line 10: 
Line 11: Change-Id: I71bc067c5f9f828a0a8899005be51c3695d81c20

https://gerrit.ovirt.org/#/c/46875/6/tests/functional/networkTests.py
File tests/functional/networkTests.py:

Line 2777:             self.assertBondDoesntExist(BONDING_NAME, nics)
Line 2778: 
Line 2779:     @cleanupNet
Line 2780:     @ValidateRunningAsRoot
Line 2781:     def test_rollback(self):
what? didn't we have already this trivial test? Oops.
Line 2782:         with dummyIf(3) as nics:
Line 2783:             NET1 = NETWORK_NAME + '1'
Line 2784:             NET2 = NETWORK_NAME + '2'
Line 2785:

Line 2791:             self.assertEqual(status, SUCCESS, msg)
Line 2792:             self.assertNetworkExists(NET1)
Line 2793:             self.assertBondExists(BONDING_NAME, nics[:2])
Line 2794: 
Line 2795:             # setup network with invalid IP, expecting failture
failure
Line 2796:             status, msg = self.setupNetworks(
Line 2797:                 {NET2:
Line 2798:                  {'nic': nics[2], 'bridged': True, 'vlan': VLAN_ID,
Line 2799:                   'netmask': '300.300.300.300', 'ipaddr': '300.300.300.300'}},

Petr Horáček has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

Patch Set 6:

(1 comment)

https://gerrit.ovirt.org/#/c/46875/6/tests/functional/networkTests.py
File tests/functional/networkTests.py:

Line 2777:             self.assertBondDoesntExist(BONDING_NAME, nics)
Line 2778: 
Line 2779:     @cleanupNet
Line 2780:     @ValidateRunningAsRoot
Line 2781:     def test_rollback(self):
> what? didn't we have already this trivial test? Oops.

ConnectivityCheck test tests if rollback was done and if it removed all created networks (but it does not check reverting to initial networks)
Line 2782:         with dummyIf(3) as nics:
Line 2783:             NET1 = NETWORK_NAME + '1'
Line 2784:             NET2 = NETWORK_NAME + '2'
Line 2785:

[e-mail] has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

Patch Set 7:

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

Petr Horáček has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

Patch Set 7: Verified+1

Copying v+1, just changed a comment.

Ido Barkan has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

Patch Set 7: Code-Review+1

[e-mail] has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

Patch Set 8:

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

Ido Barkan has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

Patch Set 8: Code-Review+1

patchset 8 was just a rebase, right?

Petr Horáček has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

Patch Set 8:

This topic needs to be rebased and tested patch by patch again. OVS tests are not passing now (probably because of some other patches)

Petr Horáček has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

Patch Set 8:

But this patch is not only OVS related, so it's OK.

Ondřej Svoboda has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

Patch Set 8: Code-Review+1

Petr Horáček has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

Patch Set 8: Verified+1

Passed network functional tests without a regression.

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

Patch Set 8: Code-Review+2

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: net: tests: test_rollback
......................................................................

net: tests: test_rollback

A simple rollback test.

Change-Id: I71bc067c5f9f828a0a8899005be51c3695d81c20
Signed-off-by: Petr Horáček 
Reviewed-on: https://gerrit.ovirt.org/46875
Continuous-Integration: Jenkins CI
Reviewed-by: Ido Barkan 
Reviewed-by: Ondřej Svoboda 
Reviewed-by: Dan Kenigsberg 
---
M tests/functional/networkTests.py
1 file changed, 35 insertions(+), 0 deletions(-)

Approvals:
  Ido Barkan: Looks good to me, but someone else must approve
  Ondřej Svoboda: Looks good to me, but someone else must approve
  Jenkins CI: Passed CI tests
  Petr Horáček: Verified
  Dan Kenigsberg: Looks good to me, approved

[e-mail] has posted comments on this change.

Change subject: net: tests: test_rollback
......................................................................

Patch Set 9:

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