Skip to content

Commit ef94716

Browse files
author
Girish Shilamkar
committed
CLOUDSTACK-5674: Remove assigning accountname which was useless
1 parent f866bb2 commit ef94716

9 files changed

Lines changed: 9 additions & 28 deletions

File tree

‎test/integration/smoke/test_affinity_groups.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,13 @@ def setUpClass(cls):
6060
cls.services["account"],
6161
domainid=cls.domain.id
6262
)
63-
64-
cls.services["account"] = cls.account.name
65-
6663
cls.service_offering = ServiceOffering.create(
6764
cls.apiclient,
6865
cls.services["service_offerings"]
6966
)
7067

7168
cls.ag = AffinityGroup.create(cls.apiclient, cls.services["virtual_machine"]["affinity"],
72-
account=cls.services["account"], domainid=cls.domain.id)
69+
account=cls.account.name, domainid=cls.domain.id)
7370

7471
cls._cleanup = [
7572
cls.service_offering,

‎test/integration/smoke/test_deploy_vms_with_varied_deploymentplanners.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ def setUpClass(cls):
5454
cls.services["account"],
5555
domainid=cls.domain.id
5656
)
57-
cls.services["account"] = cls.account.name
5857
cls.hosts = Host.list(cls.apiclient, type='Routing')
5958
cls.clusters = Cluster.list(cls.apiclient)
6059
cls.cleanup = [

‎test/integration/smoke/test_iso.py‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,6 @@ def setUpClass(cls):
163163
cls.services["account"],
164164
domainid=cls.domain.id
165165
)
166-
cls.services["account"] = cls.account.name
167166
# Finding the OsTypeId from Ostype
168167
ostypes = list_os_types(
169168
cls.apiclient,

‎test/integration/smoke/test_pvlan.py‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,4 @@ def test_create_pvlan_network(self):
7878
createNetworkCmd.endipv6="fc00:1234::20"
7979
err = 0
8080
createNetworkResponse = self.apiClient.createNetwork(createNetworkCmd)
81-
#FIXME: add assert for proper response
82-
83-
81+
self.assertEqual(createNetworkResponse, FAILED, "Creating PVLAN with IPv6 should fail")

‎test/integration/smoke/test_snapshots.py‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@ def setUpClass(cls):
5555
cls.services["account"],
5656
domainid=cls.domain.id
5757
)
58-
59-
cls.services["account"] = cls.account.name
60-
6158
cls.service_offering = ServiceOffering.create(
6259
cls.apiclient,
6360
cls.services["service_offerings"]

‎test/integration/smoke/test_templates.py‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ def setUpClass(cls):
8888
cls.services["account"],
8989
domainid=cls.domain.id
9090
)
91-
cls.services["account"] = cls.account.name
92-
9391
cls.service_offering = ServiceOffering.create(
9492
cls.apiclient,
9593
cls.services["service_offerings"]
@@ -274,9 +272,6 @@ def setUpClass(cls):
274272
cls.services["account"],
275273
domainid=cls.domain.id
276274
)
277-
278-
cls.services["account"] = cls.account.name
279-
280275
cls.service_offering = ServiceOffering.create(
281276
cls.apiclient,
282277
cls.services["service_offerings"]

‎test/integration/smoke/test_vm_snapshots.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,6 @@ def setUpClass(cls):
5555
domainid=cls.domain.id
5656
)
5757

58-
cls.services["account"] = cls.account.name
59-
6058
cls.service_offering = ServiceOffering.create(
6159
cls.apiclient,
6260
cls.services["service_offerings"]

‎test/integration/smoke/test_volumes.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,6 @@ def setUpClass(cls):
7474
cls.services["account"],
7575
domainid=cls.domain.id
7676
)
77-
78-
cls.services["account"] = cls.account.name
7977
cls.service_offering = ServiceOffering.create(
8078
cls.apiclient,
8179
cls.services["service_offerings"]
@@ -193,7 +191,7 @@ def test_01_create_volume(self):
193191
reconnect=True
194192
)
195193
ret = checkVolumeSize(ssh_handle=ssh,size_to_verify=vol_sz)
196-
self.debug(" Volume Size Expected %s Actual :%s" %(vol_sz,ret[1]))
194+
self.debug(" Volume Size Expected %s Actual :%s" %(vol_sz,ret[1]))
197195
self.virtual_machine.detach_volume(self.apiClient, volume)
198196
self.assertEqual(ret[0],SUCCESS,"Check if promised disk size actually available")
199197
time.sleep(self.services["sleep"])
@@ -259,8 +257,6 @@ def setUpClass(cls):
259257
cls.services["account"],
260258
domainid=cls.domain.id
261259
)
262-
263-
cls.services["account"] = cls.account.name
264260
cls.service_offering = ServiceOffering.create(
265261
cls.apiclient,
266262
cls.services["service_offerings"]

‎tools/marvin/marvin/config/test_data.py‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
"zone": "NA",
88
"hypervisor": "XenServer",
99
"vdomain": { "name": "domain" },
10-
"email" : "test@test.com",
11-
"gateway" : "172.1.1.1",
10+
"email" : "test@test.com",
11+
"gateway" : "172.1.1.1",
1212
"netmask" : "255.255.255.0",
1313
"startip" : "172.1.1.10",
1414
"endip" : "172.1.1.20",
@@ -382,8 +382,10 @@
382382
},
383383
"securitygroupenabled": "true"
384384
},
385-
"vlan_range": "4090-4091",
386-
"vlan":"4444",
385+
"portableiprange_vlan": {
386+
"part": ["4090-4091", "4092-4095"],
387+
"full": "4090-4095"
388+
},
387389
"nfs": {
388390
"url": "nfs://nfs/export/automation/1/testprimary",
389391
"name": "Primary XEN"

0 commit comments

Comments
 (0)