Find the existing persistent volume by vim_id keyword
It's possible to find an existing disk id searching with vim_id or
vim_volume_id depend on situation. vim_id is added in the search key list.
Change-Id: I7847cfc30a26bfa5f860eae2aefdbc4c44050234
Signed-off-by: aticig <gulsum.atici@canonical.com>
diff --git a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
index d9edb32..eda5699 100644
--- a/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
+++ b/RO-VIM-openstack/osm_rovim_openstack/vimconn_openstack.py
@@ -1901,14 +1901,18 @@
# persistent root volume
base_disk_index = ord("a")
image_id = ""
+ # use existing persistent root volume
if disk.get("vim_volume_id"):
-
- # use existing persistent root volume
block_device_mapping["vd" + chr(base_disk_index)] = disk[
"vim_volume_id"
]
existing_vim_volumes.append({"id": disk["vim_volume_id"]})
-
+ # use existing persistent root volume
+ elif disk.get("vim_id"):
+ block_device_mapping["vd" + chr(base_disk_index)] = disk[
+ "vim_id"
+ ]
+ existing_vim_volumes.append({"id": disk["vim_id"]})
else:
# create persistent root volume
volume = self.cinder.volumes.create(
@@ -1925,16 +1929,18 @@
] = volume.id
else:
# non-root persistent volume
- if disk.get("vim_volume_id"):
-
+ key_id = (
+ "vim_volume_id"
+ if "vim_volume_id" in disk.keys()
+ else "vim_id"
+ )
+ if disk.get(key_id):
# use existing persistent volume
block_device_mapping["vd" + chr(base_disk_index)] = disk[
- "vim_volume_id"
+ key_id
]
- existing_vim_volumes.append({"id": disk["vim_volume_id"]})
-
+ existing_vim_volumes.append({"id": disk[key_id]})
else:
-
# create persistent volume
volume = self.cinder.volumes.create(
size=disk["size"],