apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removing basic tag from few test cases which should not be run on basic zone

Browse Source
This commit is contained in:
Gaurav Aradhye 2014-07-25 17:00:12 +05:30 committed by Girish Shilamkar
parent e62df62d92
commit 0332a23aa7
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/integration/component/test_multiple_ips_per_nic.py
View File

@ -197,7 +197,7 @@ class TestBasicOperations(cloudstackTestCase):
return return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK) @data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
@attr(tags=["basic","advanced"]) @attr(tags=["advanced"])
def test_add_ip_to_nic(self, value): def test_add_ip_to_nic(self, value):
""" Add secondary IP to NIC of a VM""" """ Add secondary IP to NIC of a VM"""
@ -218,9 +218,6 @@ class TestBasicOperations(cloudstackTestCase):
self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id) self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id)
self.cleanup.append(self.account) self.cleanup.append(self.account)
if(shouldTestBeSkipped(networkType=value, zoneType=self.mode)):
self.skipTest("Skipping test as %s network is not supported in basic zone" % value)
network = createNetwork(self, value) network = createNetwork(self, value)
try: try:
@ -256,7 +253,7 @@ class TestBasicOperations(cloudstackTestCase):
return return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK) @data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
@attr(tags=["basic","advanced"]) @attr(tags=["advanced"])
def test_remove_ip_from_nic(self, value): def test_remove_ip_from_nic(self, value):
""" Remove secondary IP from NIC of a VM""" """ Remove secondary IP from NIC of a VM"""
@ -274,9 +271,6 @@ class TestBasicOperations(cloudstackTestCase):
self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id) self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id)
self.cleanup.append(self.account) self.cleanup.append(self.account)
if(shouldTestBeSkipped(networkType=value, zoneType=self.mode)):
self.skipTest("Skipping test as %s network is not supported in basic zone" % value)
network = createNetwork(self, value) network = createNetwork(self, value)
try: try:
@ -303,7 +297,7 @@ class TestBasicOperations(cloudstackTestCase):
self.debug("Removing invalid IP failed as expected with Exception %s" % e) self.debug("Removing invalid IP failed as expected with Exception %s" % e)
return return
@attr(tags=["basic","advanced"]) @attr(tags=["advanced"])
def test_remove_invalid_ip(self): def test_remove_invalid_ip(self):
""" Remove invalid ip""" """ Remove invalid ip"""
@ -321,7 +315,7 @@ class TestBasicOperations(cloudstackTestCase):
return return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK) @data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
@attr(tags=["basic","advanced"]) @attr(tags=["advanced"])
def test_list_nics(self, value): def test_list_nics(self, value):
"""Test listing nics associated with the ip address""" """Test listing nics associated with the ip address"""
@ -348,9 +342,6 @@ class TestBasicOperations(cloudstackTestCase):
self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id) self.account = Account.create(self.apiclient,self.services["account"],domainid=self.domain.id)
self.cleanup.append(self.account) self.cleanup.append(self.account)
if(shouldTestBeSkipped(networkType=value, zoneType=self.mode)):
self.skipTest("Skipping test as %s network is not supported in basic zone" % value)
network = createNetwork(self, value) network = createNetwork(self, value)
try: try:
@ -403,7 +394,7 @@ class TestBasicOperations(cloudstackTestCase):
return return
@data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK) @data(ISOLATED_NETWORK, SHARED_NETWORK, VPC_NETWORK)
@attr(tags=["basic","advanced"]) @attr(tags=["advanced"])
def test_operations_non_root_admin_api_client(self, value): def test_operations_non_root_admin_api_client(self, value):
"""Test basic operations using non root admin apii client""" """Test basic operations using non root admin apii client"""
@ -428,9 +419,6 @@ class TestBasicOperations(cloudstackTestCase):
apiclient = self.testClient.getUserApiClient(UserName=self.account.name, DomainName=self.account.domain) apiclient = self.testClient.getUserApiClient(UserName=self.account.name, DomainName=self.account.domain)
if(shouldTestBeSkipped(networkType=value, zoneType=self.mode)):
self.skipTest("Skipping test as %s network is not supported in basic zone" % value)
network = createNetwork(self, value) network = createNetwork(self, value)
try: try: