UT issues and IT cases addition

Author: prabahal

plugins/module_utils/fabric/common.py

@@ -133,17 +133,25 @@ def _config_save(self, payload):
  """
  method_name = inspect.stack()[0][3]
 
- fabric_name = payload.get("FABRIC_NAME", None)
+ if self.action == "child_fabric_add" or self.action == "child_fabric_delete":
+ fabric_name = payload.get("destFabric", None)
+ payload.update({'FABRIC_NAME': fabric_name})
+ else:
+ fabric_name = payload.get("FABRIC_NAME", None)
+
+ msg = f"{method_name}: action{self.action} payloads {payload} fab {fabric_name}"
+ self.log.debug(msg)
  if fabric_name is None:
  msg = f"{self.class_name}.{method_name}: "
  msg += "payload is missing mandatory parameter: FABRIC_NAME."
  raise ValueError(msg)
 
- if self.send_payload_result[fabric_name] is False:
- # Skip config-save if send_payload failed
- # Set config_save_result to False so that config_deploy is skipped
- self.config_save_result[fabric_name] = False
- return
+ if not (self.action == "child_fabric_add" or self.action == "child_fabric_delete"):
+ if self.send_payload_result[fabric_name] is False:
+ # Skip config-save if send_payload failed
+ # Set config_save_result to False so that config_deploy is skipped
+ self.config_save_result[fabric_name] = False
+ return
 
  self.config_save.payload = payload
  # pylint: disable=no-member
@@ -164,7 +172,11 @@ def _config_deploy(self, payload):
  - Raise ``ValueError`` if the payload is missing the FABRIC_NAME key.
  """
  method_name = inspect.stack()[0][3]
- fabric_name = payload.get("FABRIC_NAME")
+ if self.action == "child_fabric_add":
+ fabric_name = payload.get("destFabric", None)
+ payload.update({'FABRIC_NAME': fabric_name})
+ else:
+ fabric_name = payload.get("FABRIC_NAME", None)
  if fabric_name is None:
  msg = f"{self.class_name}.{method_name}: "
  msg += "payload is missing mandatory parameter: FABRIC_NAME."

plugins/module_utils/msd/add_child_fab.py

@@ -31,21 +31,24 @@
 # in _validate_commit_parameters() so that we can register the failure
 # in commit().
 from ..common.results import Results
+from ...module_utils.fabric.common import FabricCommon
 
 
-class childFabricAdd():
+class childFabricAdd(FabricCommon):
  """
  methods and properties for adding Child fabric into MSD:
 
  """
 
  def __init__(self):
+ super().__init__()
  self.class_name = self.__class__.__name__
  self.action = "child_fabric_add"
  self.log = logging.getLogger(f"dcnm.{self.class_name}")
  self.ep_fabric_add = EpChildFabricAdd()
  msg = "ENTERED childFabricAdd()"
  self.log.debug(msg)
+ self.deploy = False
 
  def commit(self, payload):
  """
@@ -57,6 +60,9 @@ def commit(self, payload):
  - ``_validate_commit_parameters`` raises ``ValueError``.
 
  """
+ if 'DEPLOY' in payload:
+ self.deploy = payload.pop('DEPLOY')
+
  try:
  self._validate_commit_parameters()
  except ValueError as error:
@@ -100,6 +106,13 @@ def commit(self, payload):
  msg = f"self.results.diff: {json.dumps(self.results.diff, indent=4, sort_keys=True)}"
  self.log.debug(msg)
 
+ if True in self.results.failed:
+ return
+
+ if self.deploy is True:
+ payload.update({'DEPLOY': True})
+ self._config_save(payload)
+
  def _validate_commit_parameters(self):
  """
  - validate the parameters for commit

plugins/module_utils/msd/delete_child_fab.py

@@ -30,14 +30,16 @@
 # in _validate_commit_parameters() so that we can register the failure
 # in commit().
 from ..common.results import Results
+from ...module_utils.fabric.common import FabricCommon
 
 
-class childFabricDelete():
+class childFabricDelete(FabricCommon):
  """
  Delete child fabrics from Parent fabrics
  """
 
  def __init__(self):
+ super().__init__()
  self.class_name = self.__class__.__name__
  self.action = "child_fabric_delete"
 
@@ -51,6 +53,7 @@ def __init__(self):
 
  msg = "ENTERED childFabricDelete()"
  self.log.debug(msg)
+ self.deploy = False
 
  def commit(self, payload):
  """
@@ -62,7 +65,8 @@ def commit(self, payload):
  - ``_validate_commit_parameters`` raises ``ValueError``.
 
  """
-
+ if 'DEPLOY' in payload:
+ self.deploy = payload.pop('DEPLOY')
  try:
  self._validate_commit_parameters()
  except ValueError as error:
@@ -106,6 +110,13 @@ def commit(self, payload):
  msg = f"self.results.diff: {json.dumps(self.results.diff, indent=4, sort_keys=True)}"
  self.log.debug(msg)
 
+ if True in self.results.failed:
+ return
+
+ if self.deploy is True:
+ payload.update({'DEPLOY': True})
+ self._config_save(payload)
+
  def _validate_commit_parameters(self):
  """
  - validate the parameters for commit

plugins/modules/dcnm_child_fabric.py

@@ -42,6 +42,12 @@
  type: list
  elements: dict
  suboptions:
+ DEPLOY:
+ default: False
+ description:
+ - Save the member fabric configuration.
+ required: false
+ type: bool
  FABRIC_NAME:
  description:
  - The name of the MSD fabric.
@@ -228,6 +234,7 @@ def get_want(self):
  try:
  msd_fabric = config.get("FABRIC_NAME", None)
  child_fabric = config.get("CHILD_FABRIC_NAME", None)
+ deploy = config.get("DEPLOY", None)
  try:
  self.conversion.validate_fabric_name(msd_fabric)
  self.conversion.validate_fabric_name(child_fabric)
@@ -241,7 +248,7 @@ def get_want(self):
  raise ValueError(msg) from error
  except ValueError as error:
  raise ValueError(f"{error}") from error
- config_payload = {'destFabric': msd_fabric, 'sourceFabric': child_fabric}
+ config_payload = {'destFabric': msd_fabric, 'sourceFabric': child_fabric, 'DEPLOY': deploy}
  self.payloads.append(copy.deepcopy(config_payload))
 
  def populate_check_mode(self):
@@ -402,7 +409,7 @@ def commit(self) -> None:
  if not self.verify_child_fabric_is_already_member(item):
  self.results.action = self.action
  self.results.result_current = {"success": True, "changed": False}
- msg = "Child fabric is not a member of Parent fabric."
+ msg = "Given child fabric is already not a member of MSD fabric"
  self.results.response_current = {"RETURN_CODE": 200, "MESSAGE": msg}
  self.results.register_task_result()
  else:
@@ -496,7 +503,7 @@ def commit(self) -> None:
  if self.verify_child_fabric_is_already_member(item):
  self.results.action = self.action
  self.results.result_current = {"success": True, "changed": False}
- msg = "Child fabric is already member of Parent fabric."
+ msg = "Child fabric is already member of MSD fabric."
  self.results.response_current = {"RETURN_CODE": 200, "MESSAGE": msg}
  self.results.register_task_result()
  else: