From 78595acff63817f793e4ec013ed85f4a9f4d612d Mon Sep 17 00:00:00 2001 From: Ricardo Marques Date: Fri, 29 Mar 2019 13:33:19 +0000 Subject: [PATCH] mgr/dashboard: Fix iSCSI disk diff calculation The separator is now a '/' instead of '.' Fixes: https://tracker.ceph.com/issues/39109 Signed-off-by: Ricardo Marques --- src/pybind/mgr/dashboard/controllers/iscsi.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pybind/mgr/dashboard/controllers/iscsi.py b/src/pybind/mgr/dashboard/controllers/iscsi.py index 9b4c19dcf4e1..350bdb2f4078 100644 --- a/src/pybind/mgr/dashboard/controllers/iscsi.py +++ b/src/pybind/mgr/dashboard/controllers/iscsi.py @@ -252,7 +252,7 @@ class IscsiTarget(RESTController): return True # Check if any disk inside this group has changed for disk in new_group['disks']: - image_id = '{}.{}'.format(disk['pool'], disk['image']) + image_id = '{}/{}'.format(disk['pool'], disk['image']) if IscsiTarget._target_lun_deletion_required(target, new_target_iqn, new_target_controls, new_portals, new_disks, image_id): @@ -291,7 +291,7 @@ class IscsiTarget(RESTController): @staticmethod def _get_disk(disks, image_id): for disk in disks: - if '{}.{}'.format(disk['pool'], disk['image']) == image_id: + if '{}/{}'.format(disk['pool'], disk['image']) == image_id: return disk return None -- 2.47.3