diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-03-23 18:44:49 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-03-23 18:44:49 +0000 |
| commit | 03f80af9194a55f4f9acee4c8e18a4818a2a0d7e (patch) | |
| tree | 65c3c48697c5f90823fac650bcc1c78f9ac1c7b1 | |
| parent | c0974bf9dfdb990463b6c48ae93c5eb784d358e5 (diff) | |
| parent | 64c1593503c1f8879515123d1baffad56ae963f9 (diff) | |
Merge "Remove unused certificate SQL calls."
| -rw-r--r-- | nova/db/api.py | 14 | ||||
| -rw-r--r-- | nova/db/sqlalchemy/api.py | 22 |
2 files changed, 0 insertions, 36 deletions
diff --git a/nova/db/api.py b/nova/db/api.py index 02eaa14a3..850c772c7 100644 --- a/nova/db/api.py +++ b/nova/db/api.py @@ -209,11 +209,6 @@ def certificate_create(context, values): return IMPL.certificate_create(context, values) -def certificate_destroy(context, certificate_id): - """Destroy the certificate or raise if it does not exist.""" - return IMPL.certificate_destroy(context, certificate_id) - - def certificate_get_all_by_project(context, project_id): """Get all certificates for a project.""" return IMPL.certificate_get_all_by_project(context, project_id) @@ -231,15 +226,6 @@ def certificate_get_all_by_user_and_project(context, user_id, project_id): project_id) -def certificate_update(context, certificate_id, values): - """Set the given properties on an certificate and update it. - - Raises NotFound if service does not exist. - - """ - return IMPL.certificate_update(context, certificate_id, values) - - ################### def floating_ip_get(context, id): diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py index d990b970a..ebb8b60e0 100644 --- a/nova/db/sqlalchemy/api.py +++ b/nova/db/sqlalchemy/api.py @@ -588,16 +588,6 @@ def certificate_create(context, values): @require_admin_context -def certificate_destroy(context, certificate_id): - session = get_session() - with session.begin(): - certificate_ref = certificate_get(context, - certificate_id, - session=session) - certificate_ref.delete(session=session) - - -@require_admin_context def certificate_get_all_by_project(context, project_id): return model_query(context, models.Certificate, read_deleted="no").\ filter_by(project_id=project_id).\ @@ -619,18 +609,6 @@ def certificate_get_all_by_user_and_project(context, user_id, project_id): all() -@require_admin_context -def certificate_update(context, certificate_id, values): - session = get_session() - with session.begin(): - certificate_ref = certificate_get(context, - certificate_id, - session=session) - for (key, value) in values.iteritems(): - certificate_ref[key] = value - certificate_ref.save(session=session) - - ################### |