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

CLOUDSTACK-7389: fix for the script bugs CLOUDSTACK-7389, CLOUDSTACK-7390 and few

Browse Source 
other fixes.
This commit is contained in:
SrikanteswaraRao Talluri 2014-09-04 16:53:25 +05:30
parent a958730b39
commit aa64d8b3e7
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
test/integration/component/maint/test_bugs.py
View File

@ -37,14 +37,6 @@ class Test42xBugsMgmtSvr(cloudstackTestCase):
cls.testClient = super(Test42xBugsMgmtSvr, cls).getClsTestClient()
cls.apiClient = cls.api_client = cls.testClient.getApiClient()
cls.services = cls.testClient.getParsedTestDataConfig()
cls.services["win2012template"] = {
"displaytext": "win2012",
"name": "win2012",
"passwordenabled": False,
"url": "http://nfs1.lab.vmops.com/templates/vmware/new-test-win.ova",
"format": "OVA",
"ostype": "Windows 8 (64-bit)",
}
cls.hypervisor = cls.testClient.getHypervisorInfo()
# Get Domain, Zone, Template
cls.domain = get_domain(cls.api_client)
@ -333,6 +325,7 @@ class Test42xBugsMgmtSvr(cloudstackTestCase):
self.domain_userapiclient = self.testClient.getUserApiClient(self.domain_user.username, self.newdomain.name)
# Step2: Register a template as Domain admin.
self.services["templateregister"]["ostype"] = self.services["ostype"]
self.domain_template = Template.register(
self.apiClient,
self.services["templateregister"],
@ -549,7 +542,7 @@ class Test42xBugsMgmtSvr(cloudstackTestCase):
self.services["virtual_machine"]["template"] = self.win2012_template.id
vm1 = VirtualMachine.create(
self.apiClient,
self.services["virtual_machine2"],
self.services["virtual_machine"],
accountid=self.account.name,
domainid=self.account.domainid,
serviceofferingid=self.service_offering.id,

9
tools/marvin/marvin/config/test_data.py
View File

@ -773,13 +773,20 @@ test_data = {
"templatefilter": "self"
},
"templatefilter": 'self',
"templates": {
"displaytext": 'Template',
"name": 'Template',
"ostype": "CentOS 5.3 (64-bit)",
"templatefilter": 'self',
},
"win2012template": {
"displaytext": "win2012",
"name": "win2012",
"passwordenabled": False,
"url": "http://nfs1.lab.vmops.com/templates/vmware/new-test-win.ova",
"format": "OVA",
"ostype": "Windows 8 (64-bit)",
},
"templateregister": {
"displaytext": "xs",
"name": "xs",