There are a lot of places where _make_foo_list()s are implemented. Actually base.obj_make_list() can be used to make the list. The patch is to clean up the redundancies and make the code clean. Also, in order to make _from_db_objects()s the same format, we add 'context' into the parameter list in instance fault object. Related to blueprint icehouse-objects. Change-Id: I1a68b6e9dc402d4e30a06f94b068233e2afa713f
		
			
				
	
	
		
			74 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			74 lines
		
	
	
		
			2.7 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
#    Copyright 2013 IBM Corp.
 | 
						|
#
 | 
						|
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
 | 
						|
#    not use this file except in compliance with the License. You may obtain
 | 
						|
#    a copy of the License at
 | 
						|
#
 | 
						|
#         http://www.apache.org/licenses/LICENSE-2.0
 | 
						|
#
 | 
						|
#    Unless required by applicable law or agreed to in writing, software
 | 
						|
#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
 | 
						|
#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 | 
						|
#    License for the specific language governing permissions and limitations
 | 
						|
#    under the License.
 | 
						|
 | 
						|
import itertools
 | 
						|
 | 
						|
from nova import db
 | 
						|
from nova.objects import base
 | 
						|
from nova.objects import fields
 | 
						|
 | 
						|
 | 
						|
class InstanceFault(base.NovaPersistentObject, base.NovaObject):
 | 
						|
    # Version 1.0: Initial version
 | 
						|
    # Version 1.1: String attributes updated to support unicode
 | 
						|
    VERSION = '1.1'
 | 
						|
 | 
						|
    fields = {
 | 
						|
        'id': fields.IntegerField(),
 | 
						|
        'instance_uuid': fields.UUIDField(),
 | 
						|
        'code': fields.IntegerField(),
 | 
						|
        'message': fields.StringField(nullable=True),
 | 
						|
        'details': fields.StringField(nullable=True),
 | 
						|
        'host': fields.StringField(nullable=True),
 | 
						|
        }
 | 
						|
 | 
						|
    @staticmethod
 | 
						|
    def _from_db_object(context, fault, db_fault):
 | 
						|
        # NOTE(danms): These are identical right now
 | 
						|
        for key in fault.fields:
 | 
						|
            fault[key] = db_fault[key]
 | 
						|
        fault._context = context
 | 
						|
        fault.obj_reset_changes()
 | 
						|
        return fault
 | 
						|
 | 
						|
    @base.remotable_classmethod
 | 
						|
    def get_latest_for_instance(cls, context, instance_uuid):
 | 
						|
        db_faults = db.instance_fault_get_by_instance_uuids(context,
 | 
						|
                                                            [instance_uuid])
 | 
						|
        if instance_uuid in db_faults and db_faults[instance_uuid]:
 | 
						|
            return cls._from_db_object(context, cls(),
 | 
						|
                                       db_faults[instance_uuid][0])
 | 
						|
 | 
						|
 | 
						|
class InstanceFaultList(base.ObjectListBase, base.NovaObject):
 | 
						|
    # Version 1.0: Initial version
 | 
						|
    #              InstanceFault <= version 1.1
 | 
						|
    VERSION = '1.0'
 | 
						|
 | 
						|
    fields = {
 | 
						|
        'objects': fields.ListOfObjectsField('InstanceFault'),
 | 
						|
        }
 | 
						|
    child_versions = {
 | 
						|
        '1.0': '1.1',
 | 
						|
        # NOTE(danms): InstanceFault was at 1.1 before we added this
 | 
						|
        }
 | 
						|
 | 
						|
    @base.remotable_classmethod
 | 
						|
    def get_by_instance_uuids(cls, context, instance_uuids):
 | 
						|
        db_faultdict = db.instance_fault_get_by_instance_uuids(context,
 | 
						|
                                                               instance_uuids)
 | 
						|
        db_faultlist = itertools.chain(*db_faultdict.values())
 | 
						|
        return base.obj_make_list(context, InstanceFaultList(), InstanceFault,
 | 
						|
                                  db_faultlist)
 |