Skip to content

Commit 59a1e0b

Browse files
KumarGanesanIBMKumarGanesanIBM
committed
code coverage improvement
1 parent b96d974 commit 59a1e0b

File tree

4 files changed

+215
-14
lines changed

4 files changed

+215
-14
lines changed

‎README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ IBM Cloud services:
8181
| Transit Service | Imported Class Name |
8282
| ---------------------------------------------------------------- | ------------------------------ |
8383
| [Transit Gateway](https://cloud.ibm.com/apidocs/transit-gateway) | TransitGatewayApisV1 |
84+
8485
## Prerequisites
8586

8687
[ibm-cloud-onboarding]: https://cloud.ibm.com/registration

‎test/integration/test_dns_zones_v1.py

Lines changed: 72 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ def tearDown(self):
2727
self._clean_dns_zones()
2828
print("Clean up complete")
2929

30-
3130
def _clean_dns_zones(self):
3231
response = self.zone.list_dnszones(instance_id=self.instance_id)
3332
assert response is not None
@@ -37,7 +36,8 @@ def _clean_dns_zones(self):
3736
zones = result.get("dnszones")
3837
for zone in zones:
3938
print(zone.get("id"))
40-
self.zone.delete_dnszone(instance_id=self.instance_id, dnszone_id=zone.get("id"))
39+
self.zone.delete_dnszone(
40+
instance_id=self.instance_id, dnszone_id=zone.get("id"))
4141

4242
def test_1_pdns_zone_action(self):
4343
""" test private dns zone create/delete/update/get functionality """
@@ -48,7 +48,8 @@ def test_1_pdns_zone_action(self):
4848
assert resp.status_code == 200
4949

5050
# create dns zone
51-
resp = self.zone.create_dnszone(instance_id=self.instance_id, name=name, label=label)
51+
resp = self.zone.create_dnszone(
52+
instance_id=self.instance_id, name=name, label=label)
5253
assert resp is not None
5354
assert resp.status_code == 200
5455
assert resp.get_result().get("instance_id") == self.instance_id
@@ -57,27 +58,28 @@ def test_1_pdns_zone_action(self):
5758
zone_id = resp.get_result().get("id")
5859

5960
# get dns zone
60-
resp = self.zone.get_dnszone(instance_id=self.instance_id, dnszone_id=zone_id)
61+
resp = self.zone.get_dnszone(
62+
instance_id=self.instance_id, dnszone_id=zone_id)
6163
assert resp.status_code == 200
6264
assert resp.get_result().get("instance_id") == self.instance_id
6365
assert resp.get_result().get("name") == name
6466
assert resp.get_result().get("label") == label
6567

66-
6768
# update dns zone
6869
label = "us-south-1"
6970
desc = "test instance"
70-
resp = self.zone.update_dnszone(instance_id=self.instance_id, dnszone_id=zone_id, description=desc, label=label)
71+
resp = self.zone.update_dnszone(
72+
instance_id=self.instance_id, dnszone_id=zone_id, description=desc, label=label)
7173
assert resp is not None
7274
assert resp.status_code == 200
7375
assert resp.get_result().get("instance_id") == self.instance_id
7476
assert resp.get_result().get("name") == name
7577
assert resp.get_result().get("label") == label
7678
assert resp.get_result().get("description") == desc
7779

78-
7980
# delete dns zone
80-
resp = self.zone.delete_dnszone(instance_id=self.instance_id, dnszone_id=zone_id)
81+
resp = self.zone.delete_dnszone(
82+
instance_id=self.instance_id, dnszone_id=zone_id)
8183
assert resp is not None
8284
assert resp.status_code == 204
8385

@@ -87,33 +89,89 @@ def test_1_pdns_zone_list(self):
8789
name = "test.example34.com"
8890
label = "us-south"
8991
# create dns zone
90-
resp = self.zone.create_dnszone(instance_id=self.instance_id, name=name, label=label)
92+
resp = self.zone.create_dnszone(
93+
instance_id=self.instance_id, name=name, label=label)
9194
assert resp is not None
9295
assert resp.status_code == 200
9396

9497
name = "test.example35.com"
9598
# create dns zone
96-
resp = self.zone.create_dnszone(instance_id=self.instance_id, name=name, label=label)
99+
resp = self.zone.create_dnszone(
100+
instance_id=self.instance_id, name=name, label=label)
97101
assert resp is not None
98102
assert resp.status_code == 200
99103

100104
name = "test.example36.com"
101105
# create dns zone
102-
resp = self.zone.create_dnszone(instance_id=self.instance_id, name=name, label=label)
106+
resp = self.zone.create_dnszone(
107+
instance_id=self.instance_id, name=name, label=label)
103108
assert resp is not None
104109
assert resp.status_code == 200
105110

106111
name = "test.example37.com"
107112
# create dns zone
108-
resp = self.zone.create_dnszone(instance_id=self.instance_id, name=name, label=label)
113+
resp = self.zone.create_dnszone(
114+
instance_id=self.instance_id, name=name, label=label)
109115
assert resp is not None
110116
assert resp.status_code == 200
111117

112-
113-
resp = self.zone.list_dnszones(instance_id=self.instance_id, offset=1, limit=2)
118+
resp = self.zone.list_dnszones(
119+
instance_id=self.instance_id, offset=1, limit=2)
114120
assert resp is not None
115121
assert resp.status_code == 200
116122

123+
def test_1_pdns_zone_negative(self):
124+
name = "test.example36.com"
125+
label = "us-south"
126+
instance_id = None
127+
with self.assertRaises(ValueError) as val:
128+
self.zone.create_dnszone(instance_id=instance_id,
129+
name=name, label=label)
130+
self.assertEqual(val.exception.msg, 'instance_id must be provided')
131+
desc = "this is a test"
132+
dnszone_id = "123456"
133+
with self.assertRaises(ValueError) as val:
134+
self.zone.update_dnszone(instance_id=instance_id,
135+
dnszone_id=dnszone_id, description=desc, label=label)
136+
self.assertEqual(val.exception.msg, 'instance_id must be provided')
137+
instance_id = "123456"
138+
dnszone_id = None
139+
with self.assertRaises(ValueError) as val:
140+
self.zone.update_dnszone(instance_id=instance_id,
141+
dnszone_id=dnszone_id, description=desc, label=label)
142+
self.assertEqual(val.exception.msg, 'dnszone_id must be provided')
143+
144+
instance_id = None
145+
dnszone_id = "123456"
146+
with self.assertRaises(ValueError) as val:
147+
self.zone.delete_dnszone(instance_id=instance_id,
148+
dnszone_id=dnszone_id)
149+
self.assertEqual(val.exception.msg, 'instance_id must be provided')
150+
instance_id = "123545"
151+
dnszone_id = None
152+
with self.assertRaises(ValueError) as val:
153+
self.zone.delete_dnszone(instance_id=instance_id,
154+
dnszone_id=dnszone_id)
155+
self.assertEqual(val.exception.msg, 'dnszone_id must be provided')
156+
157+
instance_id = None
158+
dnszone_id = "123456"
159+
with self.assertRaises(ValueError) as val:
160+
self.zone.get_dnszone(instance_id=instance_id,
161+
dnszone_id=dnszone_id)
162+
self.assertEqual(val.exception.msg, 'instance_id must be provided')
163+
instance_id = "123545"
164+
dnszone_id = None
165+
with self.assertRaises(ValueError) as val:
166+
self.zone.get_dnszone(instance_id=instance_id,
167+
dnszone_id=dnszone_id)
168+
self.assertEqual(val.exception.msg, 'dnszone_id must be provided')
169+
170+
instance_id = None
171+
with self.assertRaises(ValueError) as val:
172+
self.zone.list_dnszones(instance_id=instance_id)
173+
self.assertEqual(val.exception.msg, 'instance_id must be provided')
174+
117175

118176
if __name__ == '__main__':
119177
unittest.main()

‎test/integration/test_permitted_networks_for_dns_zones_v1.py

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,3 +76,60 @@ def test_1_permitted_network_actions(self):
7676
instance_id=self.instance_id, dnszone_id=self.zone_id, permitted_network_id=network_id)
7777
assert resp is not None
7878
assert resp.status_code == 202
79+
80+
def test_1_permitted_network_negative(self):
81+
instance_id = None
82+
dnszone_id = "123456"
83+
with self.assertRaises(ValueError) as val:
84+
self.nw.create_permitted_network(instance_id=instance_id,
85+
dnszone_id=dnszone_id)
86+
self.assertEqual(val.exception.msg, 'instance_id must be provided')
87+
instance_id = "123456"
88+
dnszone_id = None
89+
with self.assertRaises(ValueError) as val:
90+
self.nw.create_permitted_network(instance_id=instance_id,
91+
dnszone_id=dnszone_id)
92+
self.assertEqual(val.exception.msg, 'dnszone_id must be provided')
93+
94+
instance_id = None
95+
dnszone_id = "123456"
96+
with self.assertRaises(ValueError) as val:
97+
self.nw.delete_permitted_network(instance_id=instance_id,
98+
dnszone_id=dnszone_id, permitted_network_id=None)
99+
self.assertEqual(val.exception.msg, 'instance_id must be provided')
100+
instance_id = "123456"
101+
dnszone_id = None
102+
with self.assertRaises(ValueError) as val:
103+
self.nw.delete_permitted_network(instance_id=instance_id,
104+
dnszone_id=dnszone_id, permitted_network_id=None)
105+
self.assertEqual(val.exception.msg, 'dnszone_id must be provided')
106+
107+
instance_id = None
108+
dnszone_id = "123456"
109+
with self.assertRaises(ValueError) as val:
110+
self.nw.get_permitted_network(instance_id=instance_id,
111+
dnszone_id=dnszone_id, permitted_network_id=None)
112+
self.assertEqual(val.exception.msg, 'instance_id must be provided')
113+
instance_id = "123456"
114+
dnszone_id = None
115+
with self.assertRaises(ValueError) as val:
116+
self.nw.get_permitted_network(instance_id=instance_id,
117+
dnszone_id=dnszone_id, permitted_network_id=None)
118+
self.assertEqual(val.exception.msg, 'dnszone_id must be provided')
119+
120+
instance_id = None
121+
dnszone_id = "123456"
122+
with self.assertRaises(ValueError) as val:
123+
self.nw.list_permitted_networks(instance_id=instance_id,
124+
dnszone_id=dnszone_id)
125+
self.assertEqual(val.exception.msg, 'instance_id must be provided')
126+
instance_id = "123456"
127+
dnszone_id = None
128+
with self.assertRaises(ValueError) as val:
129+
self.nw.list_permitted_networks(instance_id=instance_id,
130+
dnszone_id=dnszone_id)
131+
self.assertEqual(val.exception.msg, 'dnszone_id must be provided')
132+
133+
134+
if __name__ == '__main__':
135+
unittest.main()

‎test/integration/test_resources_records_v1.py

Lines changed: 85 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -373,6 +373,91 @@ def test_7_resource_records_actions(self):
373373
assert resp is not None
374374
assert resp.status_code == 204
375375

376+
def test_1_resource_records_negative(self):
377+
instance_id = None
378+
dnszone_id = "123456"
379+
with self.assertRaises(ValueError) as val:
380+
self.record.create_resource_record(instance_id=instance_id,
381+
dnszone_id=dnszone_id)
382+
self.assertEqual(val.exception.msg, 'instance_id must be provided')
383+
instance_id = "123456"
384+
dnszone_id = None
385+
with self.assertRaises(ValueError) as val:
386+
self.record.create_resource_record(instance_id=instance_id,
387+
dnszone_id=dnszone_id)
388+
self.assertEqual(val.exception.msg, 'dnszone_id must be provided')
389+
390+
instance_id = None
391+
dnszone_id = "123456"
392+
with self.assertRaises(ValueError) as val:
393+
self.record.update_resource_record(instance_id=instance_id,
394+
dnszone_id=dnszone_id, record_id=None)
395+
self.assertEqual(val.exception.msg, 'instance_id must be provided')
396+
instance_id = "123456"
397+
dnszone_id = None
398+
with self.assertRaises(ValueError) as val:
399+
self.record.update_resource_record(instance_id=instance_id,
400+
dnszone_id=dnszone_id, record_id=None)
401+
self.assertEqual(val.exception.msg, 'dnszone_id must be provided')
402+
403+
instance_id = "123456"
404+
dnszone_id = "12345"
405+
with self.assertRaises(ValueError) as val:
406+
self.record.update_resource_record(instance_id=instance_id,
407+
dnszone_id=dnszone_id, record_id=None)
408+
self.assertEqual(val.exception.msg, 'record_id must be provided')
409+
410+
instance_id = None
411+
dnszone_id = "123456"
412+
with self.assertRaises(ValueError) as val:
413+
self.record.delete_resource_record(instance_id=instance_id,
414+
dnszone_id=dnszone_id, record_id=None)
415+
self.assertEqual(val.exception.msg, 'instance_id must be provided')
416+
instance_id = "123456"
417+
dnszone_id = None
418+
with self.assertRaises(ValueError) as val:
419+
self.record.delete_resource_record(instance_id=instance_id,
420+
dnszone_id=dnszone_id, record_id=None)
421+
self.assertEqual(val.exception.msg, 'dnszone_id must be provided')
422+
instance_id = "123456"
423+
dnszone_id = "12345"
424+
with self.assertRaises(ValueError) as val:
425+
self.record.delete_resource_record(instance_id=instance_id,
426+
dnszone_id=dnszone_id, record_id=None)
427+
self.assertEqual(val.exception.msg, 'record_id must be provided')
428+
429+
instance_id = None
430+
dnszone_id = "123456"
431+
with self.assertRaises(ValueError) as val:
432+
self.record.get_resource_record(instance_id=instance_id,
433+
dnszone_id=dnszone_id, record_id=None)
434+
self.assertEqual(val.exception.msg, 'instance_id must be provided')
435+
instance_id = "123456"
436+
dnszone_id = None
437+
with self.assertRaises(ValueError) as val:
438+
self.record.get_resource_record(instance_id=instance_id,
439+
dnszone_id=dnszone_id, record_id=None)
440+
self.assertEqual(val.exception.msg, 'dnszone_id must be provided')
441+
instance_id = "123456"
442+
dnszone_id = "12345"
443+
with self.assertRaises(ValueError) as val:
444+
self.record.get_resource_record(instance_id=instance_id,
445+
dnszone_id=dnszone_id, record_id=None)
446+
self.assertEqual(val.exception.msg, 'record_id must be provided')
447+
448+
instance_id = None
449+
dnszone_id = "123456"
450+
with self.assertRaises(ValueError) as val:
451+
self.record.list_resource_records(instance_id=instance_id,
452+
dnszone_id=dnszone_id)
453+
self.assertEqual(val.exception.msg, 'instance_id must be provided')
454+
instance_id = "123456"
455+
dnszone_id = None
456+
with self.assertRaises(ValueError) as val:
457+
self.record.list_resource_records(instance_id=instance_id,
458+
dnszone_id=dnszone_id)
459+
self.assertEqual(val.exception.msg, 'dnszone_id must be provided')
460+
376461

377462
if __name__ == '__main__':
378463
unittest.main()

0 commit comments

Comments
 (0)