Skip to content

Commit e2e8006

Browse files
committed
Addressing IT issues
1 parent 699db0c commit e2e8006

File tree

2 files changed

+13
-10
lines changed

2 files changed

+13
-10
lines changed

plugins/module_utils/msd/query_child_fab.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,10 @@ def commit(self):
176176
self.results.state = self.rest_send.state
177177
# pylint: disable=no-member
178178
self.results.diff_current = add_to_diff
179-
self.results.result_current = {"success": True, "found": True}
179+
if not add_to_diff:
180+
self.results.result_current = {"success": True, "found": False}
181+
else:
182+
self.results.result_current = {"success": True, "found": True}
180183
self.results.response_current = copy.deepcopy(
181184
self.rest_send.response_current
182185
)

plugins/modules/dcnm_child_fabric.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ def __init__(self, params):
155155
msg += f"check_mode: {self.check_mode}"
156156
self.log.debug(msg)
157157

158-
def verify_parent_fab_exists_in_controller(self):
158+
def verify_msd_fab_exists_in_controller(self):
159159
method_name = inspect.stack()[0][3]
160160
for item in self.payloads:
161161
for fabric in self.data:
@@ -168,7 +168,7 @@ def verify_parent_fab_exists_in_controller(self):
168168
msg += "is not found in Controller. Please create and try again"
169169
raise ValueError(msg)
170170

171-
def verify_parent_fab_is_MSD(self):
171+
def verify_msd_fab_type(self):
172172
method_name = inspect.stack()[0][3]
173173
for item in self.payloads:
174174
for fabric in self.data:
@@ -226,10 +226,10 @@ def get_want(self):
226226
msg += f"value {config}."
227227
raise ValueError(msg)
228228
try:
229-
parent_fabric = config.get("FABRIC_NAME", None)
229+
msd_fabric = config.get("FABRIC_NAME", None)
230230
child_fabric = config.get("CHILD_FABRIC_NAME", None)
231231
try:
232-
self.conversion.validate_fabric_name(parent_fabric)
232+
self.conversion.validate_fabric_name(msd_fabric)
233233
self.conversion.validate_fabric_name(child_fabric)
234234
except (TypeError, ValueError) as error:
235235
msg = f"{self.class_name}: "
@@ -241,7 +241,7 @@ def get_want(self):
241241
raise ValueError(msg) from error
242242
except ValueError as error:
243243
raise ValueError(f"{error}") from error
244-
config_payload = {'destFabric': parent_fabric, 'sourceFabric': child_fabric}
244+
config_payload = {'destFabric': msd_fabric, 'sourceFabric': child_fabric}
245245
self.payloads.append(copy.deepcopy(config_payload))
246246

247247
def populate_check_mode(self):
@@ -396,8 +396,8 @@ def commit(self) -> None:
396396
continue
397397
self.data[fabric_name] = item
398398

399-
self.verify_parent_fab_exists_in_controller()
400-
self.verify_parent_fab_is_MSD()
399+
self.verify_msd_fab_exists_in_controller()
400+
self.verify_msd_fab_type()
401401
for item in self.payloads:
402402
if not self.verify_child_fabric_is_already_member(item):
403403
self.results.action = self.action
@@ -488,8 +488,8 @@ def commit(self) -> None:
488488
continue
489489
self.data[fabric_name] = item
490490

491-
self.verify_parent_fab_exists_in_controller()
492-
self.verify_parent_fab_is_MSD()
491+
self.verify_msd_fab_exists_in_controller()
492+
self.verify_msd_fab_type()
493493
self.verify_child_fab_exists_in_controller()
494494
self.verify_child_fabric_is_member_of_another_fabric()
495495
for item in self.payloads:

0 commit comments

Comments
 (0)