Skip to content

Commit 94fc4bf

Browse files
author
SrikanteswaraRao Talluri
committed
CLOUDSTACK-6316: fixes for bvt failures
1 parent ef94716 commit 94fc4bf

14 files changed

Lines changed: 47 additions & 67 deletions

‎test/integration/component/test_ip_reservation.py‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ def setUpClass(cls):
8484
cls.api_client = cls.testClient.getApiClient()
8585

8686
# Fill services from the external config file
87-
cls.services = cls.testClient.getConfigParser().parsedDict
87+
cls.services = cls.testClient.getParsedTestDataConfig()
8888

8989
# Get Zone, Domain and templates
9090
cls.domain = get_domain(cls.api_client)
@@ -532,7 +532,7 @@ def setUpClass(cls):
532532
cls.api_client = cls.testClient.getApiClient()
533533

534534
# Fill services from the external config file
535-
cls.services = cls.testClient.getConfigParser().parsedDict
535+
cls.services = cls.testClient.getParsedTestDataConfig()
536536

537537
# Get Zone, Domain and templates
538538
cls.domain = get_domain(cls.api_client)
@@ -657,7 +657,7 @@ def setUpClass(cls):
657657
cls.api_client = cls.testClient.getApiClient()
658658

659659
# Fill services from the external config file
660-
cls.services = cls.testClient.getConfigParser().parsedDict
660+
cls.services = cls.testClient.getParsedTestDataConfig()
661661

662662
# Get Zone, Domain and templates
663663
cls.domain = get_domain(cls.api_client)
@@ -807,7 +807,7 @@ def setUpClass(cls):
807807
cls.api_client = cls.testClient.getApiClient()
808808

809809
# Fill services from the external config file
810-
cls.services = cls.testClient.getConfigParser().parsedDict
810+
cls.services = cls.testClient.getParsedTestDataConfig()
811811

812812
# Get Zone, Domain and templates
813813
cls.domain = get_domain(cls.api_client)
@@ -977,7 +977,7 @@ def setUpClass(cls):
977977
cls.api_client = cls.testClient.getApiClient()
978978

979979
# Fill services from the external config file
980-
cls.services = cls.testClient.getConfigParser().parsedDict
980+
cls.services = cls.testClient.getParsedTestDataConfig()
981981

982982
# Get Zone, Domain and templates
983983
cls.domain = get_domain(cls.api_client)

‎test/integration/component/test_multiple_ips_per_nic.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def setUpClass(cls):
123123
cls.api_client = cls.testClient.getApiClient()
124124

125125
# Fill services from the external config file
126-
cls.services = cls.testClient.getConfigParser().parsedDict
126+
cls.services = cls.testClient.getParsedTestDataConfig()
127127

128128
# Get Zone, Domain and templates
129129
cls.domain = get_domain(cls.api_client)
@@ -474,7 +474,7 @@ def setUpClass(cls):
474474
cls.api_client = cls.testClient.getApiClient()
475475

476476
# Fill services from the external config file
477-
cls.services = cls.testClient.getConfigParser().parsedDict
477+
cls.services = cls.testClient.getParsedTestDataConfig()
478478

479479
# Get Zone, Domain and templates
480480
cls.domain = get_domain(cls.api_client)
@@ -849,7 +849,7 @@ def setUpClass(cls):
849849
cls.api_client = cls.testClient.getApiClient()
850850

851851
# Fill services from the external config file
852-
cls.services = cls.testClient.getConfigParser().parsedDict
852+
cls.services = cls.testClient.getParsedTestDataConfig()
853853

854854
# Get Zone, Domain and templates
855855
cls.domain = get_domain(cls.api_client)

‎test/integration/component/test_persistent_networks.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -926,7 +926,7 @@ def setUpClass(cls):
926926
cls.api_client = cls.testClient.getApiClient()
927927

928928
# Fill services from the external config file
929-
cls.services = cls.testClient.getConfigParser().parsedDict
929+
cls.services = cls.testClient.getParsedTestDataConfig()
930930

931931
# Get Zone, Domain and templates
932932
cls.domain = get_domain(cls.api_client)
@@ -1082,7 +1082,7 @@ def setUpClass(cls):
10821082
cls.api_client = cls.testClient.getApiClient()
10831083

10841084
# Fill services from the external config file
1085-
cls.services = cls.testClient.getConfigParser().parsedDict
1085+
cls.services = cls.testClient.getParsedTestDataConfig()
10861086

10871087
# Get Zone, Domain and templates
10881088
cls.domain = get_domain(cls.api_client)
@@ -1239,7 +1239,7 @@ def setUpClass(cls):
12391239
cls.api_client = cls.testClient.getApiClient()
12401240

12411241
# Fill services from the external config file
1242-
cls.services = cls.testClient.getConfigParser().parsedDict
1242+
cls.services = cls.testClient.getParsedTestDataConfig()
12431243

12441244
# Get Zone, Domain and templates
12451245
cls.domain = get_domain(cls.api_client)
@@ -1497,7 +1497,7 @@ def setUpClass(cls):
14971497
cls.api_client = cls.testClient.getApiClient()
14981498

14991499
# Fill services from the external config file
1500-
cls.services = cls.testClient.getConfigParser().parsedDict
1500+
cls.services = cls.testClient.getParsedTestDataConfig()
15011501

15021502
# Get Zone, Domain and templates
15031503
cls.domain = get_domain(cls.api_client)

‎test/integration/component/test_portable_ip.py‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ def test_create_portable_ip_range(self):
195195
# 1. Create new portable ip range with root admin api
196196
# 2. Portable ip range should be created successfully
197197

198-
portable_ip_range_services = get_portable_ip_range_services(self.services)
198+
portable_ip_range_services = self.services["portableIpRange"]
199199

200200
self.debug(portable_ip_range_services)
201201

@@ -239,7 +239,7 @@ def test_create_portable_ip_range_non_root_admin(self):
239239
DomainName=self.account.domain
240240
)
241241

242-
portable_ip_range_services = get_portable_ip_range_services(self.services)
242+
portable_ip_range_services = self.services["portableIpRange"]
243243

244244
if portable_ip_range_services is None:
245245
self.skipTest('Failed to read config values related to portable ip range')
@@ -261,7 +261,7 @@ def test_create_portable_ip_range_invalid_region(self):
261261
# 1. Try to create new portable ip range with invalid region id
262262
# 2. Portable ip range creation should fail
263263

264-
portable_ip_range_services = get_portable_ip_range_services(self.services)
264+
portable_ip_range_services = self.services["portableIpRange"]
265265

266266
if portable_ip_range_services is None:
267267
self.skipTest('Failed to read config values related to portable ip range')
@@ -315,7 +315,7 @@ def setUp(self):
315315
self.apiclient = self.testClient.getApiClient()
316316
self.dbclient = self.testClient.getDbConnection()
317317

318-
portable_ip_range_services = get_portable_ip_range_services(self.services)
318+
portable_ip_range_services = self.services["portableIpRange"]
319319

320320
if portable_ip_range_services is None:
321321
self.skipTest('Failed to read config values related to portable ip range')
@@ -490,7 +490,7 @@ def setUp(self):
490490
self.dbclient = self.testClient.getDbConnection()
491491

492492
#create new portable ip range
493-
self.portable_ip_range_services = get_portable_ip_range_services(self.services)
493+
self.portable_ip_range_services = self.services["portableIpRange"]
494494

495495
if self.portable_ip_range_services is None:
496496
self.skipTest('Failed to read config values related to portable ip range')
@@ -653,7 +653,7 @@ def setUp(self):
653653

654654
self.cleanup = []
655655

656-
portable_ip_range_services = get_portable_ip_range_services(self.services)
656+
portable_ip_range_services = self.services["PortableIpRange"]
657657

658658
if portable_ip_range_services is None:
659659
self.skipTest('Failed to read config values related to portable ip range')
@@ -997,7 +997,7 @@ def setUp(self):
997997
self.dbclient = self.testClient.getDbConnection()
998998
self.cleanup = []
999999

1000-
portable_ip_range_services = get_portable_ip_range_services(self.services)
1000+
portable_ip_range_services = self.services["portableIpRange"]
10011001

10021002
if portable_ip_range_services is None:
10031003
self.skipTest('Failed to read config values related to portable ip range')
@@ -1219,7 +1219,7 @@ def setUp(self):
12191219
)
12201220
self.cleanup = []
12211221

1222-
portable_ip_range_services = get_portable_ip_range_services(self.services)
1222+
portable_ip_range_services = self.services["portableIpRange"]
12231223

12241224
if portable_ip_range_services is None:
12251225
self.skipTest('Failed to read config values related to portable ip range')
@@ -1496,7 +1496,7 @@ def setUp(self):
14961496
self.dbclient = self.testClient.getDbConnection()
14971497

14981498
#create new portable ip range
1499-
self.portable_ip_range_services = get_portable_ip_range_services(self.services)
1499+
self.portable_ip_range_services = self.services["portableIpRange"]
15001500

15011501
if self.portable_ip_range_services is None:
15021502
self.skipTest('Failed to read config values related to portable ip range')

‎test/integration/component/test_region_vpc.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,12 +169,12 @@ def setUpClass(cls):
169169
cls.services['mode'] = cls.zone.networktype
170170

171171

172-
template = get_template(
172+
cls.template = get_template(
173173
cls.apiclient,
174174
cls.zone.id,
175175
cls.services["ostype"]
176176
)
177-
if template == FAILED:
177+
if cls.template == FAILED:
178178
assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
179179

180180

‎test/integration/component/test_tags.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -182,6 +182,7 @@ def setUpClass(cls):
182182
# Get Zone, Domain and templates
183183

184184
cls.zone = get_zone(cls.api_client, cls.testClient.getZoneForTests())
185+
cls.domain = get_domain(cls.api_client)
185186
cls.template = get_template(
186187
cls.api_client,
187188
cls.zone.id,

‎test/integration/component/test_vpc_distributed_routing_offering.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -163,12 +163,12 @@ def setUpClass(cls):
163163
cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
164164
cls.services['mode'] = cls.zone.networktype
165165

166-
template = get_template(
166+
cls.template = get_template(
167167
cls.apiclient,
168168
cls.zone.id,
169169
cls.services["ostype"]
170170
)
171-
if template == FAILED:
171+
if cls.template == FAILED:
172172
assert False, "get_template() failed to return template with description %s" % cls.services["ostype"]
173173
cls.services["virtual_machine"]["zoneid"] = cls.zone.id
174174
cls.services["virtual_machine"]["template"] = cls.template.id

‎test/integration/smoke/test_deploy_vgpu_enabled_vm.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,8 @@ def setUp(self):
123123
self.zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
124124
self.services["mode"] = self.zone.networktype
125125
# Before running this test, register a windows template with ostype as 'Windows 7 (32-bit)'
126-
self.template = get_template(self.apiclient, self.zone.id, self.services["ostype"], templatetype='USER')
126+
self.services["ostype"] = 'Windows 7 (32-bit)'
127+
self.template = get_template(self.apiclient, self.zone.id, self.services["ostype"])
127128

128129
if self.template == FAILED:
129130
assert False, "get_template() failed to return template with description %s" % self.services["ostype"]

‎test/integration/smoke/test_over_provisioning.py‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ def test_UpdateStorageOverProvisioningFactor(self):
6767

6868
self.poolId = pool.id
6969
""" list overprovisioning factor for storage pool """
70+
failed = 0
71+
if pool.overprovisionfactor is None:
72+
failed = 1
73+
self.assertNotEqual(failed,1,"pool.overprovisionfactor is none")
7074
factorOld = float(str(pool.overprovisionfactor))
7175
factorNew = str(factorOld + 1.0)
7276

@@ -85,6 +89,10 @@ def test_UpdateStorageOverProvisioningFactor(self):
8589
id = self.poolId
8690
)
8791
pool = storage_pools[0]
92+
failed = 0
93+
if pool.overprovisionfactor is None:
94+
failed = 1
95+
self.assertNotEqual(failed,1,"pool.overprovisionfactor is none")
8896
factorNew = float(str(pool.overprovisionfactor))
8997
self.assertNotEqual(int(factorNew), int(factorOld)," Check if overprovision factor of storage pool has changed")
9098
self.assertEqual(int(factorNew), int(factorOld + 1.0)," Check if overprovision factor of storage pool has increased by 1")
@@ -100,8 +108,11 @@ def tearDown(self):
100108
pool = storage_pools[0]
101109
updateConfigurationCmd = updateConfiguration.updateConfigurationCmd()
102110
updateConfigurationCmd.name = "storage.overprovisioning.factor"
103-
factorOld = float(str(pool.overprovisionfactor))
111+
factorOld = 0
112+
if pool.overprovisionfactor is not None:
113+
factorOld = float(str(pool.overprovisionfactor))
104114
factorNew = str(factorOld - 1.0)
105-
updateConfigurationCmd.value = factorNew
106-
updateConfigurationCmd.storageid = pool.id
107-
updateConfigurationResponse = self.apiClient.updateConfiguration(updateConfigurationCmd)
115+
if factorNew > 0:
116+
updateConfigurationCmd.value = factorNew
117+
updateConfigurationCmd.storageid = pool.id
118+
updateConfigurationResponse = self.apiClient.updateConfiguration(updateConfigurationCmd)

‎test/integration/smoke/test_primary_storage.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ def test_01_primary_storage_iscsi(self):
199199

200200
self.assertEqual(
201201
storage.type,
202-
'NetworkFilesystem',
202+
'IscsiLUN',
203203
"Check storage pool type "
204204
)
205205

0 commit comments

Comments
 (0)