Repository: cloudstack
Updated Branches:
refs/heads/4.4-automation 80121f6be -> 486ee69ef
removed basic zone tag and added advanced zone tag
Conflicts:
test/integration/smoke/test_nic.py
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/486ee69e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/486ee69e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/486ee69e
Branch: refs/heads/4.4-automation
Commit: 486ee69ef47fe675921ee255eea112675e20418c
Parents: 80121f6
Author: SrikanteswaraRao Talluri <[email protected]>
Authored: Wed Apr 30 14:00:18 2014 +0530
Committer: SrikanteswaraRao Talluri <[email protected]>
Committed: Wed Apr 30 14:29:19 2014 +0530
----------------------------------------------------------------------
test/integration/smoke/test_nic.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/486ee69e/test/integration/smoke/test_nic.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_nic.py
b/test/integration/smoke/test_nic.py
index 3f91d70..592a839 100644
--- a/test/integration/smoke/test_nic.py
+++ b/test/integration/smoke/test_nic.py
@@ -119,7 +119,7 @@ class TestNic(cloudstackTestCase):
except Exception as ex:
self.debug("Exception during NIC test SETUP!: " + str(ex))
- @attr(tags = ["devcloud", "smoke", "advanced", "provisioning"])
+ @attr(tags = ["devcloud", "smoke", "advanced", "advancedns",
"provisioning"])
def test_01_nic(self):
#TODO: SIMENH: add validation
"""Test to add and update added nic to a virtual machine"""
