From 4e0f7ce939ee2560bc0ed91972c0e9499eff45f1 Mon Sep 17 00:00:00 2001
From: "deepika.e" <deepika.e@tataelxsi.co.in>
Date: Thu, 9 Nov 2023 14:04:57 +0530
Subject: [PATCH] Bug 2310: Fix for NS Termination/Update failing after
 Vertical-Scaling/Migration/Operate-VNF

Removed created flag and created_items being updated in EXEC operations in ns_thread.py

Change-Id: I55be8c70b4473f6129410aabf1025d2819bd20ff
Signed-off-by: deepika.e <deepika.e@tataelxsi.co.in>
---
 NG-RO/osm_ng_ro/ns_thread.py                  | 17 ---------------
 .../notes/bug_2310_fix-a89efc73f53f5578.yaml  | 21 +++++++++++++++++++
 2 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 releasenotes/notes/bug_2310_fix-a89efc73f53f5578.yaml

diff --git a/NG-RO/osm_ng_ro/ns_thread.py b/NG-RO/osm_ng_ro/ns_thread.py
index 42a8a591..b1949b3a 100644
--- a/NG-RO/osm_ng_ro/ns_thread.py
+++ b/NG-RO/osm_ng_ro/ns_thread.py
@@ -1005,8 +1005,6 @@ class VimInteractionUpdateVdu(VimInteractionBase):
         task = ro_task["tasks"][task_index]
         task_id = task["task_id"]
         db_task_update = {"retries": 0}
-        created = False
-        created_items = {}
         target_vim = self.my_vims[ro_task["target_id"]]
 
         try:
@@ -1020,10 +1018,6 @@ class VimInteractionUpdateVdu(VimInteractionBase):
             ro_vim_item_update = {
                 "vim_id": vim_vm_id,
                 "vim_status": "ACTIVE",
-                "created": created,
-                "created_items": created_items,
-                "vim_details": None,
-                "vim_message": None,
             }
             self.logger.debug(
                 "task={} {} vm-migration done".format(task_id, ro_task["target_id"])
@@ -1036,7 +1030,6 @@ class VimInteractionUpdateVdu(VimInteractionBase):
             )
             ro_vim_item_update = {
                 "vim_status": "VIM_ERROR",
-                "created": created,
                 "vim_message": str(e),
             }
 
@@ -1446,8 +1439,6 @@ class VimInteractionMigration(VimInteractionBase):
         db_task_update = {"retries": 0}
         target_vim = self.my_vims[ro_task["target_id"]]
         vim_interfaces = []
-        created = False
-        created_items = {}
         refreshed_vim_info = {}
 
         try:
@@ -1486,8 +1477,6 @@ class VimInteractionMigration(VimInteractionBase):
             ro_vim_item_update = {
                 "vim_id": vim_vm_id,
                 "vim_status": "ACTIVE",
-                "created": created,
-                "created_items": created_items,
                 "vim_details": None,
                 "vim_message": None,
             }
@@ -1514,7 +1503,6 @@ class VimInteractionMigration(VimInteractionBase):
             )
             ro_vim_item_update = {
                 "vim_status": "VIM_ERROR",
-                "created": created,
                 "vim_message": str(e),
             }
 
@@ -1526,9 +1514,7 @@ class VimInteractionResize(VimInteractionBase):
         task = ro_task["tasks"][task_index]
         task_id = task["task_id"]
         db_task_update = {"retries": 0}
-        created = False
         target_flavor_uuid = None
-        created_items = {}
         refreshed_vim_info = {}
         target_vim = self.my_vims[ro_task["target_id"]]
 
@@ -1562,8 +1548,6 @@ class VimInteractionResize(VimInteractionBase):
             ro_vim_item_update = {
                 "vim_id": vim_vm_id,
                 "vim_status": "ACTIVE",
-                "created": created,
-                "created_items": created_items,
                 "vim_details": None,
                 "vim_message": None,
             }
@@ -1584,7 +1568,6 @@ class VimInteractionResize(VimInteractionBase):
             )
             ro_vim_item_update = {
                 "vim_status": "VIM_ERROR",
-                "created": created,
                 "vim_message": str(e),
             }
 
diff --git a/releasenotes/notes/bug_2310_fix-a89efc73f53f5578.yaml b/releasenotes/notes/bug_2310_fix-a89efc73f53f5578.yaml
new file mode 100644
index 00000000..830f002e
--- /dev/null
+++ b/releasenotes/notes/bug_2310_fix-a89efc73f53f5578.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:
+  - |
+    This fixes the bug 2310 - NS Termination/Update failing after
+    Vertical-Scaling/Migration/Operate-VNF
-- 
2.25.1