Fix error on deleting Magnum App
Currently Murano fails to delete Magnum bay due to missing bay_ident attribute in case when Magnum bay status is CREATE_FAILED. This patch fixs this issue. Change-Id: Iecbd0464bd8839f1a9f9ce428d7eaa1e130c9b2d Closes-bug: #1566725
This commit is contained in:
parent
c1809a2c7d
commit
49893c833f
contrib/plugins/magnum_plugin
@ -79,5 +79,12 @@ Methods:
|
||||
- $._environment.reporter.report_error($, $formatString.format($e.message))
|
||||
- Rethrow:
|
||||
- $.setAttr(bayId, $bayId)
|
||||
- $bayStatus: $._magnum.getBayStatus($bayId)
|
||||
- If: $bayStatus = "CREATE_FAILED"
|
||||
Then:
|
||||
- $msg: 'Magnum bay create failed'
|
||||
- $._environment.reporter.report_error($this, $msg)
|
||||
- Throw: MagnumBayCreateFailed
|
||||
Message: $msg
|
||||
- $msg: format('Magnum bay {0} is created', $.name)
|
||||
- $._environment.reporter.report($this, $msg)
|
||||
|
@ -66,11 +66,16 @@ class MagnumClient(object):
|
||||
def delete_baymodel(self, baymodel_id):
|
||||
self._client.baymodels.delete(baymodel_id)
|
||||
|
||||
def get_bay_status(self, bay_id):
|
||||
bays = self._client.bays
|
||||
bay = bays.get(bay_id)
|
||||
return bay.status
|
||||
|
||||
def create_bay(self, args):
|
||||
bays = self._client.bays
|
||||
bay = bays.create(**args)
|
||||
self._wait_on_status(bays, bay.uuid, [None, "CREATE_IN_PROGRESS"],
|
||||
["CREATE_COMPLETE"])
|
||||
["CREATE_COMPLETE", "CREATE_FAILED"])
|
||||
return bay.uuid
|
||||
|
||||
def delete_bay(self, bay_id):
|
||||
|
Loading…
x
Reference in New Issue
Block a user