diff --git a/fmcapi/api_objects/__init__.py b/fmcapi/api_objects/__init__.py index 2edd8a3..69eee49 100644 --- a/fmcapi/api_objects/__init__.py +++ b/fmcapi/api_objects/__init__.py @@ -2,6 +2,10 @@ import logging +# TODO: Why is this the case? +from .policy_services.accesspolicies import AccessPolicies # Needs loaded before Device +from .device_services.devicerecords import DeviceRecords # Needs loaded early. + from .audit_services.audit_records import AuditRecords from .backup_services.backup import Backup from .deployment_services import DeployableDevices @@ -14,7 +18,6 @@ ) from .device_ha_pair_services.monitoredinterfaces import MonitoredInterfaces from .device_services.bridgegroupinterfaces import BridgeGroupInterfaces -from .device_services.devicerecords import DeviceRecords # Needs loaded early. from .device_services.etherchannelinterfaces import EtherchannelInterfaces from .device_services.ipv4staticroutes import IPv4StaticRoutes from .device_services.ipv6staticroutes import IPv6StaticRoutes @@ -73,7 +76,6 @@ from .object_services.vlangrouptags import VlanGroupTags from .object_services.vlantags import VlanTags from .policy_assignment_services.policyassignments import PolicyAssignments -from .policy_services.accesspolicies import AccessPolicies # Needs loaded before Device from .policy_services.accessrules import AccessRules from .policy_services.accessrules import Bulk from .policy_services.advancedsettings import AdvancedSettings diff --git a/fmcapi/api_objects/policy_services/autonatrules.py b/fmcapi/api_objects/policy_services/autonatrules.py index 985f12a..f58d41a 100644 --- a/fmcapi/api_objects/policy_services/autonatrules.py +++ b/fmcapi/api_objects/policy_services/autonatrules.py @@ -60,7 +60,7 @@ def parse_kwargs(self, **kwargs): """ super().parse_kwargs(**kwargs) logging.debug("In parse_kwargs() for AutoNatRules class.") - if ("translatedNetwork" in kwargs) and ("interfaceInTranslatedNetwork" is True): + 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 index aeeef86..c3a000f 100644 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ setup( name="fmcapi", - version="20231113.0", + version="20231114.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.