Merge "Replace server fault_info with fault"
This commit is contained in:
commit
db41f26426
|
@ -24,7 +24,7 @@
|
||||||
"power_state": "power on",
|
"power_state": "power on",
|
||||||
"project_id": "c18e8a1a870d4c08a0b51ced6e0b6459",
|
"project_id": "c18e8a1a870d4c08a0b51ced6e0b6459",
|
||||||
"status": "error",
|
"status": "error",
|
||||||
"fault_info": {
|
"fault": {
|
||||||
"code": 500,
|
"code": 500,
|
||||||
"message": "fault message",
|
"message": "fault message",
|
||||||
"detail": "fault detail"
|
"detail": "fault detail"
|
||||||
|
|
|
@ -263,7 +263,7 @@ Response
|
||||||
- uuid: server_uuid
|
- uuid: server_uuid
|
||||||
- status: server_status
|
- status: server_status
|
||||||
- power_state: server_power_state
|
- power_state: server_power_state
|
||||||
- fault_info: server_fault
|
- fault: server_fault
|
||||||
- project_id: project_id_body
|
- project_id: project_id_body
|
||||||
- user_id: user_id_body
|
- user_id: user_id_body
|
||||||
- updated_at: updated_at
|
- updated_at: updated_at
|
||||||
|
|
|
@ -445,8 +445,8 @@ class Server(base.APIBase):
|
||||||
metadata = {wtypes.text: types.jsontype}
|
metadata = {wtypes.text: types.jsontype}
|
||||||
"""The meta data of the server"""
|
"""The meta data of the server"""
|
||||||
|
|
||||||
fault_info = {wtypes.text: types.jsontype}
|
fault = {wtypes.text: types.jsontype}
|
||||||
"""The fault info of the server"""
|
"""The fault of the server"""
|
||||||
|
|
||||||
node_uuid = types.uuid
|
node_uuid = types.uuid
|
||||||
"""The node UUID of the server"""
|
"""The node UUID of the server"""
|
||||||
|
@ -461,11 +461,9 @@ class Server(base.APIBase):
|
||||||
setattr(self, field, nics)
|
setattr(self, field, nics)
|
||||||
continue
|
continue
|
||||||
if field == 'fault':
|
if field == 'fault':
|
||||||
if kwargs.get('status', None) == 'error':
|
if kwargs.get('status') != 'error':
|
||||||
fault_info = kwargs.get(field, None)
|
setattr(self, field, wtypes.Unset)
|
||||||
if fault_info is not None:
|
continue
|
||||||
fault_info = fault_info.return_dict()
|
|
||||||
setattr(self, 'fault_info', fault_info)
|
|
||||||
if field == 'node_uuid':
|
if field == 'node_uuid':
|
||||||
if not pecan.request.context.is_admin:
|
if not pecan.request.context.is_admin:
|
||||||
setattr(self, field, wtypes.Unset)
|
setattr(self, field, wtypes.Unset)
|
||||||
|
|
|
@ -121,6 +121,11 @@ class Server(base.MoganObject, object_base.VersionedObjectDictCompat):
|
||||||
data = dict(self.items())
|
data = dict(self.items())
|
||||||
if 'nics' in data:
|
if 'nics' in data:
|
||||||
data.update(nics=data['nics'].as_list_of_dict())
|
data.update(nics=data['nics'].as_list_of_dict())
|
||||||
|
if 'fault' in data:
|
||||||
|
if data['fault'] is not None:
|
||||||
|
data.update(fault=data['fault'].as_fault_dict())
|
||||||
|
else:
|
||||||
|
data.update(fault={})
|
||||||
return data
|
return data
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
|
|
|
@ -40,7 +40,7 @@ class ServerFault(base.MoganObject, object_base.VersionedObjectDictCompat):
|
||||||
'detail': object_fields.StringField(nullable=True),
|
'detail': object_fields.StringField(nullable=True),
|
||||||
}
|
}
|
||||||
|
|
||||||
def return_dict(self):
|
def as_fault_dict(self):
|
||||||
return dict((k, getattr(self, k))
|
return dict((k, getattr(self, k))
|
||||||
for k in ['code', 'message', 'detail']
|
for k in ['code', 'message', 'detail']
|
||||||
if hasattr(self, k))
|
if hasattr(self, k))
|
||||||
|
|
Loading…
Reference in New Issue