Skip to content

Commit ba87018

Browse files
authored
upate verson_compare import and fix issue 537 (#539)
* upate verson_compare import and fix issue 537 * update to absolute path
1 parent 262eeac commit ba87018

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

plugins/action/dtc/manage_child_fabric_networks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
from ansible.plugins.action import ActionBase
2929
from ansible.template import Templar
3030
from ansible.errors import AnsibleFileNotFound
31-
from ansible_collections.cisco.nac_dc_vxlan.plugins.filter import version_compare
31+
from ansible_collections.cisco.nac_dc_vxlan.plugins.filter.version_compare import version_compare
3232

3333

3434
import re
@@ -202,7 +202,7 @@ def run(self, tmp=None, task_vars=None):
202202
# Attempt to find and read the template file
203203
role_path = task_vars.get('role_path')
204204
version = '3.2'
205-
if version_compare.version_compare(nd_major_minor_patch, '3.1.1', '<='):
205+
if version_compare(nd_major_minor_patch, '3.1.1', '<='):
206206
version = '3.1'
207207
template_path = f"{role_path}{MSD_CHILD_FABRIC_NETWORK_TEMPLATE_PATH}{version}{MSD_CHILD_FABRIC_NETWORK_TEMPLATE}"
208208

plugins/action/dtc/manage_child_fabric_vrfs.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
from ansible.plugins.action import ActionBase
2929
from ansible.template import Templar
3030
from ansible.errors import AnsibleFileNotFound
31-
from ansible_collections.cisco.nac_dc_vxlan.plugins.filter import version_compare
31+
from ansible_collections.cisco.nac_dc_vxlan.plugins.filter.version_compare import version_compare
3232

3333

3434
import re
@@ -214,7 +214,7 @@ def run(self, tmp=None, task_vars=None):
214214
# Attempt to find and read the template file
215215
role_path = task_vars.get('role_path')
216216
version = '3.2'
217-
if version_compare.version_compare(nd_major_minor_patch, '3.1.1', '<='):
217+
if version_compare(nd_major_minor_patch, '3.1.1', '<='):
218218
version = '3.1'
219219
template_path = f"{role_path}{MSD_CHILD_FABRIC_VRF_TEMPLATE_PATH}{version}{MSD_CHILD_FABRIC_VRF_TEMPLATE}"
220220

roles/validate/files/rules/multisite/204_overlay_networks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ class Rule:
33
description = "Verify Network attributes are set for multisite overlay vs standalone fabric overlay"
44
severity = "HIGH"
55

6-
msg = "Network {0} attribute '{1}' must be defined under vxlan.multisite.overlay.vrfs under the 'child_fabrics:' key."
6+
msg = "Network {0} attribute '{1}' must be defined under vxlan.multisite.overlay.networks under the 'child_fabrics:' key."
77

88
@classmethod
99
def match(cls, inventory):

0 commit comments

Comments
 (0)