crans/scripts
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

On ajoute le serial dans le mapping des baies.

Browse source
This commit is contained in:
Pierre-Elliott Bécue 2015-02-01 13:27:02 +01:00
parent 03a6d1b92a
commit 3471c4fd5d
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
gestion/iscsi/get_volume_mapping.py
View file

@ -51,8 +51,8 @@ def get_mapping(baie_name):
map = { map = {
""" % (sys.argv[0], baie)).encode(coding)) """ % (sys.argv[0], baie)).encode(coding))
for lun, name in map: for lun, data in map:
f.write(' %d : "%s",\n' % (lun, name)) f.write(' %d : %r,\n' % (lun, data))
f.write("}\n") f.write("}\n")

3
gestion/iscsi/nolslib.py
View file

@ -121,12 +121,13 @@ class Nols(object):
name = None name = None
lun = None lun = None
name = Object.findall("PROPERTY[@name='volume-name']")[0].text 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 lun = Object.findall("OBJECT/PROPERTY[@name='lun']")[0].text
if lun is None: if lun is None:
pass pass
else: else:
map[int(lun)] = name map[int(lun)] = (name, serial)
return map return map
def create_volume(self, name, size, unit="GiB", vdisk="slon1"): def create_volume(self, name, size, unit="GiB", vdisk="slon1"):

3
gestion/iscsi/slonlib.py
View file

@ -129,12 +129,13 @@ class Slon(object):
name = None name = None
lun = None lun = None
name = Object.findall("volume_name")[0].text name = Object.findall("volume_name")[0].text
serial = Object.findall("volume_serial")[0].text
lun = Object.findall("lun")[0].text lun = Object.findall("lun")[0].text
if lun is None: if lun is None:
pass pass
else: else:
map[int(lun)] = name map[int(lun)] = (name, serial)
return map return map
def create_volume(self, name, size, unit="GB", vdisk="slon2"): def create_volume(self, name, size, unit="GB", vdisk="slon2"):

2
gestion/iscsi/udev_get_iscsi_name.py
View file

@ -41,7 +41,7 @@ def getname(device, baie):
globals()['map'] = {} globals()['map'] = {}
execfile(map_file, globals()) 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 __name__ == '__main__':
if len(sys.argv) != 2: if len(sys.argv) != 2: