xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2024-12-23 19:52:10 +00:00
Code Issues Projects Releases Wiki Activity

Provide useful error when trying to delete a volume that doesn't exist

Browse Source
This commit is contained in:
Jarrod Johnson 2018-11-16 11:54:46 -05:00
parent f71d51769b
commit c8ad94313e
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
confluent_client/bin/nodestorage
View File

@ -135,6 +135,14 @@ def deletestorage(noderange, options, args):
noderange, names)):
if 'deleted' in rsp:
print('Deleted: {0}'.format(rsp['deleted']))
elif 'databynode' in rsp:
for node in rsp['databynode']:
if 'error' in rsp['databynode'][node]:
sys.stderr.write('{0}: {1}\n'.format(
node, rsp['databynode'][node]['error']))
else:
sys.stderr.write('{0}: {1}\n'.format(
node, repr(rsp['databynode'][node])))
else:
print(repr(rsp))

6
confluent_server/confluent/plugins/hardwaremanagement/ipmi.py
View File

@ -955,11 +955,17 @@ class IpmiHandler(object):
volname = storelem[-1]
curr = self.ipmicmd.get_storage_configuration()
volumes = []
volsfound = False
toremove = storage.ConfigSpec(arrays=[storage.Array(volumes=volumes)])
for pool in curr.arrays:
for vol in pool.volumes:
if simplify_name(vol.name) == volname:
volsfound = True
volumes.append(vol)
if not volsfound:
self.output.put(msg.ConfluentTargetNotFound(
self.node, "No volume named '{0}' found".format(volname)))
return
self.ipmicmd.remove_storage_configuration(toremove)
self.output.put(msg.DeletedResource(volname))