Skip to content

Commit 6e32f42

Browse files
allenrobelallenrobel
committed
dcnm_image_policy: fix for issue #347 (#348)
* Fix for issue 347 Manually tested this to verify. Still need to update integration and unit tests. * dcnm_image_policy: Update integration test Update integration test for overridden state. 1. playbooks/roles/dcnm_image_policy/dcnm_tests.yaml - Add vars - install_package_1 - uninstall_package_1 2. test/integration/targets/dcnm_image_policy/tests/dcnm_image_policy_overridden.yaml - Add packages.install and packages.uninstall configuration - Verify that merged state adds these packages to the controller config - Verify that overridden state removes packages.install and packages.uninstall - Verify that overridden state metadata.action is "replace" instead of "update"
1 parent 0b17715 commit 6e32f42

File tree

3 files changed

+35
-17
lines changed

3 files changed

+35
-17
lines changed

‎playbooks/roles/dcnm_image_policy/dcnm_tests.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
leaf2: 192.168.1.5
2626
leaf3: 192.168.1.6
2727
leaf4: 192.168.1.7
28+
install_package_1: cfg_cmp-0.3.1.0-1.x86_64.rpm
29+
uninstall_package_1: mtx-grpctunnel-2.1.0.0-10.4.1.lib32_64_n9000
2830
image_policy_1: "KR5M"
2931
image_policy_2: "NR3F"
3032
epld_image_1: n9000-epld.10.2.5.M.img

‎plugins/modules/dcnm_image_policy.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -592,7 +592,7 @@ def __init__(self, params):
592592
raise ValueError(msg) from error
593593

594594
self.delete = ImagePolicyDelete()
595-
self.merged = Merged(params)
595+
self.replaced = Replaced(params)
596596

597597
msg = f"ENTERED {self.class_name}().{method_name}: "
598598
msg += f"state: {self.state}, "
@@ -627,10 +627,10 @@ def commit(self) -> None:
627627

628628
self._delete_policies_not_in_want()
629629
# pylint: disable=attribute-defined-outside-init
630-
self.merged.rest_send = self.rest_send
630+
self.replaced.rest_send = self.rest_send
631631
# pylint: enable=attribute-defined-outside-init
632-
self.merged.results = self.results
633-
self.merged.commit()
632+
self.replaced.results = self.results
633+
self.replaced.commit()
634634

635635
def _delete_policies_not_in_want(self) -> None:
636636
"""

‎tests/integration/targets/dcnm_image_policy/tests/dcnm_image_policy_overridden.yaml

Lines changed: 29 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,13 @@
1212
#
1313
# SETUP
1414
# 1. The following images must already be uploaded to the controller
15-
# See vars: section in cisco/dcnm/playbooks/dcnm_tests.yaml
15+
# See vars: section in cisco/dcnm/playbooks/dcnm_image_policy/dcnm_tests.yaml
1616
# - nxos_image_1
1717
# - nxos_image_2
1818
# - epld_image_1
1919
# - epld_image_2
20+
# - install_package_1
21+
# - uninstall_package_1
2022
# 2. No need for fabric or switches
2123
# 3. Delete image policies under test, if they exist
2224
# - image_policy_1
@@ -43,6 +45,8 @@
4345
# - nxos_image_2
4446
# - epld_image_1
4547
# - epld_image_2
48+
# - install_package_1
49+
# - uninstall_package_1
4650
# 2. No need for fabric or switches
4751
#
4852
# Example vars for dcnm_image_policy integration tests
@@ -71,6 +75,8 @@
7175
# nxos_image_2: n9000-dk9.10.3.1.F.bin
7276
# nxos_release_1: 10.2.5_nxos64-cs_64bit
7377
# nxos_release_2: 10.3.1_nxos64-cs_64bit
78+
# install_package_1: cfg_cmp-0.3.1.0-1.x86_64.rpm
79+
# uninstall_package_1: mtx-grpctunnel-2.1.0.0-10.4.1.lib32_64_n9000
7480
#
7581
################################################################################
7682
# SETUP
@@ -99,10 +105,12 @@
99105
# "agnostic": false,
100106
# "epldImgName": "n9000-epld.10.2.5.M.img",
101107
# "nxosVersion": "10.2.5_nxos64-cs_64bit",
108+
# "packageName": "cfg_cmp-0.3.1.0-1.x86_64.rpm",
102109
# "platform": "N9K",
103110
# "policyDescr": "KR5M",
104111
# "policyName": "KR5M",
105112
# "policyType": "PLATFORM",
113+
# "rpmimages": "mtx-grpctunnel-2.1.0.0-10.4.1.lib32_64_n9000",
106114
# "sequence_number": 1
107115
# },
108116
# {
@@ -162,7 +170,8 @@
162170
# }
163171
# ]
164172
# }
165-
# }################################################################################
173+
# }
174+
################################################################################
166175

167176
- name: OVERRIDDEN - TEST - Create two image policies using merged state
168177
cisco.dcnm.dcnm_image_policy:
@@ -172,6 +181,11 @@
172181
agnostic: false
173182
description: "{{ image_policy_1 }}"
174183
epld_image: "{{ epld_image_1 }}"
184+
packages:
185+
install:
186+
- "{{ install_package_1 }}"
187+
uninstall:
188+
- "{{ uninstall_package_1 }}"
175189
platform: N9K
176190
release: "{{ nxos_release_1 }}"
177191
type: PLATFORM
@@ -190,6 +204,8 @@
190204
- result.changed == true
191205
- result.failed == false
192206
- (result.diff | length) == 2
207+
- result.diff[0].packageName == install_package_1
208+
- result.diff[0].rpmimages == uninstall_package_1
193209
- result.diff[0].policyName == image_policy_1
194210
- result.diff[1].policyName == image_policy_2
195211
- result.diff[0].policyDescr == image_policy_1
@@ -249,18 +265,14 @@
249265
# {
250266
# "agnostic": false,
251267
# "epldImgName": "n9000-epld.10.2.5.M.img",
252-
# "fabricPolicyName": null,
253-
# "imagePresent": "Present",
254268
# "nxosVersion": "10.2.5_nxos64-cs_64bit",
255269
# "packageName": "",
256270
# "platform": "N9K",
257271
# "policyDescr": "KR5M overridden",
258272
# "policyName": "KR5M",
259273
# "policyType": "PLATFORM",
260-
# "role": null,
261-
# "rpmimages": null,
262-
# "sequence_number": 2,
263-
# "unInstall": false
274+
# "rpmimages": "",
275+
# "sequence_number": 2
264276
# }
265277
# ],
266278
# "failed": false,
@@ -272,7 +284,7 @@
272284
# "state": "overridden"
273285
# },
274286
# {
275-
# "action": "update",
287+
# "action": "replace",
276288
# "check_mode": false,
277289
# "sequence_number": 2,
278290
# "state": "overridden"
@@ -334,6 +346,8 @@
334346
- image_policy_2 in result.diff[0].policyNames
335347
- result.diff[0].sequence_number == 1
336348
- result.diff[1].agnostic == false
349+
- result.diff[1].packageName == ""
350+
- result.diff[1].rpmimages == ""
337351
- result.diff[1].policyName == image_policy_1
338352
- result.diff[1].policyDescr == image_policy_1 + " overridden"
339353
- result.diff[1].epldImgName == epld_image_1
@@ -343,7 +357,7 @@
343357
- result.diff[1].sequence_number == 2
344358
- (result.metadata | length) == 2
345359
- result.metadata[0].action == "delete"
346-
- result.metadata[1].action == "update"
360+
- result.metadata[1].action == "replace"
347361
- result.metadata[0].state == "overridden"
348362
- result.metadata[1].state == "overridden"
349363
- result.metadata[0].check_mode == False
@@ -371,7 +385,7 @@
371385
# OVERRIDDEN - TEST - query image policies and verify results
372386
################################################################################
373387
# Expected result
374-
# ok: [172.22.150.244] => {
388+
# ok: [dcnm] => {
375389
# "result": {
376390
# "changed": false,
377391
# "diff": [
@@ -390,7 +404,7 @@
390404
# "policyType": "PLATFORM",
391405
# "ref_count": 0,
392406
# "role": null,
393-
# "rpmimages": null,
407+
# "rpmimages": "",
394408
# "sequence_number": 1,
395409
# "unInstall": false
396410
# }
@@ -423,7 +437,7 @@
423437
# "policyType": "PLATFORM",
424438
# "ref_count": 0,
425439
# "role": null,
426-
# "rpmimages": null,
440+
# "rpmimages": "",
427441
# "unInstall": false
428442
# }
429443
# ],
@@ -465,6 +479,8 @@
465479
- result.failed == false
466480
- (result.diff | length) == 1
467481
- result.diff[0].agnostic == false
482+
- result.diff[0].packageName == ""
483+
- result.diff[0].rpmimages == ""
468484
- result.diff[0].policyName == image_policy_1
469485
- result.diff[0].policyDescr == image_policy_1 + " overridden"
470486
- result.diff[0].epldImgName == epld_image_1

0 commit comments

Comments
 (0)