Merge pull request sodafoundation#817 from qinwang-murphy/add_host_in…

…itiator_type Add a host status and resolved problem of tenant field is deleted from oslo.context 4.0.0.
gh-ca · Feb 8, 2022 · 928641a · 928641a
2 parents 122c928 + 014d58c
commit 928641a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/delfin/common/constants.py b/delfin/common/constants.py
@@ -245,8 +245,9 @@ class HostStatus(object):
     NORMAL = 'normal'
     OFFLINE = 'offline'
     ABNORMAL = 'abnormal'
+    DEGRADED = 'degraded'
 
-    ALL = (NORMAL, OFFLINE, ABNORMAL)
+    ALL = (NORMAL, OFFLINE, ABNORMAL, DEGRADED)
 
 
 class HostOSTypes(object):

diff --git a/delfin/context.py b/delfin/context.py
@@ -57,7 +57,6 @@ def __init__(self, user_id=None, project_id=None, is_admin=None,
         super(RequestContext, self).__init__(
             auth_token=auth_token,
             user=user_id or user,
-            tenant=project_id or tenant,
             domain=kwargs.pop('domain', None),
             user_domain=kwargs.pop('user_domain', None),
             project_domain=kwargs.pop('project_domain', None),
@@ -70,6 +69,7 @@ def __init__(self, user_id=None, project_id=None, is_admin=None,
             roles=roles)
 
         self.user_id = self.user
+        self.tenant = project_id or tenant
         self.project_id = self.tenant
 
         self.read_deleted = read_deleted