ipfabric_netbox 4.3.2b8__tar.gz → 4.3.2b9__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Potentially problematic release.
This version of ipfabric_netbox might be problematic. Click here for more details.
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/PKG-INFO +1 -1
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/__init__.py +1 -1
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/jobs.py +14 -1
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/pyproject.toml +1 -1
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/README.md +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/api/__init__.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/api/serializers.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/api/urls.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/api/views.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/choices.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/data/transform_map.json +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/exceptions.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/filtersets.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/forms.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/graphql/__init__.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/graphql/enums.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/graphql/filters.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/graphql/schema.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/graphql/types.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0001_initial.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0001_initial_squashed_0013_switch_to_branching_plugin.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0002_ipfabricsnapshot_status.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0003_ipfabricsource_type_and_more.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0004_ipfabricsync_auto_merge.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0005_alter_ipfabricrelationshipfield_source_model_and_more.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0006_alter_ipfabrictransformmap_target_model.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0007_prepare_custom_fields.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0008_prepare_transform_maps.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0009_transformmap_changes_for_netbox_v4_2.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0010_remove_uuid_from_get_or_create.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0011_update_part_number_DCIM_inventory_item_template.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0012_remove_status_field.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0013_switch_to_branching_plugin.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0014_ipfabrictransformmapgroup_ipfabrictransformmap_group.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0015_ipfabricingestionissue.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0016_tags_and_changelog_for_snapshots.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0017_ipfabricsync_update_custom_fields.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0018_remove_type_field.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0019_alter_ipfabrictransformmap_options_and_more.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0020_clean_scheduled_jobs.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0021_update_transform_maps.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/__init__.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/models.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/navigation.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/signals.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/tables.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/template_content.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/inc/clone_form.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/inc/diff.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/inc/json.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/inc/logs_pending.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/inc/merge_form.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/inc/site_topology_button.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/inc/site_topology_modal.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/inc/snapshotdata.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/inc/transform_map_field_map.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/inc/transform_map_relationship_map.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/ipfabric_table.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/ipfabricingestion.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/ipfabricsnapshot.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/ipfabricsource.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/ipfabricsync.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/ipfabrictransformmap.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/ipfabrictransformmap_list.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/ipfabrictransformmap_restore.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/ipfabrictransformmapgroup.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/partials/ingestion_all.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/partials/ingestion_progress.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/partials/ingestion_statistics.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/partials/ingestion_status.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/partials/job_logs.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/partials/object_tabs.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/ipfabric_netbox/partials/sync_last_ingestion.html +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templates/static/ipfabric_netbox/css/rack.css +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templatetags/__init__.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templatetags/ipfabric_netbox_helpers.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/tests/__init__.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/tests/api/__init__.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/tests/api/test_api.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/tests/test_forms.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/tests/test_models.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/tests/test_views.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/urls.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/utilities/__init__.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/utilities/ipfutils.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/utilities/logging.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/utilities/transform_map.py +0 -0
- {ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/views.py +0 -0
|
@@ -3,6 +3,9 @@ from datetime import timedelta
|
|
|
3
3
|
|
|
4
4
|
from core.choices import JobStatusChoices
|
|
5
5
|
from core.exceptions import SyncError
|
|
6
|
+
from dcim.models import VirtualChassis
|
|
7
|
+
from dcim.signals import assign_virtualchassis_master
|
|
8
|
+
from django.db.models import signals
|
|
6
9
|
from netbox.context_managers import event_tracking
|
|
7
10
|
from rq.timeouts import JobTimeoutException
|
|
8
11
|
from utilities.datetime import local_now
|
|
@@ -116,7 +119,17 @@ def merge_ipfabric_ingestion(job, remove_branch=False, *args, **kwargs):
|
|
|
116
119
|
|
|
117
120
|
job.start()
|
|
118
121
|
with event_tracking(request):
|
|
119
|
-
|
|
122
|
+
try:
|
|
123
|
+
# This signal is disabled on sync, we need to disable it here too
|
|
124
|
+
signals.post_save.disconnect(
|
|
125
|
+
assign_virtualchassis_master, sender=VirtualChassis
|
|
126
|
+
)
|
|
127
|
+
ingestion.sync_merge()
|
|
128
|
+
finally:
|
|
129
|
+
# Re-enable the disabled signal
|
|
130
|
+
signals.post_save.connect(
|
|
131
|
+
assign_virtualchassis_master, sender=VirtualChassis
|
|
132
|
+
)
|
|
120
133
|
if remove_branch:
|
|
121
134
|
branching_branch = ingestion.branch
|
|
122
135
|
ingestion.branch = None
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/migrations/0001_initial.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/templatetags/__init__.py
RENAMED
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
{ipfabric_netbox-4.3.2b8 → ipfabric_netbox-4.3.2b9}/ipfabric_netbox/utilities/transform_map.py
RENAMED
|
File without changes
|
|
File without changes
|