From 4c8efb91e6fe449961d2f3a750e6cf84cb167fea Mon Sep 17 00:00:00 2001 From: Luis Vega Date: Tue, 8 Aug 2023 00:35:41 +0000 Subject: [PATCH] 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 Signed-off-by: garciadeblas --- NG-RO/osm_ng_ro/ns.py | 1 + NG-RO/osm_ng_ro/tests/test_ns.py | 2 +- .../notes/fix_bug_2282-a4069468a849963e.yaml | 23 +++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 releasenotes/notes/fix_bug_2282-a4069468a849963e.yaml diff --git a/NG-RO/osm_ng_ro/ns.py b/NG-RO/osm_ng_ro/ns.py index bd43c019..709b2ab0 100644 --- a/NG-RO/osm_ng_ro/ns.py +++ b/NG-RO/osm_ng_ro/ns.py @@ -1035,6 +1035,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 2c6a773e..a0f7977e 100644 --- a/NG-RO/osm_ng_ro/tests/test_ns.py +++ b/NG-RO/osm_ng_ro/tests/test_ns.py @@ -3339,7 +3339,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, {}) self.assertEqual(disk_list, []) def test_find_persistent_root_empty_disk_list(self): 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. -- 2.25.1