Merge pull request #170 from marksull/release/20231211.0

Release/20231211.0
marksull · Dec 11, 2023 · 3a08e3b · 3a08e3b
2 parents 7a5e629 + 6c7f2ab
commit 3a08e3b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 23 deletions.
diff --git a/fmcapi/api_objects/__init__.py b/fmcapi/api_objects/__init__.py
@@ -205,5 +205,5 @@
     "Backup",
     "Usage",
     "DynamicObject",
-    "DynamicObjectMappings"
+    "DynamicObjectMappings",
 ]
diff --git a/fmcapi/api_objects/object_services/__init__.py b/fmcapi/api_objects/object_services/__init__.py
@@ -107,5 +107,5 @@
     "VlanGroupTags",
     "VlanTags",
     "DynamicObjectMappings",
-    "DynamicObject"
+    "DynamicObject",
 ]
diff --git a/fmcapi/api_objects/object_services/dynamicobjectmappings.py b/fmcapi/api_objects/object_services/dynamicobjectmappings.py
@@ -12,7 +12,7 @@ class DynamicObjectMappings(APIClassTemplate):
     VALID_CHARACTERS_FOR_NAME = """[.\w\d_\- ]"""
 
     REQUIRED_FOR_POST = []
-    obj_id = ''
+    obj_id = ""
 
     def __init__(self, fmc, **kwargs):
         """
@@ -31,12 +31,11 @@ def __init__(self, fmc, **kwargs):
             self.obj_id = kwargs["id"]
 
     def mappings(self, action, value, name):
-
         """
-            Associate mappings to dynamic object.
+        Associate mappings to dynamic object.
 
-            :param action: (str) 'add', 'remove', or 'clear'
-            :param dynamic_objects: (DynamicObject) Dynamic object to be mapped.
+        :param action: (str) 'add', 'remove', or 'clear'
+        :param dynamic_objects: (DynamicObject) Dynamic object to be mapped.
         """
         logging.debug("In mappings for dynamic object")
 
@@ -47,9 +46,9 @@ def mappings(self, action, value, name):
                 "dynamicObject": {
                     "name": response["name"],
                     "id": response["id"],
-                    "type": response["type"]
+                    "type": response["type"],
                 },
-                "mappings": value
+                "mappings": value,
             }
             if action == "add":
                 if "add" in self.__dict__:
@@ -58,7 +57,7 @@ def mappings(self, action, value, name):
                 else:
                     self.add = [new_obj]
 
-                logging.info(f'Adding mappings to Dynamic Object.')
+                logging.info(f"Adding mappings to Dynamic Object.")
 
             elif action == "remove":
                 if "remove" in self.__dict__:
@@ -67,20 +66,14 @@ def mappings(self, action, value, name):
                 else:
                     self.remove = [new_obj]
 
-                logging.info(f'Remove mappings to Dynamic Object.')
+                logging.info(f"Remove mappings to Dynamic Object.")
 
         else:
             logging.warning(
                 f'Dynamic Object "{name}" is not found in FMC.  Cannot add mappings.'
             )
+
     def get(self):
         self.URL_SUFFIX = f"/object/dynamicobjects/{str(self.obj_id)}/mappings"
         super().__init__(self.fmc)
         return super().get()
-
-
-
-
-
-
-
diff --git a/fmcapi/api_objects/object_services/dynamicobjects.py b/fmcapi/api_objects/object_services/dynamicobjects.py
@@ -12,8 +12,7 @@ class DynamicObject(APIClassTemplate):
 
     VALID_GET_FILTERS = [
         "unusedOnly",
-        "ids"
-        "nameStartsWith"
+        "ids" "nameStartsWith",
     ]  # unusedOnly:Bool, "ids:id1,id2,..." ,nameStartsWith:String
 
     def __init__(self, fmc, **kwargs):
@@ -30,4 +29,3 @@ def __init__(self, fmc, **kwargs):
         logging.debug("In __init__() for Dynamic Object class.")
         self.parse_kwargs(**kwargs)
         self.type = "DynamicObject"
-
diff --git a/fmcapi/api_objects/policy_services/autonatrules.py b/fmcapi/api_objects/policy_services/autonatrules.py
@@ -60,7 +60,9 @@ def parse_kwargs(self, **kwargs):
         """
         super().parse_kwargs(**kwargs)
         logging.debug("In parse_kwargs() for AutoNatRules class.")
-        if ("translatedNetwork" in kwargs) and ("interfaceInTranslatedNetwork" in kwargs):
+        if ("translatedNetwork" in kwargs) and (
+            "interfaceInTranslatedNetwork" in kwargs
+        ):
             logging.warning(
                 "Cannot have both a translatedNetwork and interfaceInTranslatedNetwork"
             )

diff --git a/setup.py b/setup.py
@@ -6,7 +6,7 @@
 
 setup(
     name="fmcapi",
-    version="20231130.0",
+    version="20231211.0",
     description="Easier interface to Cisco's FMC API than writing your own way.",
     long_description="""With the removal to configure a Cisco NGFW via the command line your only option is to
      do so via a manager.  Some things are better when automated so using the manager's API gives us that power.