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

Update hacking version

Browse Source 
Use latest release 1.1.0 and compatible changes w.r.t pep8

Change-Id: If1860c3fe287852e87704b511567c65d8d4d0c1c
This commit is contained in:
zhulingjie
2019-01-04 23:59:26 +08:00
parent 7dbd8ab34b
commit a4d31eac42
10 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -123,8 +123,8 @@ class AuditPostType(wtypes.Base):
'or goal should be provided.')
if (self.audit_type == objects.audit.AuditType.ONESHOT.value and
(self.start_time not in (wtypes.Unset, None)
or self.end_time not in (wtypes.Unset, None))):
(self.start_time not in (wtypes.Unset, None) or
self.end_time not in (wtypes.Unset, None))):
raise exception.AuditStartEndTimeNotAllowed(
audit_type=self.audit_type)

4
watcher/api/controllers/v1/service.py
View File

@@ -69,8 +69,8 @@ class Service(base.APIBase):
def _set_status(self, id):
service = objects.Service.get(pecan.request.context, id)
last_heartbeat = (service.last_seen_up or service.updated_at
or service.created_at)
last_heartbeat = (service.last_seen_up or service.updated_at or
service.created_at)
if isinstance(last_heartbeat, six.string_types):
# NOTE(russellb) If this service came in over rpc via
# conductor, then the timestamp will be a string and needs to be