openstack/barbican
Code Issues Proposed changes

Replace model related instances of tenant

Browse Source 
This CR renames the instances of the word tenant for projects in the
cases where there is a relation to the models. In addition, the proper
migration scripts where writen.

Partially implements: blueprint replace-concept-of-tenants-for-projects

Change-Id: Ifcd773b31f65704737f2925ee67743df39ec50f7
This commit is contained in:
Juan Antonio Osorio Robles
2014-12-10 13:08:32 +02:00
parent f29d08610d
commit c2b32c5450
19 changed files with 182 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
barbican/plugin/store_crypto.py
View File

@@ -115,10 +115,10 @@ class StoreCryptoAdapterPlugin(object):
# Find HSM-style 'crypto' plugin.
decrypting_plugin = manager.PLUGIN_MANAGER.get_plugin_retrieve(
datum_model.kek_meta_tenant.plugin_name)
datum_model.kek_meta_project.plugin_name)
# wrap the KEKDatum instance in our DTO
kek_meta_dto = crypto.KEKMetaDTO(datum_model.kek_meta_tenant)
kek_meta_dto = crypto.KEKMetaDTO(datum_model.kek_meta_project)
# Convert from text-based storage format to binary.
encrypted = base64.b64decode(datum_model.cypher_text)
@@ -298,8 +298,8 @@ def _store_secret_and_datum(
# Create Secret entities in data store.
if not secret_model.id:
repositories.get_secret_repository().create_from(secret_model)
new_assoc = models.TenantSecret()
new_assoc.tenant_id = context.project_model.id
new_assoc = models.ProjectSecret()
new_assoc.project_id = context.project_model.id
new_assoc.secret_id = secret_model.id
new_assoc.role = "admin"
new_assoc.status = models.States.ACTIVE