Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugix/circular import error #164

Merged
merged 3 commits into from
Nov 13, 2023
Merged

Bugix/circular import error #164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ce97e12
Rollback import optimisation
marksull Nov 13, 2023
8ca2a1b
Fix nat rules equality check
marksull Nov 13, 2023
acbca28
Bump version
marksull Nov 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions fmcapi/api_objects/__init__.py
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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