From eb3309be98097dc8bf4019661a152d494643964c Mon Sep 17 00:00:00 2001
From: thl-cmk <thl-cmk@outlook.com>
Date: Tue, 9 May 2023 11:48:33 +0200
Subject: [PATCH] Fix status template debug mode wrong url
---
pnp/images.toml | 14 +++++++++++++-
pnp/templates/image_install.xml | 2 +-
pnp/templates/status.html | 4 ++--
3 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/pnp/images.toml b/pnp/images.toml
index 6d9633e..fceac08 100644
--- a/pnp/images.toml
+++ b/pnp/images.toml
@@ -40,6 +40,12 @@ md5 = "a7e8ff2f05678db21a5c795d711beec7"
size = 794317769
models = ["ISR4451-X/K9"]
+["isr4400-universalk9.03.16.04b.S.155-3.S4b-ext.SPA.bin"]
+version = "15.5(3)S4b"
+md5 = "82BF4475903E89451C46CFFA38AC3D36"
+size = 470141220
+models = ["_ISR4451-X/K9_"]
+
["asr1002x-universalk9.17.06.04.SPA.bin"]
version = "17.6.4"
md5 = "e78b1a64499faf0e4bef732d19a229fb"
@@ -62,4 +68,10 @@ models = ["WS-C2960L-24TS-LL"]
version = "15.2(2)E9"
md5 = "EA604D030B378B6C5C3DDA3D501AC2F5"
size = 16800768
-models = ["WS-C2960S-F48TS-L", "WS-C2960S-F24TS-L"]
\ No newline at end of file
+models = ["WS-C2960S-F48TS-L", "WS-C2960S-F24TS-L"]
+
+["cat9k_iosxe.17.06.04.SPA.bin"]
+version = "17.6.4"
+md5 = "dae85d113b3438d4f00e49ccdd1ec611"
+size = 1017587860
+models = ["C9300-48P"]
\ No newline at end of file
diff --git a/pnp/templates/image_install.xml b/pnp/templates/image_install.xml
index db07b3a..be80790 100644
--- a/pnp/templates/image_install.xml
+++ b/pnp/templates/image_install.xml
@@ -16,7 +16,7 @@
<reason>pnp image installation</reason>
<delayIn>{{ delay }}</delayIn>
<user>pnp-install-image</user>
- <saveConfig>true</saveConfig>
+ <saveConfig>false</saveConfig>
</reload>
</request>
</pnp>
\ No newline at end of file
diff --git a/pnp/templates/status.html b/pnp/templates/status.html
index 20eb1fd..05368b9 100644
--- a/pnp/templates/status.html
+++ b/pnp/templates/status.html
@@ -182,7 +182,7 @@
</form>
</td>
{% if debug %}
- <td class="{{ device.status_class }}"><a href="{{ config_base_url }}/{{ device.serial }}.cfg" target="_blank">{{device.serial }}</a></td>
+ <td class="{{ device.status_class }}"><a href="{{ config_url }}/{{ device.serial }}.cfg" target="_blank">{{device.serial }}</a></td>
{% else %}
<td class="{{ device.status_class }}">{{ device.serial }}</td>
{% endif %}
@@ -199,7 +199,7 @@
<td>{{ device.error_code_readable }}</td>
{% if debug %}
<td>{{ device.image }}</td>
- <td> <a href="{{ image_base_url }}/{{ device.target_image.image }}" target="_blank">{{device.target_image.image }}</a></td>
+ <td> <a href="{{ image_url }}/{{ device.target_image.image }}" target="_blank">{{device.target_image.image }}</a></td>
<td>{{ device.target_image.size }}</td>
<td>{{ device.destination_free }}</td>
<td>{{ device.destination_name }}</td>
--
GitLab