apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-5674: Remove assigning accountname which was useless

Browse Source
This commit is contained in:
Girish Shilamkar 2014-04-10 17:49:39 +05:30
parent f866bb21e6
commit ef9471692d
9 changed files with 9 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/integration/smoke/test_affinity_groups.py
View File

@ -60,16 +60,13 @@ class TestDeployVmWithAffinityGroup(cloudstackTestCase):
cls.services["account"], cls.services["account"],
domainid=cls.domain.id domainid=cls.domain.id
) )
cls.services["account"] = cls.account.name
cls.service_offering = ServiceOffering.create( cls.service_offering = ServiceOffering.create(
cls.apiclient, cls.apiclient,
cls.services["service_offerings"] cls.services["service_offerings"]
) )
cls.ag = AffinityGroup.create(cls.apiclient, cls.services["virtual_machine"]["affinity"], cls.ag = AffinityGroup.create(cls.apiclient, cls.services["virtual_machine"]["affinity"],
account=cls.services["account"], domainid=cls.domain.id) account=cls.account.name, domainid=cls.domain.id)
cls._cleanup = [ cls._cleanup = [
cls.service_offering, cls.service_offering,

1
test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py
View File

@ -54,7 +54,6 @@ class TestDeployVmWithVariedPlanners(cloudstackTestCase):
cls.services["account"], cls.services["account"],
domainid=cls.domain.id domainid=cls.domain.id
) )
cls.services["account"] = cls.account.name
cls.hosts = Host.list(cls.apiclient, type='Routing') cls.hosts = Host.list(cls.apiclient, type='Routing')
cls.clusters = Cluster.list(cls.apiclient) cls.clusters = Cluster.list(cls.apiclient)
cls.cleanup = [ cls.cleanup = [

1
test/integration/smoke/test_iso.py
View File

@ -163,7 +163,6 @@ class TestISO(cloudstackTestCase):
cls.services["account"], cls.services["account"],
domainid=cls.domain.id domainid=cls.domain.id
) )
cls.services["account"] = cls.account.name
# Finding the OsTypeId from Ostype # Finding the OsTypeId from Ostype
ostypes = list_os_types( ostypes = list_os_types(
cls.apiclient, cls.apiclient,

4
test/integration/smoke/test_pvlan.py
View File

@ -78,6 +78,4 @@ class TestPVLAN(cloudstackTestCase):
createNetworkCmd.endipv6="fc00:1234::20" createNetworkCmd.endipv6="fc00:1234::20"
err = 0 err = 0
createNetworkResponse = self.apiClient.createNetwork(createNetworkCmd) createNetworkResponse = self.apiClient.createNetwork(createNetworkCmd)
#FIXME: add assert for proper response self.assertEqual(createNetworkResponse, FAILED, "Creating PVLAN with IPv6 should fail")

3
test/integration/smoke/test_snapshots.py
View File

@ -55,9 +55,6 @@ class TestSnapshotRootDisk(cloudstackTestCase):
cls.services["account"], cls.services["account"],
domainid=cls.domain.id domainid=cls.domain.id
) )
cls.services["account"] = cls.account.name
cls.service_offering = ServiceOffering.create( cls.service_offering = ServiceOffering.create(
cls.apiclient, cls.apiclient,
cls.services["service_offerings"] cls.services["service_offerings"]

5
test/integration/smoke/test_templates.py
View File

@ -88,8 +88,6 @@ class TestCreateTemplate(cloudstackTestCase):
cls.services["account"], cls.services["account"],
domainid=cls.domain.id domainid=cls.domain.id
) )
cls.services["account"] = cls.account.name
cls.service_offering = ServiceOffering.create( cls.service_offering = ServiceOffering.create(
cls.apiclient, cls.apiclient,
cls.services["service_offerings"] cls.services["service_offerings"]
@ -274,9 +272,6 @@ class TestTemplates(cloudstackTestCase):
cls.services["account"], cls.services["account"],
domainid=cls.domain.id domainid=cls.domain.id
) )
cls.services["account"] = cls.account.name
cls.service_offering = ServiceOffering.create( cls.service_offering = ServiceOffering.create(
cls.apiclient, cls.apiclient,
cls.services["service_offerings"] cls.services["service_offerings"]

2
test/integration/smoke/test_vm_snapshots.py
View File

@ -55,8 +55,6 @@ class TestVmSnapshot(cloudstackTestCase):
domainid=cls.domain.id domainid=cls.domain.id
) )
cls.services["account"] = cls.account.name
cls.service_offering = ServiceOffering.create( cls.service_offering = ServiceOffering.create(
cls.apiclient, cls.apiclient,
cls.services["service_offerings"] cls.services["service_offerings"]

6
test/integration/smoke/test_volumes.py
View File

@ -74,8 +74,6 @@ class TestCreateVolume(cloudstackTestCase):
cls.services["account"], cls.services["account"],
domainid=cls.domain.id domainid=cls.domain.id
) )
cls.services["account"] = cls.account.name
cls.service_offering = ServiceOffering.create( cls.service_offering = ServiceOffering.create(
cls.apiclient, cls.apiclient,
cls.services["service_offerings"] cls.services["service_offerings"]
@ -193,7 +191,7 @@ class TestCreateVolume(cloudstackTestCase):
reconnect=True reconnect=True
) )
ret = checkVolumeSize(ssh_handle=ssh,size_to_verify=vol_sz) ret = checkVolumeSize(ssh_handle=ssh,size_to_verify=vol_sz)
self.debug(" Volume Size Expected %s Actual :%s" %(vol_sz,ret[1])) self.debug(" Volume Size Expected %s Actual :%s" %(vol_sz,ret[1]))
self.virtual_machine.detach_volume(self.apiClient, volume) self.virtual_machine.detach_volume(self.apiClient, volume)
self.assertEqual(ret[0],SUCCESS,"Check if promised disk size actually available") self.assertEqual(ret[0],SUCCESS,"Check if promised disk size actually available")
time.sleep(self.services["sleep"]) time.sleep(self.services["sleep"])
@ -259,8 +257,6 @@ class TestVolumes(cloudstackTestCase):
cls.services["account"], cls.services["account"],
domainid=cls.domain.id domainid=cls.domain.id
) )
cls.services["account"] = cls.account.name
cls.service_offering = ServiceOffering.create( cls.service_offering = ServiceOffering.create(
cls.apiclient, cls.apiclient,
cls.services["service_offerings"] cls.services["service_offerings"]

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

@ -7,8 +7,8 @@ test_data = {
"zone": "NA", "zone": "NA",
"hypervisor": "XenServer", "hypervisor": "XenServer",
"vdomain": { "name": "domain" }, "vdomain": { "name": "domain" },
"email" : "test@test.com", "email" : "test@test.com",
"gateway" : "172.1.1.1", "gateway" : "172.1.1.1",
"netmask" : "255.255.255.0", "netmask" : "255.255.255.0",
"startip" : "172.1.1.10", "startip" : "172.1.1.10",
"endip" : "172.1.1.20", "endip" : "172.1.1.20",
@ -382,8 +382,10 @@ test_data = {
}, },
"securitygroupenabled": "true" "securitygroupenabled": "true"
}, },
"vlan_range": "4090-4091", "portableiprange_vlan": {
"vlan":"4444", "part": ["4090-4091", "4092-4095"],
"full": "4090-4095"
},
"nfs": { "nfs": {
"url": "nfs://nfs/export/automation/1/testprimary", "url": "nfs://nfs/export/automation/1/testprimary",
"name": "Primary XEN" "name": "Primary XEN"