Fixup e2e test_restore_vm (#9025)

* Fixup e2e test_restore_vm

* Fix template's size attribute

* Resolve comments
This commit is contained in:
Vishesh 2024-05-07 03:32:36 +05:30 committed by GitHub
parent f80d205284
commit 87e7c57d08
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -32,6 +32,7 @@ class TestRestoreVM(cloudstackTestCase):
testClient = super(TestRestoreVM, cls).getClsTestClient() testClient = super(TestRestoreVM, cls).getClsTestClient()
cls.apiclient = testClient.getApiClient() cls.apiclient = testClient.getApiClient()
cls.services = testClient.getParsedTestDataConfig() cls.services = testClient.getParsedTestDataConfig()
cls._cleanup = []
# Get Zone, Domain and templates # Get Zone, Domain and templates
cls.domain = get_domain(cls.apiclient) cls.domain = get_domain(cls.apiclient)
@ -42,16 +43,21 @@ class TestRestoreVM(cloudstackTestCase):
cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["virtual_machine"]["zoneid"] = cls.zone.id
cls.service_offering = ServiceOffering.create(cls.apiclient, cls.services["service_offering"]) cls.service_offering = ServiceOffering.create(cls.apiclient, cls.services["service_offering"])
cls._cleanup.append(cls.service_offering)
cls.template_t1 = Template.register(cls.apiclient, cls.services["test_templates"][ template_t1 = Template.register(cls.apiclient, cls.services["test_templates"][
cls.hypervisor.lower() if cls.hypervisor.lower() != 'simulator' else 'xenserver'], cls.hypervisor.lower() if cls.hypervisor.lower() != 'simulator' else 'xenserver'],
zoneid=cls.zone.id, hypervisor=cls.hypervisor.lower()) zoneid=cls.zone.id, hypervisor=cls.hypervisor.lower())
cls._cleanup.append(template_t1)
template_t1.download(cls.apiclient)
cls.template_t1 = Template.list(cls.apiclient, templatefilter='all', id=template_t1.id)[0]
cls.template_t2 = Template.register(cls.apiclient, cls.services["test_templates"][ template_t2 = Template.register(cls.apiclient, cls.services["test_templates"][
cls.hypervisor.lower() if cls.hypervisor.lower() != 'simulator' else 'xenserver'], cls.hypervisor.lower() if cls.hypervisor.lower() != 'simulator' else 'xenserver'],
zoneid=cls.zone.id, hypervisor=cls.hypervisor.lower()) zoneid=cls.zone.id, hypervisor=cls.hypervisor.lower())
cls._cleanup.append(template_t2)
cls._cleanup = [cls.service_offering, cls.template_t1, cls.template_t2] template_t2.download(cls.apiclient)
cls.template_t2 = Template.list(cls.apiclient, templatefilter='all', id=template_t2.id)[0]
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):