From: Alexis Romero <garomero@indra.es>
Date: Thu, 12 May 2022 11:23:25 +0000 (+0200)
Subject: Fixes bug 2026 : Persistent volumes to be created in the same AZ as the VM that will... 
X-Git-Tag: v12.0.0rc1~20
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=commitdiff_plain;h=247cc43aff9f3a6fe2ec3f083eeb5ec8276c7774

Fixes bug 2026 : Persistent volumes to be created in the same AZ as the VM that will use them.

Change-Id: I1f4161aa4f7b294e1acf2b33ba3208480f09eacc
Signed-off-by: Alexis Romero <garomero@indra.es>
---

diff --git a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
index 4900dfcc..3d54903e 100644
--- a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
+++ b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
@@ -1865,6 +1865,11 @@ class vimconnector(vimconn.VimConnector):
             # cloud config
             config_drive, userdata = self._create_user_data(cloud_config)
 
+            # get availability Zone
+            vm_av_zone = self._get_vm_availability_zone(
+                availability_zone_index, availability_zone_list
+            )
+
             # Create additional volumes in case these are present in disk_list
             existing_vim_volumes = []
             base_disk_index = ord("b")
@@ -1884,12 +1889,16 @@ class vimconnector(vimconn.VimConnector):
                                 size=disk["size"],
                                 name=name + "_vd" + chr(base_disk_index),
                                 imageRef=disk["image_id"],
+                                # Make sure volume is in the same AZ as the VM to be attached to
+                                availability_zone=vm_av_zone,
                             )
                             boot_volume_id = volume.id
                         else:
                             volume = self.cinder.volumes.create(
                                 size=disk["size"],
                                 name=name + "_vd" + chr(base_disk_index),
+                                # Make sure volume is in the same AZ as the VM to be attached to
+                                availability_zone=vm_av_zone,
                             )
 
                         created_items["volume:" + str(volume.id)] = True
@@ -1931,11 +1940,6 @@ class vimconnector(vimconn.VimConnector):
                 if boot_volume_id:
                     self.cinder.volumes.set_bootable(boot_volume_id, True)
 
-            # get availability Zone
-            vm_av_zone = self._get_vm_availability_zone(
-                availability_zone_index, availability_zone_list
-            )
-
             # Manage affinity groups/server groups
             server_group_id = None
             scheduller_hints = {}
diff --git a/releasenotes/notes/fix_bug_2026-846d7383cdd4227e.yaml b/releasenotes/notes/fix_bug_2026-846d7383cdd4227e.yaml
new file mode 100644
index 00000000..b4e81b3b
--- /dev/null
+++ b/releasenotes/notes/fix_bug_2026-846d7383cdd4227e.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 for bug 2026: Availability Zone is not specified during persistent volume
+    creation. Updated RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
+    to use for the created volume the same Availability zone as the VM where it is
+    going to be attached.