ipfabric_netbox 4.3.0b8__py3-none-any.whl → 4.3.0b9__py3-none-any.whl

ipfabric_netbox/__init__.py

@@ -6,7 +6,7 @@ class NetboxIPFabricConfig(PluginConfig):
     name = "ipfabric_netbox"
     verbose_name = "NetBox IP Fabric SoT Plugin"
     description = "Sync IP Fabric into NetBox"
-    version = "4.3.0b8"
+    version = "4.3.0b9"
     base_url = "ipfabric"
     min_version = "4.4.0"
 

ipfabric_netbox/models.py

@@ -897,7 +897,7 @@ class IPFabricSync(IPFabricClient, JobsMixin, TagsMixin, ChangeLoggedModel):
             self.logger.log_info("Auto Merging Ingestion", obj=ingestion)
             logger.info("Auto Merging Ingestion")
             try:
-                ingestion.enqueue_merge_job(user=user)
+                ingestion.enqueue_merge_job(user=user, remove_branch=True)
                 self.logger.log_info("Auto Merge Job Enqueued", obj=ingestion)
                 logger.info("Auto Merge Job Enqueued")
             except NameError:
@@ -962,6 +962,9 @@ class IPFabricIngestion(JobsMixin, models.Model):
         )
 
     def get_logs(self):
+        if not self.job:
+            # The Job is deleted by manual action
+            return {}
         if self.job.data:
             job_results = self.job.data
         else:

ipfabric_netbox/templates/ipfabric_netbox/ipfabricingestion.html

@@ -15,7 +15,7 @@
     {% custom_links object %}
   </div>
 {% if perms.core.sync_datasource %}
-{% if object.sync.ready_for_sync %}
+{% if object.sync.ready_for_sync and object.branch and object.branch.status != "merged" %}
   <a href="#"
   hx-get="{% url 'plugins:ipfabric_netbox:ipfabricingestion_merge' pk=object.pk %}"
   hx-target="#htmx-modal-content"
@@ -69,7 +69,7 @@
           </tr>
           <tr>
             <th scope="row">Job Object</th>
-            <td><a href="{% url 'core:job' pk=object.job.pk %}">{{ object.job }}</a></td>
+            <td>{% if object.job %}<a href="{% url 'core:job' pk=object.job.pk %}">{{ object.job }}</a>{% else %}{{ ""|placeholder }}{% endif %}</td>
           </tr>
           <tr>
             <th scope="row">Ingestion Status</th>
@@ -96,14 +96,14 @@
       {% include 'ipfabric_netbox/partials/ingestion_statistics.html' with object=object %}
     </div>
     <div id="ingestion_progress" hx-swap-oob="true">
-      {% include 'ipfabric_netbox/partials/ingestion_progress.html' %}
+      {% include 'ipfabric_netbox/partials/ingestion_progress.html' with job=object.job %}
     </div>
     <!-- {% include 'inc/panels/related_objects.html' %} -->
     {% include 'inc/panels/custom_fields.html' %}
     {% plugin_right_page object %}
   </div>
   <div class="row mb-3">
-    <div class="col col-md-12" {% if not object.job.completed %} hx-get="{% url 'plugins:ipfabric_netbox:ipfabricingestion_logs' pk=object.pk %}?type=info"
+    <div class="col col-md-12" {% if object.job and not object.job.completed %} hx-get="{% url 'plugins:ipfabric_netbox:ipfabricingestion_logs' pk=object.pk %}?type=info"
       hx-trigger="every 5s" hx-target="#ingestion_logs" hx-select="#ingestion_logs" hx-select-oob="#ingestion_status:innerHTML,#ingestion_progress:innerHTML,#ingestion_statistics:innerHTML,#object_tabs:innerHTML"
       hx-swap="innerHTML" {% endif %}>
       <div id="ingestion_logs">{% include 'ipfabric_netbox/partials/job_logs.html' with job=object.job %}</div>

ipfabric_netbox/templates/ipfabric_netbox/partials/ingestion_all.html

@@ -8,7 +8,7 @@
   {% include 'ipfabric_netbox/partials/ingestion_status.html' with object=object %}
 </div>
 <div id="ingestion_progress" hx-swap-oob="true">
-  {% include 'ipfabric_netbox/partials/ingestion_progress.html' %}
+  {% include 'ipfabric_netbox/partials/ingestion_progress.html' with job=job %}
 </div>
 <div id="ingestion_logs">
   {% include 'ipfabric_netbox/partials/job_logs.html' with job_results=job_results job=job %}

ipfabric_netbox/templates/ipfabric_netbox/partials/ingestion_progress.html

@@ -2,7 +2,9 @@
 <div class="card">
     <h5 class="card-header">Progress</h5>
     <div class="card-body">
-        {% if statistics %}
+        {% if not job %}
+        Cannot show progress, no sync Job exists anymore.
+        {% elif statistics %}
         <table class="table table-hover attr-table">
             {% for model, util in statistics.items %}
             <tr>

ipfabric_netbox/templates/ipfabric_netbox/partials/job_logs.html

@@ -2,20 +2,20 @@
 {% load helpers %}
 
 <p>
-{% if job.started %}
-Started: <strong>{{ job.started|isodatetime }}</strong>
-{% elif job.scheduled %}
-Scheduled for: <strong>{{ job.scheduled|isodatetime }}</strong> ({{ job.scheduled|naturaltime }})
-{% else %}
-Created: <strong>{{ job.created|isodatetime }}</strong>
-{% endif %}
-{% if job.completed %}
-Duration: <strong>{{ job.duration }}</strong>
-{% endif %}
+    {% if job.started %}
+        Started: <strong>{{ job.started|isodatetime }}</strong>
+    {% elif job.scheduled %}
+        Scheduled for: <strong>{{ job.scheduled|isodatetime }}</strong> ({{ job.scheduled|naturaltime }})
+    {% elif job %}
+        Created: <strong>{{ job.created|isodatetime }}</strong>
+    {% endif %}
+    {% if job.completed %}
+        Duration: <strong>{{ job.duration }}</strong>
+    {% endif %}
 <span id="pending-result-label">{% badge job.get_status_display job.get_status_color %}</span>
 </p>
-{% if not job.completed %}
-{% include 'ipfabric_netbox/inc/logs_pending.html' %}
+{% if job and not job.completed %}
+    {% include 'ipfabric_netbox/inc/logs_pending.html' %}
 {% endif %}
 <div class="card">
 <h5 class="card-header">Sync Results</h5>

ipfabric_netbox/tests/test_views.py

@@ -1628,7 +1628,7 @@ class IPFabricIngestionTestCase(
         self.assertHttpStatus(response, 200)
 
         # Verify the response contains expected elements
-        self.assertContains(response, "Logs pending...")
+        self.assertContains(response, "Ingestion progress pending...")
 
     @override_settings(EXEMPT_VIEW_PERMISSIONS=["*"])
     def test_get_logs_htmx(self):

ipfabric_netbox/views.py

@@ -938,7 +938,7 @@ class IPFabricIngestionLogView(LoginRequiredMixin, View):
         ingestion = annotate_statistics(IPFabricIngestion.objects).get(pk=ingestion_id)
         data = ingestion.get_statistics()
         data["object"] = ingestion
-        data["job"] = ingestion.jobs.first()
+        data["job"] = ingestion.job
 
         if request.htmx:
             response = render(
@@ -946,7 +946,7 @@ class IPFabricIngestionLogView(LoginRequiredMixin, View):
                 self.template_name,
                 data,
             )
-            if ingestion.job.completed:
+            if not ingestion.job or ingestion.job.completed:
                 response["HX-Refresh"] = "true"
             return response
         return render(request, self.template_name, data)

{ipfabric_netbox-4.3.0b8.dist-info → ipfabric_netbox-4.3.0b9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ipfabric_netbox
-Version: 4.3.0b8
+Version: 4.3.0b9
 Summary: NetBox plugin to sync IP Fabric data into NetBox
 License: MIT
 Keywords: netbox,ipfabric,plugin,sync

{ipfabric_netbox-4.3.0b8.dist-info → ipfabric_netbox-4.3.0b9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ipfabric_netbox/__init__.py,sha256=OTnSDhJRsShw8su9ERPqVv7GzWob31Rb6yfngwD91Mo,674
+ipfabric_netbox/__init__.py,sha256=CgoIoRyEpMEu6R1YM-wn9Gjk3vZF8zSn7jbrjS4DDUY,674
 ipfabric_netbox/api/__init__.py,sha256=XRclTGWVR0ZhAAwgYul5Wm_loug5_hUjEumbLQEwKYM,47
 ipfabric_netbox/api/serializers.py,sha256=lr_PWG0tqAxaKtkIIm8Gx2B-tn9yENQIfKY9cvu8Cco,6581
 ipfabric_netbox/api/urls.py,sha256=1fXXVTxNY5E64Nfz6b7zXD9bZI3FcefuxAWKMe0w_QU,1240
@@ -36,7 +36,7 @@ ipfabric_netbox/migrations/0018_remove_type_field.py,sha256=ffxW6IS3BLCbvM5M9DbD
 ipfabric_netbox/migrations/0019_alter_ipfabrictransformmap_options_and_more.py,sha256=ieDVedt9KpJBicAiC3kdZXzHeos12N0L9EdRXKmIVgY,501
 ipfabric_netbox/migrations/0020_clean_scheduled_jobs.py,sha256=zjCVKnCWTKYYkpVRwHjqRIRR2j6ALSKXYMfraRjNu7Y,2652
 ipfabric_netbox/migrations/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ipfabric_netbox/models.py,sha256=PgcxznpcihHwkdWlBJN1q2YshyvYS3lKvDvgQVSSDbI,38105
+ipfabric_netbox/models.py,sha256=g6EnrCp714aDig7Rh3_WRe1CHIwpSMV1YLWJexUJL2U,38222
 ipfabric_netbox/navigation.py,sha256=2dEJ_wKHb52Tl0FOV1TH3JbxRe8YZ56ewrTsBFGKpCg,2210
 ipfabric_netbox/signals.py,sha256=cGa5PVD2i24pGXiVNfbu6ruIDqPVdwKQHTSWe9Ura84,1838
 ipfabric_netbox/tables.py,sha256=BpPmL6-KClX16Ol_PIADyOx9NtDR9oauXH5iO4GeSoI,9008
@@ -52,7 +52,7 @@ ipfabric_netbox/templates/ipfabric_netbox/inc/snapshotdata.html,sha256=1ItOCPjjp
 ipfabric_netbox/templates/ipfabric_netbox/inc/transform_map_field_map.html,sha256=mRU-rBweVFvaPFHbVYPw7vcYyXiVaXCOkeHm7xWdKPA,500
 ipfabric_netbox/templates/ipfabric_netbox/inc/transform_map_relationship_map.html,sha256=qyuG_EXZMGUscA3sv_6WGSrf_bR7JTRlKyMYf6EYyo4,504
 ipfabric_netbox/templates/ipfabric_netbox/ipfabric_table.html,sha256=TsF34lK2CyDsMxlFTk--2lF_0AxYM614eKmkgYAbJ-k,1629
-ipfabric_netbox/templates/ipfabric_netbox/ipfabricingestion.html,sha256=fm_X2FLnoTS6s6AL3WmU6p3puDojROSkPG0jA4EBQeM,4435
+ipfabric_netbox/templates/ipfabric_netbox/ipfabricingestion.html,sha256=ymqTB9JEk0AFncK5kz8yStHWCD_IMNKlbgyqu_qon7g,4585
 ipfabric_netbox/templates/ipfabric_netbox/ipfabricsnapshot.html,sha256=hj8ORs_4mM_xTjmw3McHN-da5seC8nbbkzobn0f1TSc,3482
 ipfabric_netbox/templates/ipfabric_netbox/ipfabricsource.html,sha256=DQOA2TA7f1nI5YpxXthS1VzjIU1kMZus37l6bYSCauE,3869
 ipfabric_netbox/templates/ipfabric_netbox/ipfabricsync.html,sha256=dt8HYuHCzIN4otLS9QK3e1aES14isFI-1jyp8jrENXU,4616
@@ -60,11 +60,11 @@ ipfabric_netbox/templates/ipfabric_netbox/ipfabrictransformmap.html,sha256=qFo_K
 ipfabric_netbox/templates/ipfabric_netbox/ipfabrictransformmap_list.html,sha256=p8zqn0-B6mawSUM3zQrus6dsKUM5SRBTO0X94pLboX8,452
 ipfabric_netbox/templates/ipfabric_netbox/ipfabrictransformmap_restore.html,sha256=TV7gAZWtSd-c7mzOen_nv7Z8MZr2Vw8vkHP4zW9au4w,2580
 ipfabric_netbox/templates/ipfabric_netbox/ipfabrictransformmapgroup.html,sha256=H3uvjA4PdJq5uX2kizdHV1pAxwcPpyfc9IbJi1ZK5-k,975
-ipfabric_netbox/templates/ipfabric_netbox/partials/ingestion_all.html,sha256=W9W31m8b7mGrsfu0f_hE1TcudDqSJ0G2Bp9JE4UTIIE,662
-ipfabric_netbox/templates/ipfabric_netbox/partials/ingestion_progress.html,sha256=NellDFy1qzgVbCtkOZbiSi3ufau6FOLIQPUoNiU6Bg4,595
+ipfabric_netbox/templates/ipfabric_netbox/partials/ingestion_all.html,sha256=ZstgG3MJbd8WAOcGUKEpt4CSjIInhF14wgVgqSc1oAs,675
+ipfabric_netbox/templates/ipfabric_netbox/partials/ingestion_progress.html,sha256=tb9JAc9GjPd05F1RQdRrfrDwSQMWlcbbQOrQCXedQWs,680
 ipfabric_netbox/templates/ipfabric_netbox/partials/ingestion_statistics.html,sha256=_KtbxZQlIa_141OQSIAvSsMMfZRkNj27kJqrYHuLt7Y,867
 ipfabric_netbox/templates/ipfabric_netbox/partials/ingestion_status.html,sha256=qYXe-V-kQn1INqCHLSSpdrzXJ_IIt84AgCgAGwqpNbs,178
-ipfabric_netbox/templates/ipfabric_netbox/partials/job_logs.html,sha256=PMZxxrRVzn_JI8k5XCNV5BQnoFj9zYePN6afP6C_J2E,1622
+ipfabric_netbox/templates/ipfabric_netbox/partials/job_logs.html,sha256=THiEs8wYMvEn8y0XGhxX7rj3w466CkDhaEzc4CxgGLY,1694
 ipfabric_netbox/templates/ipfabric_netbox/partials/object_tabs.html,sha256=3xbGy38Y1RH13bVPlcyj5L6J_FM-mOW1y0fx54hj1xE,364
 ipfabric_netbox/templates/ipfabric_netbox/partials/sync_last_ingestion.html,sha256=3v6tC88xE5cic9l9lQw7Msawoq-AW2oo2odd-osGv50,179
 ipfabric_netbox/templates/static/ipfabric_netbox/css/rack.css,sha256=z1H-RmmsqF2pGdhn5J64TMFiccy62xZUHHlCRd8fJrQ,118
@@ -75,14 +75,14 @@ ipfabric_netbox/tests/api/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJW
 ipfabric_netbox/tests/api/test_api.py,sha256=9o9k4kfnT3Zz9Hg0qnI0_XASt6pi5BCZQ3RhBjsb_iE,35215
 ipfabric_netbox/tests/test_forms.py,sha256=C8giV6E3PbMB9_864C12ebvfQ3Vlvdn39VIQQSP6GV8,61566
 ipfabric_netbox/tests/test_models.py,sha256=FFrIT5xxv_yvujKpxGjRJPNPBDF2Pqi8zbY0vxuJeQs,16043
-ipfabric_netbox/tests/test_views.py,sha256=pyUPdsgkvcfHC_BgmFtAQvENQfGvtEVSyNnRikLrlxc,87770
+ipfabric_netbox/tests/test_views.py,sha256=OhPoRrXA8lEzjTktjbm3I8LkByBHDXA45z9gOEspho4,87784
 ipfabric_netbox/urls.py,sha256=qF2BzZEDnPRd3opFaRfiMdaarYKFfv69iMaAbU2rsBU,2702
 ipfabric_netbox/utilities/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ipfabric_netbox/utilities/ipfutils.py,sha256=wFmL5oriuF-is1ZlrIcLmoeYUY5ih-CA9weRQrx5AiA,31885
 ipfabric_netbox/utilities/logging.py,sha256=GYknjocMN6LQ2873_az3y0RKm29TCXaWviUIIneH-x0,3445
 ipfabric_netbox/utilities/nbutils.py,sha256=kFBEiJOGvr_49hJWCS2duXojx2-A9kVk0Xp_vj0ohfs,2641
 ipfabric_netbox/utilities/transform_map.py,sha256=GpM_7Mm6FE0qV2qbyj4YfDn0l-JkeeEHQOZkNVSSHk4,2391
-ipfabric_netbox/views.py,sha256=n3tTDs1xOAY5xtcMmhM6VrnpEr-2IzqeliFNgthQf1U,44746
-ipfabric_netbox-4.3.0b8.dist-info/METADATA,sha256=A9F-rJ7Tl1pmXn__yVo7FfDRoZc1C03CWF8gv67JXzE,4754
-ipfabric_netbox-4.3.0b8.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-ipfabric_netbox-4.3.0b8.dist-info/RECORD,,
+ipfabric_netbox/views.py,sha256=JcXvoLo8JQ0PUyvUwi1tZQgrxw9okKBlocsIUKoGAbo,44758
+ipfabric_netbox-4.3.0b9.dist-info/METADATA,sha256=HdBydWNVKafz4hTNweGmrZ5bcDsVQLGAsd1rZM-abi0,4754
+ipfabric_netbox-4.3.0b9.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+ipfabric_netbox-4.3.0b9.dist-info/RECORD,,