Skip to content

Commit

Permalink
Merge pull request #164 from marksull/bugix/circular_import_error
Browse files Browse the repository at this point in the history
Bugix/circular import error
  • Loading branch information
marksull authored Nov 13, 2023
2 parents 8ebec6d + acbca28 commit f34e4f1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
6 changes: 4 additions & 2 deletions fmcapi/api_objects/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion fmcapi/api_objects/policy_services/autonatrules.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down

0 comments on commit f34e4f1

Please sign in to comment.