]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
mgr/dashboard: Fix iSCSI disk diff calculation
authorRicardo Marques <rimarques@suse.com>
Fri, 29 Mar 2019 13:33:19 +0000 (13:33 +0000)
committerRicardo Marques <rimarques@suse.com>
Thu, 4 Apr 2019 12:35:53 +0000 (13:35 +0100)
The separator is now a '/' instead of '.'

Fixes: https://tracker.ceph.com/issues/39109
Signed-off-by: Ricardo Marques <rimarques@suse.com>
src/pybind/mgr/dashboard/controllers/iscsi.py

index 9b4c19dcf4e1b9635f4d57a9e7cdf99d256dd94d..350bdb2f4078b01cf58e7a48a1967cebf7d79e67 100644 (file)
@@ -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