fixed device.status

changed from status_class to staus

fixed device.status
abc2ccb2 · thl-cmk · 8c8bd09f · abc2ccb2 · abc2ccb2 · abc2ccb2
Commit abc2ccb2 authored 2 years ago by thl-cmk
--- a/.gitignore
+++ b/.gitignore
 # config files
-pnp/configs/*.cfg
+pnp/configs/*
 # image files
-pnp/images/*.bin
+pnp/images/*
 # log files
 pnp/log/


--- a/pnp/.vscode/settings.json
+++ b/pnp/.vscode/settings.json
+{
+    "python.analysis.typeCheckingMode": "basic"
+}
\ No newline at end of file
--- a/pnp/open-pnp.py
+++ b/pnp/open-pnp.py
@@ -177,7 +177,7 @@ class Device:
        self.error_count: int = 0
        self.error_message = ''
        self.__hard_error: bool = False
-        self.__status_class: str = ''
+        self.__status: str = ''

    @property
    def pnp_flow(self) -> int:
@@ -188,7 +188,7 @@ class Device:
        self.__pnp_flow = pnp_flow
        self.pnp_flow_readable = PNPFLOW.readable(pnp_flow)
        if pnp_flow == PNPFLOW.FINISHED:
-            self.__status_class = 'finished'
+            self.__status = 'finished'

    @property
    def refresh_data(self) -> bool:
@@ -210,7 +210,7 @@ class Device:
    def error_code(self, error_code: int):
        self.__error_code = error_code
        self.error_code_readable = ERROR.readable(error_code)
-        self.__status_class = 'warning'
+        self.__status = 'warning'

    @property
    def hard_error(self) -> bool:
@@ -219,15 +219,15 @@ class Device:
    @hard_error.setter
    def hard_error(self, hard_error: bool):
        self.__hard_error = hard_error
-        self.__status_class = 'error'
+        self.__status = 'error'

    @property
-    def status_class(self) -> str:
-        return self.__status_class
+    def status(self) -> str:
+        return self.__status

-    @status_class.setter
-    def status_class(self, status_class: str):
-        self.__status_class = status_class
+    @status.setter
+    def status(self, status: str):
+        self.__status = status


 app = Flask(__name__, template_folder='./templates')
@@ -315,7 +315,7 @@ def pnp_backoff(udi: str, correlator: str, minutes: Optional[int] = 1) -> str:
 def pnp_backoff_terminate(udi: str, correlator: str) -> str:
    device = devices[udi]
    device.status = f'finished'
-    device.pnp_floe = PNPFLOW.FINISHED
+    device.pnp_flow = PNPFLOW.FINISHED
    device.current_job = 'urn:cisco:pnp:backoff-terminate'
    jinja_context = {
        'udi': udi,

--- a/pnp/templates/status.html
+++ b/pnp/templates/status.html
@@ -73,7 +73,7 @@
                <input type="submit" value="Remove" name="{{ device.udi }}"/>
            </form>
        </td>
-        <td class="{{ device.status_class}}">{{ device.serial }}</td>
+        <td class="{{ device.status}}">{{ device.serial }}</td>
        <td>{{ device.platform }}</td>
        <td>{{ device.hw_rev }}</td>
        <td>{{ device.ip_address }}</td>

--- a/pnp/templates/status_debug.html
+++ b/pnp/templates/status_debug.html
@@ -25,8 +25,6 @@
            background-color: #7cfc00;
        }
        input { width: 70px; }
-
-
    </style>
 </head>
 <body>
@@ -69,7 +67,7 @@
                <input type="submit" value="Remove" name="{{ device.udi }}"/>
            </form>
        </td>
-        <td class="{{ device.status_class}}"><a href="{{ config_base_url }}/{{ device.serial }}.cfg" target="_blank">{{ device.serial }}</a></td>
+        <td class="{{ device.status}}"><a href="{{ config_base_url }}/{{ device.serial }}.cfg" target="_blank">{{ device.serial }}</a></td>
        <td>{{ device.platform }}</td>
        <td>{{ device.hw_rev }}</td>
        <td>{{ device.ip_address }}</td>

--- a/pnp/vars/images.py
+++ b/pnp/vars/images.py
@@ -10,6 +10,12 @@ class SoftwareImage:


 IMAGES = {
+    'dummy': SoftwareImage(
+        image='your_image_name.bin',
+        version='0.0.0',
+        md5='fdb9c92bae37f9130d0ee6761afe2919',
+        size=9999999999,
+    ),
    'CAT9K': SoftwareImage(
        image='cat9k_iosxe.17.06.01.SPA.bin',
        version='17.6.1',

--- a/pnp/vars/settings.py
+++ b/pnp/vars/settings.py
@@ -9,5 +9,5 @@ STATUS_REFRESH = 10
 # DEBUG = True
 # LOG_TO_FILE = True
 # LOG_FILE = 'log/pnp_debug.log'
-IMAGE_BASE_URL = 'http://192.168.10.135:8080/images'
-CONFIG_BASE_URL = 'http://192.168.10.135:8080/configs'
+IMAGE_BASE_URL = 'http://192.168.10.50:8080/images'
+CONFIG_BASE_URL = 'http://192.168.10.50:8080/configs'