From: sousaedu <eduardo.sousa@canonical.com>
Date: Mon, 22 Nov 2021 14:09:15 +0000 (+0000)
Subject: Fix bug 1798 - adding swap disks
X-Git-Tag: v12.0.0rc1~53
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=648ee3dda65699ddfdd01d9f363fb2e37e99930c;p=osm%2FRO.git

Fix bug 1798 - adding swap disks

Change-Id: I447a1da59d1efdd9209950a185b819e32c696012
Signed-off-by: sousaedu <eduardo.sousa@canonical.com>
---

diff --git a/NG-RO/osm_ng_ro/ns.py b/NG-RO/osm_ng_ro/ns.py
index c5ca07e1..70f91d99 100644
--- a/NG-RO/osm_ng_ro/ns.py
+++ b/NG-RO/osm_ng_ro/ns.py
@@ -600,6 +600,11 @@ class Ns(object):
                         flavor_data["ephemeral"] = int(
                             storage.get("size-of-storage", 0)
                         )
+                    elif (
+                        storage.get("type-of-storage")
+                        == "etsi-nfv-descriptors:swap-storage"
+                    ):
+                        flavor_data["swap"] = int(storage.get("size-of-storage", 0))
 
                 if target_flavor.get("guest-epa"):
                     extended = {}
diff --git a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
index 5e74e966..4869da16 100644
--- a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
+++ b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
@@ -1177,6 +1177,8 @@ class vimconnector(vimconn.VimConnector):
                 flavor_dict["ram"],
                 flavor_dict["vcpus"],
                 flavor_dict["disk"],
+                flavor_dict.get("ephemeral", 0),
+                flavor_dict.get("swap", 0),
             )
             # numa=None
             extended = flavor_dict.get("extended", {})
@@ -1196,7 +1198,13 @@ class vimconnector(vimconn.VimConnector):
                     continue
                     # TODO
 
-                flavor_data = (flavor.ram, flavor.vcpus, flavor.disk)
+                flavor_data = (
+                    flavor.ram,
+                    flavor.vcpus,
+                    flavor.disk,
+                    flavor.ephemeral,
+                    flavor.swap,
+                )
                 if flavor_data == flavor_target:
                     return flavor.id
                 elif (
@@ -1351,6 +1359,7 @@ class vimconnector(vimconn.VimConnector):
                         vcpus=vcpus,
                         disk=flavor_data.get("disk", 0),
                         ephemeral=flavor_data.get("ephemeral", 0),
+                        swap=flavor_data.get("swap", 0),
                         is_public=flavor_data.get("is_public", True),
                     )
                     # add metadata
diff --git a/releasenotes/notes/fix_bug_1798-8239712f72e96634.yaml b/releasenotes/notes/fix_bug_1798-8239712f72e96634.yaml
new file mode 100644
index 00000000..8a7ad5b7
--- /dev/null
+++ b/releasenotes/notes/fix_bug_1798-8239712f72e96634.yaml
@@ -0,0 +1,20 @@
+#######################################################################################
+# 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:
+  - |
+    Fixing bug 1798 - this fix allows for the creation of swap disks.