← Back to branch summary

~jaypipes/glance/parallax-register-image

« back to all changes in this revision

Viewing changes to glance/parallax/db/sqlalchemy/api.py

  • Committer: Tarmac
  • Author(s): Rick Harris
  • Date: 2010-10-04 19:06:48 UTC
  • mfrom: (8.2.7 add_registry_adapter)
  • Revision ID: hudson@openstack.org-20101004190648-89onc9bn270vw6u5
This patch: 
  * Decouples Controller for ParallaxAdapter implementation by adding generic RegistryAdapter and providing a lookup function
  * Adds base model attributes to Parallax's JSON (created_at, etc)

Show diffs side-by-side

added added

removed removed

Lines of Context:
glance/parallax/db/sqlalchemy/api.py
23
23
from glance.common import db
24
24
from glance.common import exception
25
25
from glance.common import flags
26
 
from glance.common.db.sqlalchemy import models
27
26
from glance.common.db.sqlalchemy.session import get_session
 
27
from glance.parallax.db.sqlalchemy import models
28
28
from sqlalchemy.orm import exc
29
29
 
30
30
#from sqlalchemy.orm import joinedload_all
78
78
    except exc.NoResultFound:
79
79
        new_exc = exception.NotFound("No model for id %s" % image_id)
80
80
        raise new_exc.__class__, new_exc, sys.exc_info()[2]
81
 
    return models.Image.find(image_id, deleted=_deleted(context))
82
81
 
83
82
 
84
83
def image_get_all(context):
85
84
    session = get_session()
86
 
    # TODO(sirp): add back eager loading
87
 
    return session.query(models.Image
88
 
                 #).options(joinedload(models.Image.files)
89
 
                 #).options(joinedload(models.Image.metadata)
90
 
                 ).filter_by(deleted=_deleted(context)
 
85
    return session.query(models.Image
 
86
                 ).options(joinedload(models.Image.files)
 
87
                 ).options(joinedload(models.Image.metadata)
 
88
                 ).filter_by(deleted=_deleted(context)
 
89
                 ).all()
 
90
 
 
91
 
 
92
def image_get_all_public(context, public):
 
93
    session = get_session()
 
94
    return session.query(models.Image
 
95
                 ).options(joinedload(models.Image.files)
 
96
                 ).options(joinedload(models.Image.metadata)
 
97
                 ).filter_by(deleted=_deleted(context)
 
98
                 ).filter_by(public=public
91
99
                 ).all()
92
100
 
93
101