node.py (ironic-17.0.2) | : | node.py (ironic-17.0.3) | ||
---|---|---|---|---|
skipping to change at line 170 | skipping to change at line 170 | |||
'vendor_interface': object_fields.StringField(nullable=True), | 'vendor_interface': object_fields.StringField(nullable=True), | |||
'traits': object_fields.ObjectField('TraitList', nullable=True), | 'traits': object_fields.ObjectField('TraitList', nullable=True), | |||
'owner': object_fields.StringField(nullable=True), | 'owner': object_fields.StringField(nullable=True), | |||
'lessee': object_fields.StringField(nullable=True), | 'lessee': object_fields.StringField(nullable=True), | |||
'description': object_fields.StringField(nullable=True), | 'description': object_fields.StringField(nullable=True), | |||
'retired': objects.fields.BooleanField(nullable=True), | 'retired': objects.fields.BooleanField(nullable=True), | |||
'retired_reason': object_fields.StringField(nullable=True), | 'retired_reason': object_fields.StringField(nullable=True), | |||
'network_data': object_fields.FlexibleDictField(nullable=True), | 'network_data': object_fields.FlexibleDictField(nullable=True), | |||
} | } | |||
def as_dict(self, secure=False): | def as_dict(self, secure=False, mask_configdrive=True): | |||
d = super(Node, self).as_dict() | d = super(Node, self).as_dict() | |||
if secure: | if secure: | |||
d['driver_info'] = strutils.mask_dict_password( | d['driver_info'] = strutils.mask_dict_password( | |||
d.get('driver_info', {}), "******") | d.get('driver_info', {}), "******") | |||
d['instance_info'] = strutils.mask_dict_password( | iinfo = d.pop('instance_info', {}) | |||
d.get('instance_info', {}), "******") | if not mask_configdrive: | |||
configdrive = iinfo.pop('configdrive', None) | ||||
d['instance_info'] = strutils.mask_dict_password(iinfo, "******") | ||||
if not mask_configdrive and configdrive: | ||||
d['instance_info']['configdrive'] = configdrive | ||||
d['driver_internal_info'] = strutils.mask_dict_password( | d['driver_internal_info'] = strutils.mask_dict_password( | |||
d.get('driver_internal_info', {}), "******") | d.get('driver_internal_info', {}), "******") | |||
return d | return d | |||
def _validate_property_values(self, properties): | def _validate_property_values(self, properties): | |||
"""Check if the input of local_gb, cpus and memory_mb are valid. | """Check if the input of local_gb, cpus and memory_mb are valid. | |||
:param properties: a dict contains the node's information. | :param properties: a dict contains the node's information. | |||
""" | """ | |||
if not properties: | if not properties: | |||
End of changes. 2 change blocks. | ||||
3 lines changed or deleted | 7 lines changed or added |