diff --git a/NG-RO/osm_ng_ro/ns.py b/NG-RO/osm_ng_ro/ns.py
index b73cf5233aa3792bae243b359dd048a7d374bd5b..ea22381f52ae1bfc54bb5309eae7c6cbc6498885 100644
--- a/NG-RO/osm_ng_ro/ns.py
+++ b/NG-RO/osm_ng_ro/ns.py
@@ -855,9 +855,8 @@ class Ns(object):
for vsd in vnfd.get("virtual-storage-desc", ()):
if vsd.get("id") == vdu.get("virtual-storage-desc", [[]])[0]:
root_disk = vsd
- if (
- root_disk.get("type-of-storage")
- == "persistent-storage:persistent-storage"
+ if root_disk.get("type-of-storage", "").endswith(
+ "persistent-storage"
):
flavor_data["disk"] = 0
@@ -1202,10 +1201,7 @@ class Ns(object):
and vsd.get("id") == vdu.get("virtual-storage-desc", [[]])[0]
):
root_disk = vsd
- if (
- root_disk.get("type-of-storage")
- == "persistent-storage:persistent-storage"
- ):
+ if root_disk.get("type-of-storage", "").endswith("persistent-storage"):
for vdu_volume in vdu_instantiation_volumes_list:
if (
vdu_volume["vim-volume-id"]
@@ -1254,7 +1250,7 @@ class Ns(object):
persistent_disk = {}
for disk in target_vdu.get("virtual-storages", {}):
if (
- disk.get("type-of-storage") == "persistent-storage:persistent-storage"
+ disk.get("type-of-storage", "").endswith("persistent-storage")
and disk["id"] not in persistent_root_disk.keys()
):
for vdu_volume in vdu_instantiation_volumes_list:
@@ -1614,11 +1610,9 @@ class Ns(object):
"""
if vsd.get("id") == vdu.get("virtual-storage-desc", [[]])[0]:
root_disk = vsd
- if root_disk.get(
- "type-of-storage"
- ) == "persistent-storage:persistent-storage" and root_disk.get(
- "size-of-storage"
- ):
+ if root_disk.get("type-of-storage", "").endswith(
+ "persistent-storage"
+ ) and root_disk.get("size-of-storage"):
return root_disk
@staticmethod
@@ -1671,8 +1665,7 @@ class Ns(object):
if target_vdu.get("virtual-storages"):
for disk in target_vdu["virtual-storages"]:
if (
- disk.get("type-of-storage")
- == "persistent-storage:persistent-storage"
+ disk.get("type-of-storage", "").endswith("persistent-storage")
and disk["id"] not in persistent_root_disk.keys()
):
name, multiattach = Ns.is_shared_volume(disk, vnf_id)
diff --git a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
index 85ef2ca1443d21179c845d8a6c4fc1d4c88379e3..7b27e251cf386ff046353d5a9bf752d7d02bee2a 100644
--- a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
+++ b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
@@ -2139,6 +2139,7 @@ class vimconnector(vimconn.VimConnector):
boot_volume_id (str): ID of boot volume
"""
+ self.logger.debug("Preparing root persistent volumes")
# Disk may include only vim_volume_id or only vim_id."
# Use existing persistent root volume finding with volume_id or vim_id
key_id = "vim_volume_id" if "vim_volume_id" in disk.keys() else "vim_id"
@@ -2199,6 +2200,7 @@ class vimconnector(vimconn.VimConnector):
@catch_any_exception
def new_shared_volumes(self, shared_volume_data) -> (str, str):
+ self.logger.debug("Creating new shared volume")
availability_zone = (
self.storage_availability_zone
if self.storage_availability_zone
@@ -2221,6 +2223,7 @@ class vimconnector(vimconn.VimConnector):
existing_vim_volumes: list,
created_items: dict,
):
+ self.logger.debug("Preparing shared volumes")
volumes = {volume.name: volume.id for volume in self.cinder.volumes.list()}
if volumes.get(disk["name"]):
sv_id = volumes[disk["name"]]
@@ -2270,6 +2273,7 @@ class vimconnector(vimconn.VimConnector):
"""
# Non-root persistent volumes
# Disk may include only vim_volume_id or only vim_id."
+ self.logger.debug("Preparing non-root persistent volumes")
key_id = "vim_volume_id" if "vim_volume_id" in disk.keys() else "vim_id"
if disk.get(key_id):
# Use existing persistent volume
@@ -2304,13 +2308,16 @@ class vimconnector(vimconn.VimConnector):
elapsed_time (int): Time spent while waiting
"""
+ self.logger.debug("Waiting for all created volumes to become available")
while elapsed_time < volume_timeout:
+ self.logger.debug("Checking disk availability for created volumes")
for created_item in created_items:
v, volume_id = (
created_item.split(":")[0],
created_item.split(":")[1],
)
if v == "volume":
+ self.logger.debug(f"Checking volume: {volume_id}")
volume = self.cinder.volumes.get(volume_id)
if (
volume.volume_type == "multiattach"
@@ -2342,8 +2349,11 @@ class vimconnector(vimconn.VimConnector):
"""
+ self.logger.debug("Waiting for all existing volumes to become available")
while elapsed_time < volume_timeout:
+ self.logger.debug("Checking disk availability for existing volumes")
for volume in existing_vim_volumes:
+ self.logger.debug(f"Checking existing volume: {volume}")
v = self.cinder.volumes.get(volume["id"])
if v.volume_type == "multiattach" and v.status == "in-use":
return elapsed_time
@@ -2378,10 +2388,12 @@ class vimconnector(vimconn.VimConnector):
"""
# Create additional volumes in case these are present in disk_list
+ self.logger.debug("Preparing disks for VM instances")
base_disk_index = ord("b")
boot_volume_id = None
elapsed_time = 0
for disk in disk_list:
+ self.logger.debug(f"Disk: {disk}")
if "image_id" in disk:
# Root persistent volume
base_disk_index = ord("a")
@@ -3622,8 +3634,7 @@ class vimconnector(vimconn.VimConnector):
def get_hosts_info(self):
"""Get the information of deployed hosts
Returns the hosts content"""
- if self.debug:
- print("osconnector: Getting Host info from VIM")
+ self.logger.debug("osconnector: Getting Host info from VIM")
try:
h_list = []