Skip to content

Commit 66f1381

Browse files
joek-officejoek-office
committed
align the integration tests to new implementation and featureset
1 parent e40418f commit 66f1381

31 files changed

+271
-359
lines changed

‎tests/integration/targets/inventory-v3.5/files/test-inventory-bearer-token.json

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"hostvars": {
44
"R1-Device": {
55
"asset_tag": "345678901",
6-
"cluster_device": "",
76
"config_context": {},
87
"custom_fields": {},
98
"device_type": "cisco-test",
@@ -27,7 +26,6 @@
2726
},
2827
"Test Nexus One": {
2928
"ansible_host": "172.16.180.12",
30-
"cluster_device": "",
3129
"config_context": {},
3230
"custom_fields": {},
3331
"device_type": "nexus-parent",
@@ -298,7 +296,6 @@
298296
},
299297
"Test VM With Spaces": {
300298
"cluster": "Test Cluster 2",
301-
"cluster_device": "",
302299
"cluster_type": "test-cluster-type",
303300
"config_context": {},
304301
"custom_fields": {},
@@ -392,7 +389,6 @@
392389
"tags": []
393390
},
394391
"TestDeviceR1": {
395-
"cluster_device": "",
396392
"config_context": {},
397393
"custom_fields": {},
398394
"device_type": "cisco-test",
@@ -422,7 +418,6 @@
422418
"test100": {
423419
"asset_tag": "123456789",
424420
"cluster": "Test Cluster",
425-
"cluster_device": "",
426421
"cluster_group": "test-cluster-group",
427422
"cluster_type": "test-cluster-type",
428423
"config_context": {
@@ -892,7 +887,6 @@
892887
},
893888
"test101-vm": {
894889
"cluster": "Test Cluster",
895-
"cluster_device": "",
896890
"cluster_group": "test-cluster-group",
897891
"cluster_type": "test-cluster-type",
898892
"config_context": {},
@@ -1046,7 +1040,6 @@
10461040
},
10471041
"test102-vm": {
10481042
"cluster": "Test Cluster",
1049-
"cluster_device": "",
10501043
"cluster_group": "test-cluster-group",
10511044
"cluster_type": "test-cluster-type",
10521045
"config_context": {},
@@ -1069,7 +1062,6 @@
10691062
},
10701063
"test103-vm": {
10711064
"cluster": "Test Cluster",
1072-
"cluster_device": "",
10731065
"cluster_group": "test-cluster-group",
10741066
"cluster_type": "test-cluster-type",
10751067
"config_context": {},
@@ -1092,7 +1084,6 @@
10921084
},
10931085
"test104-vm": {
10941086
"cluster": "Test Cluster 2",
1095-
"cluster_device": "",
10961087
"cluster_type": "test-cluster-type",
10971088
"config_context": {},
10981089
"custom_fields": {},
@@ -1272,6 +1263,7 @@
12721263
"location_parent_rack_group"
12731264
],
12741265
"hosts": [
1266+
"test100",
12751267
"test100-vm",
12761268
"test101-vm",
12771269
"test102-vm",

‎tests/integration/targets/inventory-v3.5/files/test-inventory-jinja2-filter.json

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"hostvars": {
44
"Test Nexus One": {
55
"ansible_host": "172.16.180.12",
6-
"cluster_device": "",
76
"config_context": {},
87
"custom_fields": {},
98
"device_type": "nexus-parent",
@@ -273,7 +272,6 @@
273272
"tags": []
274273
},
275274
"TestDeviceR1": {
276-
"cluster_device": "",
277275
"config_context": {},
278276
"custom_fields": {},
279277
"device_type": "cisco-test",
@@ -303,7 +301,6 @@
303301
"test100": {
304302
"asset_tag": "123456789",
305303
"cluster": "Test Cluster",
306-
"cluster_device": "",
307304
"cluster_group": "test-cluster-group",
308305
"cluster_type": "test-cluster-type",
309306
"config_context": {
@@ -773,7 +770,6 @@
773770
},
774771
"test101-vm": {
775772
"cluster": "Test Cluster",
776-
"cluster_device": "",
777773
"cluster_group": "test-cluster-group",
778774
"cluster_type": "test-cluster-type",
779775
"config_context": {},
@@ -927,7 +923,6 @@
927923
},
928924
"test102-vm": {
929925
"cluster": "Test Cluster",
930-
"cluster_device": "",
931926
"cluster_group": "test-cluster-group",
932927
"cluster_type": "test-cluster-type",
933928
"config_context": {},
@@ -950,7 +945,6 @@
950945
},
951946
"test103-vm": {
952947
"cluster": "Test Cluster",
953-
"cluster_device": "",
954948
"cluster_group": "test-cluster-group",
955949
"cluster_type": "test-cluster-type",
956950
"config_context": {},
@@ -1108,6 +1102,7 @@
11081102
"location_parent_rack_group"
11091103
],
11101104
"hosts": [
1105+
"test100",
11111106
"test100-vm",
11121107
"test101-vm",
11131108
"test102-vm",

‎tests/integration/targets/inventory-v3.5/files/test-inventory-jinja2.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828
"hostvars": {
2929
"R1-Device": {
3030
"asset_tag": "345678901",
31-
"cluster_device": "",
3231
"custom_fields": {},
3332
"device_type": "cisco-test",
3433
"is_virtual": false,
@@ -50,7 +49,6 @@
5049
},
5150
"Test VM With Spaces": {
5251
"cluster": "Test Cluster 2",
53-
"cluster_device": "",
5452
"cluster_type": "test-cluster-type",
5553
"custom_fields": {},
5654
"is_virtual": true,
@@ -64,7 +62,6 @@
6462
"tags": []
6563
},
6664
"TestDeviceR1": {
67-
"cluster_device": "",
6865
"custom_fields": {},
6966
"device_type": "cisco-test",
7067
"is_virtual": false,
@@ -91,7 +88,6 @@
9188
},
9289
"VC1": {
9390
"ansible_host": "nexus.example.com",
94-
"cluster_device": "",
9591
"custom_fields": {},
9692
"device_type": "nexus-parent",
9793
"dns_name": "nexus.example.com",
@@ -119,7 +115,6 @@
119115
"test100": {
120116
"asset_tag": "123456789",
121117
"cluster": "Test Cluster",
122-
"cluster_device": "",
123118
"cluster_group": "test-cluster-group",
124119
"cluster_type": "test-cluster-type",
125120
"custom_fields": {},
@@ -171,7 +166,6 @@
171166
},
172167
"test101-vm": {
173168
"cluster": "Test Cluster",
174-
"cluster_device": "",
175169
"cluster_group": "test-cluster-group",
176170
"cluster_type": "test-cluster-type",
177171
"custom_fields": {},
@@ -191,7 +185,6 @@
191185
},
192186
"test102-vm": {
193187
"cluster": "Test Cluster",
194-
"cluster_device": "",
195188
"cluster_group": "test-cluster-group",
196189
"cluster_type": "test-cluster-type",
197190
"custom_fields": {},
@@ -211,7 +204,6 @@
211204
},
212205
"test103-vm": {
213206
"cluster": "Test Cluster",
214-
"cluster_device": "",
215207
"cluster_group": "test-cluster-group",
216208
"cluster_type": "test-cluster-type",
217209
"custom_fields": {},
@@ -231,7 +223,6 @@
231223
},
232224
"test104-vm": {
233225
"cluster": "Test Cluster 2",
234-
"cluster_device": "",
235226
"cluster_type": "test-cluster-type",
236227
"custom_fields": {},
237228
"is_virtual": true,

‎tests/integration/targets/inventory-v3.5/files/test-inventory-legacy.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"hostvars": {
44
"R1-Device": {
55
"asset_tag": "345678901",
6-
"cluster_device": "",
76
"custom_fields": {},
87
"device_roles": [
98
"core-switch"
@@ -38,7 +37,6 @@
3837
},
3938
"Test Nexus One": {
4039
"ansible_host": "172.16.180.12",
41-
"cluster_device": "",
4240
"custom_fields": {},
4341
"device_roles": [
4442
"core-switch"
@@ -100,7 +98,6 @@
10098
},
10199
"Test VM With Spaces": {
102100
"cluster": "Test Cluster 2",
103-
"cluster_device": "",
104101
"cluster_type": "test-cluster-type",
105102
"custom_fields": {},
106103
"is_virtual": true,
@@ -142,7 +139,6 @@
142139
"tags": []
143140
},
144141
"TestDeviceR1": {
145-
"cluster_device": "",
146142
"custom_fields": {},
147143
"device_roles": [
148144
"core-switch"
@@ -183,7 +179,6 @@
183179
"test100": {
184180
"asset_tag": "123456789",
185181
"cluster": "Test Cluster",
186-
"cluster_device": "",
187182
"cluster_group": "test-cluster-group",
188183
"cluster_type": "test-cluster-type",
189184
"custom_fields": {},
@@ -312,7 +307,6 @@
312307
},
313308
"test101-vm": {
314309
"cluster": "Test Cluster",
315-
"cluster_device": "",
316310
"cluster_group": "test-cluster-group",
317311
"cluster_type": "test-cluster-type",
318312
"custom_fields": {},
@@ -338,7 +332,6 @@
338332
},
339333
"test102-vm": {
340334
"cluster": "Test Cluster",
341-
"cluster_device": "",
342335
"cluster_group": "test-cluster-group",
343336
"cluster_type": "test-cluster-type",
344337
"custom_fields": {},
@@ -364,7 +357,6 @@
364357
},
365358
"test103-vm": {
366359
"cluster": "Test Cluster",
367-
"cluster_device": "",
368360
"cluster_group": "test-cluster-group",
369361
"cluster_type": "test-cluster-type",
370362
"custom_fields": {},
@@ -390,7 +382,6 @@
390382
},
391383
"test104-vm": {
392384
"cluster": "Test Cluster 2",
393-
"cluster_device": "",
394385
"cluster_type": "test-cluster-type",
395386
"custom_fields": {},
396387
"is_virtual": true,

‎tests/integration/targets/inventory-v3.5/files/test-inventory-noracks.json

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
"hostvars": {
44
"R1-Device": {
55
"asset_tag": "345678901",
6-
"cluster_device": "",
76
"config_context": [
87
{}
98
],
@@ -37,7 +36,6 @@
3736
},
3837
"Test Nexus One": {
3938
"ansible_host": "172.16.180.12",
40-
"cluster_device": "",
4139
"config_context": [
4240
{}
4341
],
@@ -317,7 +315,6 @@
317315
},
318316
"Test VM With Spaces": {
319317
"cluster": "Test Cluster 2",
320-
"cluster_device": "",
321318
"cluster_type": "test-cluster-type",
322319
"config_context": [
323320
{}
@@ -415,7 +412,6 @@
415412
"tags": []
416413
},
417414
"TestDeviceR1": {
418-
"cluster_device": "",
419415
"config_context": [
420416
{}
421417
],
@@ -453,7 +449,6 @@
453449
"test100": {
454450
"asset_tag": "123456789",
455451
"cluster": "Test Cluster",
456-
"cluster_device": "",
457452
"cluster_group": "test-cluster-group",
458453
"cluster_type": "test-cluster-type",
459454
"config_context": [
@@ -937,7 +932,6 @@
937932
},
938933
"test101-vm": {
939934
"cluster": "Test Cluster",
940-
"cluster_device": "",
941935
"cluster_group": "test-cluster-group",
942936
"cluster_type": "test-cluster-type",
943937
"config_context": [
@@ -1097,7 +1091,6 @@
10971091
},
10981092
"test102-vm": {
10991093
"cluster": "Test Cluster",
1100-
"cluster_device": "",
11011094
"cluster_group": "test-cluster-group",
11021095
"cluster_type": "test-cluster-type",
11031096
"config_context": [
@@ -1126,7 +1119,6 @@
11261119
},
11271120
"test103-vm": {
11281121
"cluster": "Test Cluster",
1129-
"cluster_device": "",
11301122
"cluster_group": "test-cluster-group",
11311123
"cluster_type": "test-cluster-type",
11321124
"config_context": [
@@ -1155,7 +1147,6 @@
11551147
},
11561148
"test104-vm": {
11571149
"cluster": "Test Cluster 2",
1158-
"cluster_device": "",
11591150
"cluster_type": "test-cluster-type",
11601151
"config_context": [
11611152
{}

0 commit comments

Comments
 (0)