diff --git a/gestion/iscsi/get_volume_mapping.py b/gestion/iscsi/get_volume_mapping.py index 759c9907..d2c2dcb2 100755 --- a/gestion/iscsi/get_volume_mapping.py +++ b/gestion/iscsi/get_volume_mapping.py @@ -51,8 +51,8 @@ def get_mapping(baie_name): map = { """ % (sys.argv[0], baie)).encode(coding)) - for lun, name in map: - f.write(' %d : "%s",\n' % (lun, name)) + for lun, data in map: + f.write(' %d : %r,\n' % (lun, data)) f.write("}\n") diff --git a/gestion/iscsi/nolslib.py b/gestion/iscsi/nolslib.py index 30348e57..bd7a4f5f 100644 --- a/gestion/iscsi/nolslib.py +++ b/gestion/iscsi/nolslib.py @@ -121,12 +121,13 @@ class Nols(object): name = None lun = None name = Object.findall("PROPERTY[@name='volume-name']")[0].text + serial = Object.findall("PROPERTY[@name='volume-serial']")[0].text lun = Object.findall("OBJECT/PROPERTY[@name='lun']")[0].text if lun is None: pass else: - map[int(lun)] = name + map[int(lun)] = (name, serial) return map def create_volume(self, name, size, unit="GiB", vdisk="slon1"): diff --git a/gestion/iscsi/slonlib.py b/gestion/iscsi/slonlib.py index c89d7afc..c8355173 100644 --- a/gestion/iscsi/slonlib.py +++ b/gestion/iscsi/slonlib.py @@ -129,12 +129,13 @@ class Slon(object): name = None lun = None name = Object.findall("volume_name")[0].text + serial = Object.findall("volume_serial")[0].text lun = Object.findall("lun")[0].text if lun is None: pass else: - map[int(lun)] = name + map[int(lun)] = (name, serial) return map def create_volume(self, name, size, unit="GB", vdisk="slon2"): diff --git a/gestion/iscsi/udev_get_iscsi_name.py b/gestion/iscsi/udev_get_iscsi_name.py index efd2dd2e..47292966 100755 --- a/gestion/iscsi/udev_get_iscsi_name.py +++ b/gestion/iscsi/udev_get_iscsi_name.py @@ -41,7 +41,7 @@ def getname(device, baie): globals()['map'] = {} execfile(map_file, globals()) - return map.get(lun, "lun%d" % lun) + part + return map.get(lun, "lun%d" % lun)[0] + part if __name__ == '__main__': if len(sys.argv) != 2: