openstack
/
nova
Code Issues Proposed changes

objects: remove dict compat support from all XXXList() objects 

The XXXList() classes only ever have a single 'objects' attribute
and this is never directly accessed as a dict key, instead all
callers use it in list context. Thus the dict compat support can
be removed from all these objects

Change-Id: I3f8d49d25b99dd0a498dfaad705c6332908cb72f
This commit is contained in:
Daniel P. Berrange 2014-12-12 11:04:07 +00:00
parent ef264b11af
commit e3b63f3b71
23 changed files with 24 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nova/objects/agent.py
View File

@ -70,9 +70,7 @@ class Agent(base.NovaPersistentObject, base.NovaObject,
self.obj_reset_changes()
# TODO(berrange): Remove NovaObjectDictCompat
class AgentList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class AgentList(base.ObjectListBase, base.NovaObject):
VERSION = '1.0'
fields = {

4
nova/objects/aggregate.py
View File

@ -149,9 +149,7 @@ class Aggregate(base.NovaPersistentObject, base.NovaObject,
return self.metadata.get('availability_zone', None)
# TODO(berrange): Remove NovaObjectDictCompat
class AggregateList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class AggregateList(base.ObjectListBase, base.NovaObject):
# Version 1.0: Initial version
# Version 1.1: Added key argument to get_by_host()
# Aggregate <= version 1.1

4
nova/objects/bandwidth_usage.py
View File

@ -65,9 +65,7 @@ class BandwidthUsage(base.NovaPersistentObject, base.NovaObject,
self._from_db_object(context, self, db_bw_usage)
# TODO(berrange): Remove NovaObjectDictCompat
class BandwidthUsageList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class BandwidthUsageList(base.ObjectListBase, base.NovaObject):
# Version 1.0: Initial version
# Version 1.1: Add use_slave to get_by_uuids
# Version 1.2: BandwidthUsage <= version 1.2

4
nova/objects/block_device.py
View File

@ -196,9 +196,7 @@ class BlockDeviceMapping(base.NovaPersistentObject, base.NovaObject,
self.obj_reset_changes(fields=['instance'])
# TODO(berrange): Remove NovaObjectDictCompat
class BlockDeviceMappingList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class BlockDeviceMappingList(base.ObjectListBase, base.NovaObject):
# Version 1.0: Initial version
# Version 1.1: BlockDeviceMapping <= version 1.1
# Version 1.2: Added use_slave to get_by_instance_uuid

4
nova/objects/compute_node.py
View File

@ -221,9 +221,7 @@ class ComputeNode(base.NovaPersistentObject, base.NovaObject,
return self._cached_service
# TODO(berrange): Remove NovaObjectDictCompat
class ComputeNodeList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class ComputeNodeList(base.ObjectListBase, base.NovaObject):
# Version 1.0: Initial version
# ComputeNode <= version 1.2
# Version 1.1 ComputeNode version 1.3

4
nova/objects/dns_domain.py
View File

@ -58,9 +58,7 @@ class DNSDomain(base.NovaPersistentObject, base.NovaObject,
db.dnsdomain_unregister(context, domain)
# TODO(berrange): Remove NovaObjectDictCompat
class DNSDomainList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class DNSDomainList(base.ObjectListBase, base.NovaObject):
# Version 1.0: Initial version
VERSION = '1.0'
fields = {

4
nova/objects/fixed_ip.py
View File

@ -199,9 +199,7 @@ class FixedIP(obj_base.NovaPersistentObject, obj_base.NovaObject,
self.obj_reset_changes(['instance_uuid', 'instance'])
# TODO(berrange): Remove NovaObjectDictCompat
class FixedIPList(obj_base.ObjectListBase, obj_base.NovaObject,
obj_base.NovaObjectDictCompat):
class FixedIPList(obj_base.ObjectListBase, obj_base.NovaObject):
# Version 1.0: Initial version
# Version 1.1: Added get_by_network()
# Version 1.2: FixedIP <= version 1.2

4
nova/objects/flavor.py
View File

@ -250,9 +250,7 @@ class Flavor(base.NovaPersistentObject, base.NovaObject,
db.flavor_destroy(context, self.name)
# TODO(berrange): Remove NovaObjectDictCompat
class FlavorList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class FlavorList(base.ObjectListBase, base.NovaObject):
VERSION = '1.1'
fields = {

4
nova/objects/floating_ip.py
View File

@ -162,9 +162,7 @@ class FloatingIP(obj_base.NovaPersistentObject, obj_base.NovaObject,
self._from_db_object(context, self, db_floatingip)
# TODO(berrange): Remove NovaObjectDictCompat
class FloatingIPList(obj_base.ObjectListBase, obj_base.NovaObject,
obj_base.NovaObjectDictCompat):
class FloatingIPList(obj_base.ObjectListBase, obj_base.NovaObject):
# Version 1.3: FloatingIP 1.2
# Version 1.4: FloatingIP 1.3
# Version 1.5: FloatingIP 1.4

4
nova/objects/instance.py
View File

@ -701,9 +701,7 @@ def _make_instance_list(context, inst_list, db_inst_list, expected_attrs):
return inst_list
# TODO(berrange): Remove NovaObjectDictCompat
class InstanceList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class InstanceList(base.ObjectListBase, base.NovaObject):
# Version 1.0: Initial version
# Version 1.1: Added use_slave to get_by_host
# Instance <= version 1.9

8
nova/objects/instance_action.py
View File

@ -93,9 +93,7 @@ class InstanceAction(base.NovaPersistentObject, base.NovaObject,
self._from_db_object(context, self, db_action)
# TODO(berrange): Remove NovaObjectDictCompat
class InstanceActionList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class InstanceActionList(base.ObjectListBase, base.NovaObject):
# Version 1.0: Initial version
# InstanceAction <= version 1.1
VERSION = '1.0'
@ -205,9 +203,7 @@ class InstanceActionEvent(base.NovaPersistentObject, base.NovaObject,
self.finish_with_failure(context, exc_val=None, exc_tb=None)
# TODO(berrange): Remove NovaObjectDictCompat
class InstanceActionEventList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class InstanceActionEventList(base.ObjectListBase, base.NovaObject):
fields = {
'objects': fields.ListOfObjectsField('InstanceActionEvent'),
}

4
nova/objects/instance_fault.py
View File

@ -89,9 +89,7 @@ class InstanceFault(base.NovaPersistentObject, base.NovaObject,
LOG.exception(_LE("Failed to notify cells of instance fault"))
# TODO(berrange): Remove NovaObjectDictCompat
class InstanceFaultList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class InstanceFaultList(base.ObjectListBase, base.NovaObject):
# Version 1.0: Initial version
# InstanceFault <= version 1.1
# Version 1.1: InstanceFault version 1.2

4
nova/objects/instance_group.py
View File

@ -196,9 +196,7 @@ class InstanceGroup(base.NovaPersistentObject, base.NovaObject,
return len(instances)
# TODO(berrange): Remove NovaObjectDictCompat
class InstanceGroupList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class InstanceGroupList(base.ObjectListBase, base.NovaObject):
# Version 1.0: Initial version
# InstanceGroup <= version 1.3
# Version 1.1: InstanceGroup <= version 1.4

4
nova/objects/keypair.py
View File

@ -65,9 +65,7 @@ class KeyPair(base.NovaPersistentObject, base.NovaObject,
db.key_pair_destroy(context, self.user_id, self.name)
# TODO(berrange): Remove NovaObjectDictCompat
class KeyPairList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class KeyPairList(base.ObjectListBase, base.NovaObject):
# Version 1.0: Initial version
# KeyPair <= version 1.1
VERSION = '1.0'

4
nova/objects/migration.py
View File

@ -80,9 +80,7 @@ class Migration(base.NovaPersistentObject, base.NovaObject,
return objects.Instance.get_by_uuid(self._context, self.instance_uuid)
# TODO(berrange): Remove NovaObjectDictCompat
class MigrationList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class MigrationList(base.ObjectListBase, base.NovaObject):
# Version 1.0: Initial version
# Migration <= 1.1
# Version 1.1: Added use_slave to get_unconfirmed_by_dest_compute

4
nova/objects/network.py
View File

@ -205,9 +205,7 @@ class Network(obj_base.NovaPersistentObject, obj_base.NovaObject,
self._from_db_object(context, self, db_network)
# TODO(berrange): Remove NovaObjectDictCompat
class NetworkList(obj_base.ObjectListBase, obj_base.NovaObject,
obj_base.NovaObjectDictCompat):
class NetworkList(obj_base.ObjectListBase, obj_base.NovaObject):
# Version 1.0: Initial version
# Version 1.1: Added get_by_project()
# Version 1.2: Network <= version 1.2

4
nova/objects/network_request.py
View File

@ -57,9 +57,7 @@ class NetworkRequest(obj_base.NovaObject,
return cls(network_id=network_id, address=address)
# TODO(berrange): Remove NovaObjectDictCompat
class NetworkRequestList(obj_base.ObjectListBase, obj_base.NovaObject,
obj_base.NovaObjectDictCompat):
class NetworkRequestList(obj_base.ObjectListBase, obj_base.NovaObject):
fields = {
'objects': fields.ListOfObjectsField('NetworkRequest'),
}

4
nova/objects/pci_device.py
View File

@ -175,9 +175,7 @@ class PciDevice(base.NovaPersistentObject, base.NovaObject,
self._from_db_object(context, self, db_pci)
# TODO(berrange): Remove NovaObjectDictCompat
class PciDeviceList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class PciDeviceList(base.ObjectListBase, base.NovaObject):
# Version 1.0: Initial version
# PciDevice <= 1.1
# Version 1.1: PciDevice 1.2

4
nova/objects/security_group.py
View File

@ -72,9 +72,7 @@ class SecurityGroup(base.NovaPersistentObject, base.NovaObject,
db.security_group_get(context, self.id))
# TODO(berrange): Remove NovaObjectDictCompat
class SecurityGroupList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class SecurityGroupList(base.ObjectListBase, base.NovaObject):
# Version 1.0: Initial version
# SecurityGroup <= version 1.1
VERSION = '1.0'

4
nova/objects/security_group_rule.py
View File

@ -84,9 +84,7 @@ class SecurityGroupRule(base.NovaPersistentObject, base.NovaObject,
return cls._from_db_object(context, cls(), db_rule)
# TODO(berrange): Remove NovaObjectDictCompat
class SecurityGroupRuleList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class SecurityGroupRuleList(base.ObjectListBase, base.NovaObject):
fields = {
'objects': fields.ListOfObjectsField('SecurityGroupRule'),
}

4
nova/objects/service.py
View File

@ -137,9 +137,7 @@ class Service(base.NovaPersistentObject, base.NovaObject,
db.service_destroy(context, self.id)
# TODO(berrange): Remove NovaObjectDictCompat
class ServiceList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class ServiceList(base.ObjectListBase, base.NovaObject):
# Version 1.0: Initial version
# Service <= version 1.2
# Version 1.1 Service version 1.3

4
nova/objects/tag.py
View File

@ -45,9 +45,7 @@ class Tag(base.NovaObject,
db.instance_tag_delete(context, resource_id, name)
# TODO(berrange): Remove NovaObjectDictCompat
class TagList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class TagList(base.ObjectListBase, base.NovaObject):
# Version 1.0: Initial version
VERSION = '1.0'

4
nova/objects/virtual_interface.py
View File

@ -80,9 +80,7 @@ class VirtualInterface(base.NovaPersistentObject, base.NovaObject,
db.virtual_interface_delete_by_instance(context, instance_uuid)
# TODO(berrange): Remove NovaObjectDictCompat
class VirtualInterfaceList(base.ObjectListBase, base.NovaObject,
base.NovaObjectDictCompat):
class VirtualInterfaceList(base.ObjectListBase, base.NovaObject):
# Version 1.0: Initial version
VERSION = '1.0'
fields = {