From 016876407ddebaec9d27cd4a01a437c4bd7be75d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Gonz=C3=A1lez?= Date: Wed, 15 Jul 2020 16:47:04 +0200 Subject: [PATCH] B #: fix image str_to_disk_type method (#97) (cherry picked from commit 3cec98a11f867f94f8b4230364ae134d77168989) --- src/image/Image.cc | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/src/image/Image.cc b/src/image/Image.cc index 018fbc83ca..c1f57cf426 100644 --- a/src/image/Image.cc +++ b/src/image/Image.cc @@ -798,30 +798,42 @@ Image::DiskType Image::str_to_disk_type(string& s_disk_type) { type = Image::FILE; } - else if (s_disk_type == "BLOCK") - { - type = Image::BLOCK; - } - else if (s_disk_type == "ISCSI") - { - type = Image::ISCSI; - } else if (s_disk_type == "CDROM") { type = Image::CD_ROM; } + else if (s_disk_type == "BLOCK") + { + type = Image::BLOCK; + } else if (s_disk_type == "RBD") { type = Image::RBD; } - else if (s_disk_type == "SHEEPDOG") + else if (s_disk_type == "RBD_CDROM") { - type = Image::SHEEPDOG; + type = Image::RBD_CDROM; } else if (s_disk_type == "GLUSTER") { type = Image::GLUSTER; } + else if (s_disk_type == "GLUSTER_CDROM") + { + type = Image::GLUSTER_CDROM; + } + else if (s_disk_type == "SHEEPDOG") + { + type = Image::SHEEPDOG; + } + else if (s_disk_type == "SHEEPDOG_CDROM") + { + type = Image::SHEEPDOG_CDROM; + } + else if (s_disk_type == "ISCSI") + { + type = Image::ISCSI; + } return type; }