mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
a13231226c
templates of all domains Bug has been fixed considering below points 1. templatefilter=all or isofilter=all is applicable only to admin and domain admin. 2. With templatefilter=all or isofilter=all below are the visiblity of templates in system. a. admin should be able to see all templates/iso in system. b. domain admin should be able to see all public template and templates under its domain tree (including sub domain). c. domain admin in a project context should be able to see all public templates and templates registered as project account and templates which are shared(using updateTemplatePermission api) with project account. Modified "test/integration/component/test_escalation_listTemplateDomainAdmin.py" This marvin test is written for this scenario but for the second account "templatefilter=all" is not used.
139 lines
4.7 KiB
Python
139 lines
4.7 KiB
Python
# 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, validateList)
|
|
from marvin.lib.common import (get_zone, get_builtin_template_info)
|
|
from nose.plugins.attrib import attr
|
|
from marvin.codes import PASS
|
|
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
|
|
)
|
|
status = validateList(listTemplateResponse)
|
|
self.assertEquals(
|
|
PASS,
|
|
status[0],
|
|
"Template creation failed")
|
|
|
|
listtemplate = Template.list(
|
|
self.apiclient,
|
|
zoneid=self.zone.id,
|
|
hypervisor=self.hypervisor,
|
|
account=self.account2.name,
|
|
domainid=self.account2.domainid,
|
|
templatefilter="all"
|
|
|
|
)
|
|
|
|
self.assertEqual(
|
|
listtemplate,
|
|
None,
|
|
"Check templates are not listed"
|
|
)
|
|
return
|