Return-Path: X-Original-To: apmail-cloudstack-dev-archive@www.apache.org Delivered-To: apmail-cloudstack-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 7FD11184A4 for ; Fri, 24 Apr 2015 06:07:18 +0000 (UTC) Received: (qmail 65397 invoked by uid 500); 24 Apr 2015 06:07:18 -0000 Delivered-To: apmail-cloudstack-dev-archive@cloudstack.apache.org Received: (qmail 65339 invoked by uid 500); 24 Apr 2015 06:07:18 -0000 Mailing-List: contact dev-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 dev@cloudstack.apache.org Received: (qmail 65328 invoked by uid 99); 24 Apr 2015 06:07:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 24 Apr 2015 06:07:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B7D57E17DB; Fri, 24 Apr 2015 06:07:17 +0000 (UTC) From: gauravaradhye To: dev@cloudstack.apache.org Reply-To: dev@cloudstack.apache.org References: In-Reply-To: Subject: [GitHub] cloudstack pull request: To Verfiy that list templates by domain a... Content-Type: text/plain Message-Id: <20150424060717.B7D57E17DB@git1-us-west.apache.org> Date: Fri, 24 Apr 2015 06:07:17 +0000 (UTC) Github user gauravaradhye commented on a diff in the pull request: https://github.com/apache/cloudstack/pull/189#discussion_r29025564 --- Diff: test/integration/component/test_escalation_listTemplateDomainAdmin.py --- @@ -0,0 +1,157 @@ + +# 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. + +from marvin.cloudstackTestCase import cloudstackTestCase +from marvin.lib.base import (Account, + Domain, Template + ) +from marvin.lib.utils import (cleanup_resources) +from marvin.lib.common import (get_zone, get_builtin_template_info) +from nose.plugins.attrib import attr +import time + + +class TestlistTemplatesDomainAdmin(cloudstackTestCase): + + @classmethod + def setUpClass(cls): + + testClient = super( + TestlistTemplatesDomainAdmin, cls).getClsTestClient() + cls.apiclient = testClient.getApiClient() + cls.testdata = testClient.getParsedTestDataConfig() + cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests()) + cls.hypervisor = cls.testClient.getHypervisorInfo() + builtin_info = get_builtin_template_info(cls.apiclient, cls.zone.id) + cls.testdata["privatetemplate"]["url"] = builtin_info[0] + cls.testdata["privatetemplate"]["hypervisor"] = builtin_info[1] + cls.testdata["privatetemplate"]["format"] = builtin_info[2] + cls.cleanup = [] + +# Create 2 domain admin accounts + + cls.domain1 = Domain.create( + cls.apiclient, + cls.testdata["domain"]) + + cls.domain2 = Domain.create( + cls.apiclient, + cls.testdata["domain"]) + + cls.account1 = Account.create( + cls.apiclient, + cls.testdata["account"], + admin=True, + domainid=cls.domain1.id) + + cls.account2 = Account.create( + cls.apiclient, + cls.testdata["account2"], + admin=True, + domainid=cls.domain2.id) + + cls.debug("Created account %s in domain %s" % + (cls.account1.name, cls.domain1.id)) + cls.debug("Created account %s in domain %s" % + (cls.account2.name, cls.domain2.id)) + + cls.cleanup.append(cls.account1) + cls.cleanup.append(cls.account2) + cls.cleanup.append(cls.domain1) + cls.cleanup.append(cls.domain2) + + @classmethod + def tearDownClass(cls): + try: + # Cleanup resources used + cleanup_resources(cls.apiclient, cls.cleanup) + + except Exception as e: + raise Exception("Warning: Exception during cleanup : %s" % e) + return + +# test that the template register under root/domain1->account1 is not +# listed under root/domain2->account2 + + @attr(tags=["advanced", "basic"], required_hardware="true") + def test_listtemplate(self): + + # Register template under one domain admin(root/domain1->account 1) + + template_register = Template.register( + self.apiclient, + self.testdata["privatetemplate"], + zoneid=self.zone.id, + hypervisor=self.hypervisor, + account=self.account1.name, + domainid=self.domain1.id) + + template_register.download(self.apiclient) + # self.cleanup.append(self.template_register) + + time.sleep(self.testdata["sleep"]) + timeout = self.testdata["timeout"] + while True: + listTemplateResponse = Template.list( + self.apiclient, + templatefilter="all", + id=template_register.id, + account=self.account1.name, + domainid=self.domain1.id + ) + if isinstance(listTemplateResponse, list): + break + elif timeout == 0: + raise Exception("list template failed") + + time.sleep(10) + timeout = timeout - 1 + + self.assertEqual( + isinstance(listTemplateResponse, list), + True, + "Check for list template response return valid data") + + self.assertNotEqual( + len(listTemplateResponse), + 0, + "Check template available in List Templates") + + template_response = listTemplateResponse[0] + self.assertEqual( + template_response.isready, + True, + "Template state is not ready, it is %s" % template_response.isready + ) + + listtemplate = Template.list( + self.apiclient, + zoneid=self.zone.id, + hypervisor=self.hypervisor, + account=self.account2.name, + domainid=self.account2.domainid, + templatefilter=self.testdata["templatefilter"] + + ) + + self.assertEqual( + listtemplate, + None, + "Check templates are not listed" + ) + return --- End diff -- All other changes looks good. --- If your project is set up for it, you can reply to this email and have your reply appear on GitHub as well. If your project does not have this feature enabled and wishes so, or if the feature is enabled but not working, please contact infrastructure at infrastructure@apache.org or file a JIRA ticket with INFRA. ---