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

tests: Fix test failures for Local storage and Basic zones (#5106)

Browse Source 
tests: Fix test failures for Local storage and Basic (SG) zones

* Skip migrate vm when localstorage enabled
* Fix test_direct_download.py
* Skip test_03_create_network_domain_network_offering in basic zones
* Skip test_03_create_vpc_domain_vpc_offering in basic zones
* Skip test_01_add_primary_storage_disabled_host if localstorageenabled
This commit is contained in:
davidjumani 2021-07-01 09:45:21 +05:30 committed by GitHub
parent 7835c08120
commit 4645863b25
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
test/integration/smoke/test_direct_download.py
View File

@ -184,20 +184,28 @@ class TestDirectDownloadTemplates(cloudstackTestCase):
cls.services["service_offerings"]["tiny"]
)
cls._cleanup.append(cls.service_offering)
if cls.zone.networktype == 'Basic' :
networks = Network.list(cls.apiclient)
if len(networks) == 0 :
self.skipTest("Skipping test since no network found in basic zone")
else :
cls.network = networks[0]
else :
cls.network_offering = NetworkOffering.create(
cls.apiclient,
cls.services["l2-network_offering"],
)
cls._cleanup.append(cls.network_offering)
cls.network_offering.update(cls.apiclient, state='Enabled')
cls.services["network"]["networkoffering"] = cls.network_offering.id
cls.l2_network = Network.create(
cls.network = Network.create(
cls.apiclient,
cls.services["l2-network"],
zoneid=cls.zone.id,
networkofferingid=cls.network_offering.id
)
cls._cleanup.append(cls.l2_network)
cls._cleanup.append(cls.network_offering)
cls._cleanup.append(cls.network)
storage_pools = StoragePool.list(
cls.apiclient,
@ -221,11 +229,7 @@ class TestDirectDownloadTemplates(cloudstackTestCase):
@classmethod
def tearDownClass(cls):
try:
cleanup_resources(cls.apiclient, cls._cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestDirectDownloadTemplates, cls).tearDownClass()
def setUp(self):
self.apiclient = self.testClient.getApiClient()
@ -234,11 +238,7 @@ class TestDirectDownloadTemplates(cloudstackTestCase):
return
def tearDown(self):
try:
cleanup_resources(self.apiclient, self.cleanup)
except Exception as e:
raise Exception("Warning: Exception during cleanup : %s" % e)
return
super(TestDirectDownloadTemplates, self).tearDown()
def getCurrentStoragePoolTags(self, poolId):
local_pool = StoragePool.list(
@ -269,6 +269,22 @@ class TestDirectDownloadTemplates(cloudstackTestCase):
tags=tags
)
def deployVM(self, offering) :
if self.zone.networktype == 'Basic' :
vm = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
serviceofferingid=offering.id
)
else :
vm = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
serviceofferingid=offering.id,
networkids=self.network.id
)
self.cleanup.append(vm)
return vm
@skipTestIf("nfsKvmNotAvailable")
@attr(tags=["advanced", "basic", "eip", "advancedns", "sg"], required_hardware="false")
@ -282,12 +298,7 @@ class TestDirectDownloadTemplates(cloudstackTestCase):
self.updateStoragePoolTags(self.nfsPoolId, test_tag)
nfs_storage_offering = self.createServiceOffering("TestNFSStorageDirectDownload", "shared", test_tag)
vm = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
serviceofferingid=nfs_storage_offering.id,
networkids=self.l2_network.id
)
vm = self.deployVM(nfs_storage_offering)
self.assertEqual(
vm.state,
"Running",
@ -296,7 +307,6 @@ class TestDirectDownloadTemplates(cloudstackTestCase):
# Revert storage tags for the storage pool used in this test
self.updateStoragePoolTags(self.nfsPoolId, tags)
self.cleanup.append(vm)
self.cleanup.append(nfs_storage_offering)
return
@ -313,12 +323,7 @@ class TestDirectDownloadTemplates(cloudstackTestCase):
local_storage_offering = self.createServiceOffering("TestLocalStorageDirectDownload", "local", test_tag)
# Deploy VM
vm = VirtualMachine.create(
self.apiclient,
self.services["virtual_machine"],
serviceofferingid=local_storage_offering.id,
networkids=self.l2_network.id,
)
vm = self.deployVM(local_storage_offering)
self.assertEqual(
vm.state,
"Running",
@ -327,7 +332,6 @@ class TestDirectDownloadTemplates(cloudstackTestCase):
# Revert storage tags for the storage pool used in this test
self.updateStoragePoolTags(self.localPoolId, tags)
self.cleanup.append(vm)
self.cleanup.append(local_storage_offering)
return

1
test/integration/smoke/test_domain_network_offerings.py
View File

@ -274,7 +274,6 @@ class TestDomainsNetworkOfferings(cloudstackTestCase):
@attr(
tags=[
"advanced",
"basic",
"eip",
"sg",
"advancedns",

1
test/integration/smoke/test_domain_vpc_offerings.py
View File

@ -319,7 +319,6 @@ class TestDomainsVpcOfferings(cloudstackTestCase):
@attr(
tags=[
"advanced",
"basic",
"eip",
"sg",
"advancedns",

3
test/integration/smoke/test_primary_storage.py
View File

@ -256,6 +256,9 @@ class TestPrimaryStorageServices(cloudstackTestCase):
"""Test add primary storage pool with disabled host
"""
if self.zone.localstorageenabled :
self.skipTest("Skipping since localstorageenabled")
# Disable a host
clusters = list_clusters(
self.apiclient,

3
test/integration/smoke/test_vm_life_cycle.py
View File

@ -613,6 +613,9 @@ class TestVMLifeCycle(cloudstackTestCase):
# 2. DeployVM on suitable host (with another host in the cluster)
# 3. Migrate the VM and assert migration successful
if self.zone.localstorageenabled :
self.skipTest("Migration is not supported on zones with local storage")
suitable_hosts = None
hosts = Host.list(