From: Luis Vega <lvega@whitestack.com>
Date: Tue, 8 Aug 2023 00:35:41 +0000 (+0000)
Subject: Fix Bug 2282: Can't instantiate NS using a pre-existing volume
X-Git-Tag: v14.0.1~7
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F03%2F13803%2F2;p=osm%2FRO.git

Fix Bug 2282: Can't instantiate NS using a pre-existing volume

    Add the posibility to return an empty dictionary to `find_persistent_root_volumes()` method
    so the NS instantiation doesn't fail while using a pre existing volume.

Change-Id: Iecd7041b2a202332acecd45a3e899d82be613ef7
Signed-off-by: Luis Vega <lvega@whitestack.com>
(cherry picked from commit 95e83692f42dfd338b7c7566281933fbfae32e4a)
---

diff --git a/NG-RO/osm_ng_ro/ns.py b/NG-RO/osm_ng_ro/ns.py
index 57fbb0d2..84a800e2 100644
--- a/NG-RO/osm_ng_ro/ns.py
+++ b/NG-RO/osm_ng_ro/ns.py
@@ -1005,6 +1005,7 @@ class Ns(object):
                             disk_list.append(persistent_root_disk[vsd["id"]])
 
                             return persistent_root_disk
+                return persistent_root_disk
 
     @staticmethod
     def find_persistent_volumes(
diff --git a/NG-RO/osm_ng_ro/tests/test_ns.py b/NG-RO/osm_ng_ro/tests/test_ns.py
index 1bfe884c..c692c51b 100644
--- a/NG-RO/osm_ng_ro/tests/test_ns.py
+++ b/NG-RO/osm_ng_ro/tests/test_ns.py
@@ -3397,7 +3397,7 @@ class TestProcessVduParams(unittest.TestCase):
         persist_root_disk = self.ns.find_persistent_root_volumes(
             vnfd, target_vdu, vdu_instantiation_volumes_list, disk_list
         )
-        self.assertEqual(persist_root_disk, None)
+        self.assertEqual(persist_root_disk, {})
         mock_volume_keeping_required.assert_not_called()
         self.assertEqual(disk_list, [])
 
diff --git a/releasenotes/notes/fix_bug_2282-a4069468a849963e.yaml b/releasenotes/notes/fix_bug_2282-a4069468a849963e.yaml
new file mode 100644
index 00000000..72386f23
--- /dev/null
+++ b/releasenotes/notes/fix_bug_2282-a4069468a849963e.yaml
@@ -0,0 +1,23 @@
+#######################################################################################
+# 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:
+  - |
+    Fix Bug 2282
+
+    Add the posibility to return an empty dictionary to `find_persistent_root_volumes()` method
+    so the NS instantiation doesn't fail while using a pre existing volume.