openstack/deb-barbican
Code Issues Proposed changes

Change keystone_id for external_id in model

Browse Source 
The Project model contains a reference to its ID as assigned by an
external entity (usually keystone). Initially the name keystone_id was
given, but it was agreed that in the effort of standardizing
everything to use the v3 nomenclature (projects instead of tenants)
the wording 'keystone_id' would be replaced, as it was initially used
because of the aforementioned nomenclature confusion. Thus, to remove
redundancy and express what that ID actually is, the name is changed
in the Project model.

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

Change-Id: I521f88af2c724af2a4e374169d76140829add54b
This commit is contained in:
Juan Antonio Osorio Robles
2014-12-22 04:00:51 +02:00
parent 6defa4452f
commit a9c46e9898
8 changed files with 49 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
barbican/model/repositories.py
View File

@@ -589,7 +589,7 @@ class ProjectRepo(BaseRepo):
try:
query = session.query(models.Project)
query = query.filter_by(keystone_id=keystone_id)
query = query.filter_by(external_id=keystone_id)
entity = query.one()
@@ -649,7 +649,7 @@ class SecretRepo(BaseRepo):
query = query.join(models.ProjectSecret,
models.Secret.project_assocs)
query = query.join(models.Project, models.ProjectSecret.projects)
query = query.filter(models.Project.keystone_id == keystone_id)
query = query.filter(models.Project.external_id == keystone_id)
start = offset
end = offset + limit
@@ -684,7 +684,7 @@ class SecretRepo(BaseRepo):
query = query.filter(expiration_filter)
query = query.join(models.ProjectSecret, models.Secret.project_assocs)
query = query.join(models.Project, models.ProjectSecret.projects)
query = query.filter(models.Project.keystone_id == keystone_id)
query = query.filter(models.Project.external_id == keystone_id)
return query
@@ -813,7 +813,7 @@ class KEKDatumRepo(BaseRepo):
kek_datum = models.KEKDatum()
kek_datum.kek_label = "project-{0}-key-{1}".format(
project.keystone_id, uuid.uuid4())
project.external_id, uuid.uuid4())
kek_datum.project_id = project.id
kek_datum.plugin_name = plugin_name
kek_datum.status = models.States.ACTIVE
@@ -900,7 +900,7 @@ class OrderRepo(BaseRepo):
query = query.order_by(models.Order.created_at)
query = query.filter_by(deleted=False)
query = query.join(models.Project, models.Order.project)
query = query.filter(models.Project.keystone_id == keystone_id)
query = query.filter(models.Project.external_id == keystone_id)
start = offset
end = offset + limit
@@ -925,7 +925,7 @@ class OrderRepo(BaseRepo):
query = session.query(models.Order)
query = query.filter_by(id=entity_id, deleted=False)
query = query.join(models.Project, models.Order.project)
query = query.filter(models.Project.keystone_id == keystone_id)
query = query.filter(models.Project.external_id == keystone_id)
return query
def _do_validate(self, values):
@@ -1015,7 +1015,7 @@ class ContainerRepo(BaseRepo):
query = query.order_by(models.Container.created_at)
query = query.filter_by(deleted=False)
query = query.join(models.Project, models.Container.project)
query = query.filter(models.Project.keystone_id == keystone_id)
query = query.filter(models.Project.external_id == keystone_id)
start = offset
end = offset + limit
@@ -1040,7 +1040,7 @@ class ContainerRepo(BaseRepo):
query = session.query(models.Container)
query = query.filter_by(id=entity_id, deleted=False)
query = query.join(models.Project, models.Container.project)
query = query.filter(models.Project.keystone_id == keystone_id)
query = query.filter(models.Project.external_id == keystone_id)
return query
def _do_validate(self, values):