← Back to branch summary

~rackspace-titan/nova/extensions

« back to all changes in this revision

Viewing changes to nova/db/sqlalchemy/api.py

  • Committer: Dan Prince
  • Date: 2011-03-21 17:46:08 UTC
  • mfrom: (784.1.53 nova)
  • Revision ID: dan.prince@rackspace.com-20110321174608-1indrmx4owzhgdka
Merge w/ trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/db/sqlalchemy/api.py
762
762
    context - request context object
763
763
    values - dict containing column values.
764
764
    """
 
765
    metadata = values.get('metadata')
 
766
    metadata_refs = []
 
767
    if metadata:
 
768
        for metadata_item in metadata:
 
769
            metadata_ref = models.InstanceMetadata()
 
770
            metadata_ref.update(metadata_item)
 
771
            metadata_refs.append(metadata_ref)
 
772
    values['metadata'] = metadata_refs
 
773
 
765
774
    instance_ref = models.Instance()
766
775
    instance_ref.update(values)
767
776
 
797
806
                update({'deleted': 1,
798
807
                        'deleted_at': datetime.datetime.utcnow(),
799
808
                        'updated_at': literal_column('updated_at')})
 
809
        session.query(models.InstanceMetadata).\
 
810
                filter_by(instance_id=instance_id).\
 
811
                update({'deleted': 1,
 
812
                        'deleted_at': datetime.datetime.utcnow(),
 
813
                        'updated_at': literal_column('updated_at')})
800
814
 
801
815
 
802
816
@require_context
1240
1254
 
1241
1255
# NOTE(vish): pylint complains because of the long method name, but
1242
1256
#             it fits with the names of the rest of the methods
1243
 
# pylint: disable-msg=C0103
 
1257
# pylint: disable=C0103
1244
1258
 
1245
1259
 
1246
1260
@require_admin_context
2328
2342
 
2329
2343
 
2330
2344
@require_context
2331
 
def instance_type_get_all(context, inactive=0):
 
2345
def instance_type_get_all(context, inactive=False):
2332
2346
    """
2333
2347
    Returns a dict describing all instance_types with name as key.
2334
2348
    """
2339
2353
                        all()
2340
2354
    else:
2341
2355
        inst_types = session.query(models.InstanceTypes).\
2342
 
                        filter_by(deleted=inactive).\
 
2356
                        filter_by(deleted=False).\
2343
2357
                        order_by("name").\
2344
2358
                        all()
2345
2359
    if inst_types:
2383
2397
    session = get_session()
2384
2398
    instance_type_ref = session.query(models.InstanceTypes).\
2385
2399
                                      filter_by(name=name)
2386
 
    records = instance_type_ref.update(dict(deleted=1))
 
2400
    records = instance_type_ref.update(dict(deleted=True))
2387
2401
    if records == 0:
2388
2402
        raise exception.NotFound
2389
2403
    else: