Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 24C1F178F2 for ; Tue, 21 Oct 2014 14:57:09 +0000 (UTC) Received: (qmail 62222 invoked by uid 500); 21 Oct 2014 14:56:41 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 62174 invoked by uid 500); 21 Oct 2014 14:56:41 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 60918 invoked by uid 99); 21 Oct 2014 14:56:40 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 21 Oct 2014 14:56:40 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 212988B7565; Tue, 21 Oct 2014 14:56:40 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: kishan@apache.org To: commits@cloudstack.apache.org Date: Tue, 21 Oct 2014 14:57:23 -0000 Message-Id: <4ee520e773e54eba9cf564cde230ba34@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [45/50] [abbrv] git commit: updated refs/heads/baremetal-systemvm to 23482b1 Adding new test which would verify the fix for issue "The ISO/Template is automatically deleted after URL expires" Signed-off-by: sanjeev Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a1b913db Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a1b913db Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a1b913db Branch: refs/heads/baremetal-systemvm Commit: a1b913db2a35086964f78234cb982d3efceab957 Parents: 622041b Author: sanjeev Authored: Thu Sep 25 15:31:54 2014 +0530 Committer: sanjeev Committed: Fri Oct 17 18:04:35 2014 +0530 ---------------------------------------------------------------------- .../smoke/misc/test_escalations_templates.py | 211 +++++++++++++++++++ 1 file changed, 211 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1b913db/test/integration/smoke/misc/test_escalations_templates.py ---------------------------------------------------------------------- diff --git a/test/integration/smoke/misc/test_escalations_templates.py b/test/integration/smoke/misc/test_escalations_templates.py new file mode 100644 index 0000000..40a983b --- /dev/null +++ b/test/integration/smoke/misc/test_escalations_templates.py @@ -0,0 +1,211 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +#Test from the Marvin - Testing in Python wiki + +#All tests inherit from cloudstackTestCase +from marvin.cloudstackTestCase import cloudstackTestCase + +#Import Integration Libraries + +#base - contains all resources as entities and defines create, delete, list operations on them +from marvin.lib.base import ( + Account, + VirtualMachine, + Volume, + ServiceOffering, + Configurations, + DiskOffering, + Template) + +#utils - utility classes for common cleanup, external library wrappers etc +from marvin.lib.utils import cleanup_resources, validateList + +#common - commonly used methods for all tests are listed here +from marvin.lib.common import get_zone, get_domain, get_template +from marvin.codes import PASS + +from nose.plugins.attrib import attr +import time + + +class TestTemplates(cloudstackTestCase): + + @classmethod + def setUpClass(cls): + try: + cls._cleanup = [] + cls.testClient = super(TestTemplates, cls).getClsTestClient() + cls.api_client = cls.testClient.getApiClient() + cls.services = cls.testClient.getParsedTestDataConfig() + # Get Domain, Zone, Template + cls.domain = get_domain(cls.api_client) + cls.zone = get_zone( + cls.api_client, + cls.testClient.getZoneForTests()) + cls.template = get_template( + cls.api_client, + cls.zone.id, + cls.services["ostype"] + ) + cls.services["template"]["ostypeid"] = cls.template.ostypeid + cls.services["template"]["isextractable"] = 'True' + if cls.zone.localstorageenabled: + cls.storagetype = 'local' + cls.services["service_offerings"][ + "tiny"]["storagetype"] = 'local' + cls.services["disk_offering"]["storagetype"] = 'local' + else: + cls.storagetype = 'shared' + cls.services["service_offerings"][ + "tiny"]["storagetype"] = 'shared' + cls.services["disk_offering"]["storagetype"] = 'shared' + + cls.services['mode'] = cls.zone.networktype + cls.services["virtual_machine"][ + "hypervisor"] = cls.testClient.getHypervisorInfo() + cls.services["virtual_machine"]["zoneid"] = cls.zone.id + cls.services["virtual_machine"]["template"] = cls.template.id + cls.services["custom_volume"]["zoneid"] = cls.zone.id + # Creating Disk offering, Service Offering and Account + cls.disk_offering = DiskOffering.create( + cls.api_client, + cls.services["disk_offering"] + ) + cls.service_offering = ServiceOffering.create( + cls.api_client, + cls.services["service_offerings"]["tiny"] + ) + cls.account = Account.create( + cls.api_client, + cls.services["account"], + domainid=cls.domain.id + ) + # Getting authentication for user in newly created Account + cls.user = cls.account.user[0] + cls.userapiclient = cls.testClient.getUserApiClient(cls.user.username, cls.domain.name) + cls._cleanup.append(cls.disk_offering) + cls._cleanup.append(cls.service_offering) + cls._cleanup.append(cls.account) + except Exception as e: + cls.tearDownClass() + raise Exception("Warning: Exception in setup : %s" % e) + return + + @classmethod + def tearDownClass(cls): + try: + cleanup_resources(cls.api_client, cls._cleanup) + except Exception as e: + raise Exception("Warning: Exception during cleanup : %s" % e) + + def setUp(self): + self.apiClient = self.testClient.getApiClient() + self.cleanup = [] + return + + def tearDown(self): + #Clean up, terminate the created volumes + cleanup_resources(self.apiClient, self.cleanup) + return + + @attr(tags=["advanced", "advancedsg", "sg"], required_hardware='true') + def test01_template_download_URL_expire(self): + """ + @Desc:Template files are deleted from secondary storage after download URL expires + Step1:Deploy vm with default cent os template + Step2:Stop the vm + Step3:Create template from the vm's root volume + Step4:Extract Template and wait for the download url to expire + Step5:Deploy another vm with the template created at Step3 + Step6:Verify that vm deployment succeeds + """ + params = ['extract.url.expiration.interval', 'extract.url.cleanup.interval'] + wait_time = 0 + for param in params: + config = Configurations.list( + self.apiClient, + name=param, + ) + self.assertEqual(validateList(config)[0], PASS, "Config list returned invalid response") + wait_time = wait_time+int(config[0].value) + self.debug("Total wait time for url expiry: %s" % wait_time) + # Creating Virtual Machine + self.virtual_machine = VirtualMachine.create( + self.userapiclient, + self.services["virtual_machine"], + accountid=self.account.name, + domainid=self.account.domainid, + serviceofferingid=self.service_offering.id, + ) + self.assertIsNotNone(self.virtual_machine, "Virtual Machine creation failed") + self.cleanup.append(self.virtual_machine) + #Stop virtual machine + self.virtual_machine.stop(self.userapiclient) + list_volume = Volume.list( + self.userapiclient, + virtualmachineid=self.virtual_machine.id, + type='ROOT', + listall=True + ) + self.assertEqual(validateList(list_volume)[0], + PASS, + "list volumes with type ROOT returned invalid list" + ) + self.volume = list_volume[0] + self.create_template = Template.create( + self.userapiclient, + self.services["template"], + volumeid=self.volume.id, + account=self.account.name, + domainid=self.account.domainid + ) + self.assertIsNotNone(self.create_template, "Failed to create template from root volume") + self.cleanup.append(self.create_template) + """ + Extract template + """ + try: + Template.extract( + self.userapiclient, + self.create_template.id, + 'HTTP_DOWNLOAD', + self.zone.id + ) + except Exception as e: + self.fail("Extract template failed with error %s" % e) + self.debug("Waiting for %s seconds for url to expire" % repr(wait_time+20)) + time.sleep(wait_time+20) + self.debug("Waited for %s seconds for url to expire" % repr(wait_time+20)) + """ + Deploy vm with the template created from the volume. After url expiration interval only + url should be deleted not the template. To validate this deploy vm with the template + """ + try: + self.vm = VirtualMachine.create( + self.userapiclient, + self.services["virtual_machine"], + accountid=self.account.name, + domainid=self.account.domainid, + serviceofferingid=self.service_offering.id, + templateid=self.create_template.id + ) + self.cleanup.append(self.vm) + except Exception as e: + self.fail("Template is automatically deleted after URL expired.\ + So vm deployment failed with error: %s" % e) + return