From 327d1d7ab771118daf8f1c4231ad9dfd0eb66ed7 Mon Sep 17 00:00:00 2001
From: "th.l" <thl-cmk@outlook.com>
Date: Fri, 14 Jun 2024 21:51:00 +0200
Subject: [PATCH] update project

---
 README.md                                     |   1 +
 {doc => img}/sample.png                       | Bin
 inv_huawei_hw_components.mkp                  | Bin 2163 -> 0 bytes
 ...nv_huawei_hw_components-0.2.0-20230602.mkp | Bin
 ...nv_huawei_hw_components-0.2.1-20240614.mkp | Bin 0 -> 2128 bytes
 .../agent_based}/inv_huawei_hw_components.py  |   0
 .../packages}/inv_huawei_hw_components        |  10 ++---
 .../views/inv_huawei_hw_components.py         |  35 +++++++++---------
 8 files changed, 23 insertions(+), 23 deletions(-)
 rename {doc => img}/sample.png (100%)
 delete mode 100644 inv_huawei_hw_components.mkp
 rename inv_huawei_hw_components-0.2.0-20230602.mkp => mkp/inv_huawei_hw_components-0.2.0-20230602.mkp (100%)
 create mode 100644 mkp/inv_huawei_hw_components-0.2.1-20240614.mkp
 rename {agent_based => source/agent_based}/inv_huawei_hw_components.py (100%)
 rename {packages => source/packages}/inv_huawei_hw_components (60%)
 rename {gui => source/web/plugins}/views/inv_huawei_hw_components.py (57%)

diff --git a/README.md b/README.md
index e7c9710..2e4d2aa 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,4 @@
+[PACKAGE]: ../../raw/master/mkp/inv_huawei_hw_components-0.2.1-20240614.mkp "inv_huawei_hw_components-0.2.1-20240614.mkp"
 # Extended inventory of Huawei hardware components
 
 adds a extended list of hardware components to the inventory
diff --git a/doc/sample.png b/img/sample.png
similarity index 100%
rename from doc/sample.png
rename to img/sample.png
diff --git a/inv_huawei_hw_components.mkp b/inv_huawei_hw_components.mkp
deleted file mode 100644
index aa676f3dc822dfbfacb4a2f2508a03f7f70839bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2163
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

diff --git a/inv_huawei_hw_components-0.2.0-20230602.mkp b/mkp/inv_huawei_hw_components-0.2.0-20230602.mkp
similarity index 100%
rename from inv_huawei_hw_components-0.2.0-20230602.mkp
rename to mkp/inv_huawei_hw_components-0.2.0-20230602.mkp
diff --git a/mkp/inv_huawei_hw_components-0.2.1-20240614.mkp b/mkp/inv_huawei_hw_components-0.2.1-20240614.mkp
new file mode 100644
index 0000000000000000000000000000000000000000..9a3e56455f57fdaf43394b0d453073bc40ed03fa
GIT binary patch
literal 2128
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
DW6dn~

literal 0
HcmV?d00001

diff --git a/agent_based/inv_huawei_hw_components.py b/source/agent_based/inv_huawei_hw_components.py
similarity index 100%
rename from agent_based/inv_huawei_hw_components.py
rename to source/agent_based/inv_huawei_hw_components.py
diff --git a/packages/inv_huawei_hw_components b/source/packages/inv_huawei_hw_components
similarity index 60%
rename from packages/inv_huawei_hw_components
rename to source/packages/inv_huawei_hw_components
index acd8777..ad8e2ff 100644
--- a/packages/inv_huawei_hw_components
+++ b/source/packages/inv_huawei_hw_components
@@ -2,10 +2,10 @@
  'description': 'SNMP inventory for Huawei hardware components.\n',
  'download_url': 'https://thl-cmk.hopto.org',
  'files': {'agent_based': ['inv_huawei_hw_components.py'],
-           'gui': ['views/inv_huawei_hw_components.py']},
+           'web': ['plugins/views/inv_huawei_hw_components.py']},
  'name': 'inv_huawei_hw_components',
  'title': 'Inventory for Huawei hardware components',
- 'version': '0.2.0-20230602',
- 'version.min_required': '2.1.0b1',
- 'version.packaged': '2.1.0p21',
- 'version.usable_until': '2.2.0b1'}
\ No newline at end of file
+ 'version': '0.2.1-20240614',
+ 'version.min_required': '2.2.0b1',
+ 'version.packaged': '2.2.0p24',
+ 'version.usable_until': '2.3.0b1'}
diff --git a/gui/views/inv_huawei_hw_components.py b/source/web/plugins/views/inv_huawei_hw_components.py
similarity index 57%
rename from gui/views/inv_huawei_hw_components.py
rename to source/web/plugins/views/inv_huawei_hw_components.py
index aa33b5b..bac44e4 100644
--- a/gui/views/inv_huawei_hw_components.py
+++ b/source/web/plugins/views/inv_huawei_hw_components.py
@@ -1,22 +1,25 @@
 #!/usr/bin/env python3
-# -*- coding: utf-8 -*-; py-indent-offset: 4 -*-
+# -*- coding: utf-8 -*-
+#
+# License: GNU General Public License v2
+#
+# Author: thl-cmk[at]outlook[dot]com
+# URL   : https://thl-cmk.hopto.org
+# Date  : 2020-07-14
 
-from cmk.gui.plugins.views.utils import (
-    inventory_displayhints,
-)
-from cmk.gui.plugins.views.inventory import (
-    declare_invtable_view,
-    )
-from cmk.gui.i18n import _
+# 2024-06-14: moved back to ~/local/share/check_mk/web/plugins/views
 
+from cmk.gui.i18n import _
+from cmk.gui.views.inventory.registry import inventory_displayhints
 
 inventory_displayhints.update({
-    '.hardware.components.huawei:': {'title': _('Huawei'),
-                                     'keyorder': ['index', 'name', 'description', 'board_type', 'serial_number',
-                                                  'manufactured_date', 'vendor',
-                                                  ],
-                                     'view': 'invhuaweicomponents_of_host',
-                                     },
+    '.hardware.components.huawei:': {
+        'title': _('Huawei'),
+        'keyorder': ['index', 'name', 'description', 'board_type', 'serial_number',
+                     'manufactured_date', 'vendor',
+                     ],
+        'view': 'invhuaweicomponents_of_host',
+    },
     '.hardware.components.huawei:*.index': {'title': _('Index'), },
     '.hardware.components.huawei:*.name': {'title': _('Name')},
     '.hardware.components.huawei:*.description': {'title': _('Description'), },
@@ -29,8 +32,4 @@ inventory_displayhints.update({
     '.hardware.components.huawei:*.hardware_revision': {'title': _('Hardware Revision'), },
     '.hardware.components.huawei:*.serial_number': {'title': _('Serial Number'), },
     '.hardware.components.huawei:*.vendor': {'title': _('Vendor'), },
-
 })
-
-declare_invtable_view('invhuaweicomponents', '.hardware.components.huawei:', _('Huawei hardware components'),
-                      _('Huawei hardware components'))
-- 
GitLab