Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix field type to audit_type"

Browse Source
This commit is contained in:
Jenkins
2016-07-07 08:57:44 +00:00
committed by Gerrit Code Review
parent d61c4c12d1 47ff9bb105
commit b1c6ea71a4
12 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
watcher/api/controllers/v1/audit.py
View File

@@ -54,7 +54,7 @@ class AuditPostType(wtypes.Base):
audit_template_uuid = wtypes.wsattr(types.uuid, mandatory=True)
type = wtypes.wsattr(wtypes.text, mandatory=True)
audit_type = wtypes.wsattr(wtypes.text, mandatory=True)
deadline = wtypes.wsattr(datetime.datetime, mandatory=False)
@@ -66,12 +66,12 @@ class AuditPostType(wtypes.Base):
def as_audit(self):
audit_type_values = [val.value for val in objects.audit.AuditType]
if self.type not in audit_type_values:
raise exception.AuditTypeNotFound(audit_type=self.type)
if self.audit_type not in audit_type_values:
raise exception.AuditTypeNotFound(audit_type=self.audit_type)
return Audit(
audit_template_id=self.audit_template_uuid,
type=self.type,
audit_type=self.audit_type,
deadline=self.deadline,
parameters=self.parameters,
)
@@ -133,7 +133,7 @@ class Audit(base.APIBase):
uuid = types.uuid
"""Unique UUID for this audit"""
type = wtypes.text
audit_type = wtypes.text
"""Type of this audit"""
deadline = datetime.datetime
@@ -185,7 +185,7 @@ class Audit(base.APIBase):
@staticmethod
def _convert_with_links(audit, url, expand=True):
if not expand:
audit.unset_fields_except(['uuid', 'type', 'deadline',
audit.unset_fields_except(['uuid', 'audit_type', 'deadline',
'state', 'audit_template_uuid',
'audit_template_name'])
@@ -210,7 +210,7 @@ class Audit(base.APIBase):
@classmethod
def sample(cls, expand=True):
sample = cls(uuid='27e3153e-d5bf-4b7e-b517-fb518e17f34c',
type='ONESHOT',
audit_type='ONESHOT',
state='PENDING',
deadline=None,
created_at=datetime.datetime.utcnow(),