summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-17 12:31:23 +0000
committerGerrit Code Review <review@openstack.org>2015-08-17 12:31:23 +0000
commitc5dc0d9577e455f149edb5331a6e493def6928d5 (patch)
tree2ee2fe3dc26a8591d8556dc0e1765bb0b7cb7bdb
parent8381458952a5ac7d88fc2835f54050a0cf2cc492 (diff)
parentb1966b9d1e328f9bcfb98fac1e1186e1f697885a (diff)
downloadpycadf-c5dc0d9577e455f149edb5331a6e493def6928d5.tar.gz
Merge "Adding barbican specific base resources."1.1.0
-rw-r--r--pycadf/cadftaxonomy.py11
1 files changed, 11 insertions, 0 deletions
diff --git a/pycadf/cadftaxonomy.py b/pycadf/cadftaxonomy.py
index ad11647..f663fea 100644
--- a/pycadf/cadftaxonomy.py
+++ b/pycadf/cadftaxonomy.py
@@ -87,6 +87,7 @@ def is_valid_outcome(value):
return value in OUTCOME_TAXONOMY
SERVICE_SECURITY = 'service/security'
+SERVICE_KEYMGR = 'service/security/keymanager'
ACCOUNT_USER = 'service/security/account/user'
CADF_AUDIT_FILTER = 'service/security/audit/filter'
@@ -106,6 +107,11 @@ SECURITY_ROLE = 'data/security/role'
SECURITY_SERVICE = 'data/security/service'
SECURITY_TRUST = 'data/security/trust'
SECURITY_ACCOUNT_USER = 'data/security/account/user'
+KEYMGR_SECRET = 'data/security/keymanager/secret'
+KEYMGR_CONTAINER = 'data/security/keymanager/container'
+KEYMGR_ORDER = 'data/security/keymanager/order'
+KEYMGR_OTHERS = 'data/security/keymanager'
+
# TODO(mrutkows): Make global using WSGI mechanism
RESOURCE_TAXONOMY = frozenset([
@@ -137,6 +143,7 @@ RESOURCE_TAXONOMY = frozenset([
'service/compute',
'service/database',
SERVICE_SECURITY,
+ SERVICE_KEYMGR,
'service/security/account',
ACCOUNT_USER,
CADF_AUDIT_FILTER,
@@ -192,6 +199,10 @@ RESOURCE_TAXONOMY = frozenset([
'data/database/table',
'data/database/trigger',
'data/database/view',
+ KEYMGR_CONTAINER,
+ KEYMGR_ORDER,
+ KEYMGR_SECRET,
+ KEYMGR_OTHERS,
UNKNOWN
])