Keep vim_details while reporting VM deletion

Change-Id: I27577b2fc93a585affc947abcec8352562f23f49
Signed-off-by: Gulsum Atici <gulsum.atici@canonical.com>
(cherry picked from commit 01619d5b596e01ac8cd6d27bf01a1174e6b3f97b)

diff --git a/NG-RO/osm_ng_ro/monitor.py b/NG-RO/osm_ng_ro/monitor.py
index b9a5908..529ce0e 100644 (file)
--- a/NG-RO/osm_ng_ro/monitor.py
+++ b/NG-RO/osm_ng_ro/monitor.py
@@ -419,7 +419,6 @@ class MonitorVms:
             {
                 "vim_status": "DELETED",
                 "vim_message": "Deleted externally",
-                "vim_details": None,
                 "vim_id": None,
                 "vim_name": None,
                 "interfaces": None,

diff --git a/NG-RO/osm_ng_ro/tests/sample_data.py b/NG-RO/osm_ng_ro/tests/sample_data.py
index b631d8c..e85ce35 100644 (file)
--- a/NG-RO/osm_ng_ro/tests/sample_data.py
+++ b/NG-RO/osm_ng_ro/tests/sample_data.py
@@ -46,7 +46,6 @@ server_other_info = {
 deleted_externally = {
     "vim_status": "DELETED",
     "vim_message": "Deleted externally",
-    "vim_details": None,
     "vim_id": None,
     "vim_name": None,
     "interfaces": None,

diff --git a/NG-RO/osm_ng_ro/tests/test_monitor.py b/NG-RO/osm_ng_ro/tests/test_monitor.py
index cb61621..23e6d52 100644 (file)
--- a/NG-RO/osm_ng_ro/tests/test_monitor.py
+++ b/NG-RO/osm_ng_ro/tests/test_monitor.py
@@ -1153,7 +1153,6 @@ class TestMonitorVms(unittest.TestCase):
         vdur_vim_info_update = {
             "vim_status": "ACTIVE",
             "vim_message": None,
-            "vim_details": None,
             "vim_id": vm1_id,
             "vim_name": "test7-vnf-hackfest_basic-VM-000000",
         }

diff --git a/releasenotes/notes/keep_vim_details-266dc59a30b62519.yaml b/releasenotes/notes/keep_vim_details-266dc59a30b62519.yaml
new file mode 100644 (file)
index 0000000..0f88597
--- /dev/null
+++ b/releasenotes/notes/keep_vim_details-266dc59a30b62519.yaml
@@ -0,0 +1,21 @@
+#######################################################################################
+# Copyright ETSI Contributors and Others.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#    http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+# implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#######################################################################################
+---
+fixes:
+  - |
+     vim_details was set to None while reporting VM deletion by mistake. vim_details are kept by this fix.
+