From e3b63f3b71eac944fd6c19e0b7efef428abe1472 Mon Sep 17 00:00:00 2001
From: "Daniel P. Berrange" <berrange@redhat.com>
Date: Fri, 12 Dec 2014 11:04:07 +0000
Subject: [PATCH] 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
---
 nova/objects/agent.py               | 4 +---
 nova/objects/aggregate.py           | 4 +---
 nova/objects/bandwidth_usage.py     | 4 +---
 nova/objects/block_device.py        | 4 +---
 nova/objects/compute_node.py        | 4 +---
 nova/objects/dns_domain.py          | 4 +---
 nova/objects/fixed_ip.py            | 4 +---
 nova/objects/flavor.py              | 4 +---
 nova/objects/floating_ip.py         | 4 +---
 nova/objects/instance.py            | 4 +---
 nova/objects/instance_action.py     | 8 ++------
 nova/objects/instance_fault.py      | 4 +---
 nova/objects/instance_group.py      | 4 +---
 nova/objects/keypair.py             | 4 +---
 nova/objects/migration.py           | 4 +---
 nova/objects/network.py             | 4 +---
 nova/objects/network_request.py     | 4 +---
 nova/objects/pci_device.py          | 4 +---
 nova/objects/security_group.py      | 4 +---
 nova/objects/security_group_rule.py | 4 +---
 nova/objects/service.py             | 4 +---
 nova/objects/tag.py                 | 4 +---
 nova/objects/virtual_interface.py   | 4 +---
 23 files changed, 24 insertions(+), 72 deletions(-)

diff --git a/nova/objects/agent.py b/nova/objects/agent.py
index d3926ea8eeb0..5d0a83415ff3 100644
--- a/nova/objects/agent.py
+++ b/nova/objects/agent.py
@@ -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 = {
diff --git a/nova/objects/aggregate.py b/nova/objects/aggregate.py
index d938df28a24b..c7e713e8fec6 100644
--- a/nova/objects/aggregate.py
+++ b/nova/objects/aggregate.py
@@ -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
diff --git a/nova/objects/bandwidth_usage.py b/nova/objects/bandwidth_usage.py
index ef9958ae68ae..27adce6bb8ad 100644
--- a/nova/objects/bandwidth_usage.py
+++ b/nova/objects/bandwidth_usage.py
@@ -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
diff --git a/nova/objects/block_device.py b/nova/objects/block_device.py
index eee358db307c..afe335ca5793 100644
--- a/nova/objects/block_device.py
+++ b/nova/objects/block_device.py
@@ -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
diff --git a/nova/objects/compute_node.py b/nova/objects/compute_node.py
index 06d98bdde8d6..c98daa8bb26c 100644
--- a/nova/objects/compute_node.py
+++ b/nova/objects/compute_node.py
@@ -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
diff --git a/nova/objects/dns_domain.py b/nova/objects/dns_domain.py
index 9b099aadebbe..08f333b24576 100644
--- a/nova/objects/dns_domain.py
+++ b/nova/objects/dns_domain.py
@@ -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 = {
diff --git a/nova/objects/fixed_ip.py b/nova/objects/fixed_ip.py
index 0b51d1258d45..302ac7d7d2cc 100644
--- a/nova/objects/fixed_ip.py
+++ b/nova/objects/fixed_ip.py
@@ -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
diff --git a/nova/objects/flavor.py b/nova/objects/flavor.py
index 7b21f5ddaf45..0a5344a4bf62 100644
--- a/nova/objects/flavor.py
+++ b/nova/objects/flavor.py
@@ -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 = {
diff --git a/nova/objects/floating_ip.py b/nova/objects/floating_ip.py
index a4a07a6cd31e..1b5fb98ce457 100644
--- a/nova/objects/floating_ip.py
+++ b/nova/objects/floating_ip.py
@@ -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
diff --git a/nova/objects/instance.py b/nova/objects/instance.py
index abcb52ea7095..b7881617167b 100644
--- a/nova/objects/instance.py
+++ b/nova/objects/instance.py
@@ -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
diff --git a/nova/objects/instance_action.py b/nova/objects/instance_action.py
index b83c0ae22957..a82c7ecd566d 100644
--- a/nova/objects/instance_action.py
+++ b/nova/objects/instance_action.py
@@ -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'),
         }
diff --git a/nova/objects/instance_fault.py b/nova/objects/instance_fault.py
index ad186818749a..de03b972db37 100644
--- a/nova/objects/instance_fault.py
+++ b/nova/objects/instance_fault.py
@@ -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
diff --git a/nova/objects/instance_group.py b/nova/objects/instance_group.py
index 15b29dc12ff4..2ef918d4d9b5 100644
--- a/nova/objects/instance_group.py
+++ b/nova/objects/instance_group.py
@@ -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
diff --git a/nova/objects/keypair.py b/nova/objects/keypair.py
index 8544fd884b26..0dd3cd0d257f 100644
--- a/nova/objects/keypair.py
+++ b/nova/objects/keypair.py
@@ -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'
diff --git a/nova/objects/migration.py b/nova/objects/migration.py
index e3b3322f1986..926db2612174 100644
--- a/nova/objects/migration.py
+++ b/nova/objects/migration.py
@@ -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
diff --git a/nova/objects/network.py b/nova/objects/network.py
index da3298755a53..849926c40db4 100644
--- a/nova/objects/network.py
+++ b/nova/objects/network.py
@@ -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
diff --git a/nova/objects/network_request.py b/nova/objects/network_request.py
index 46ef925229ed..405c3c0d18cd 100644
--- a/nova/objects/network_request.py
+++ b/nova/objects/network_request.py
@@ -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'),
         }
diff --git a/nova/objects/pci_device.py b/nova/objects/pci_device.py
index d4b5bf9285f5..53e0a840cdd4 100644
--- a/nova/objects/pci_device.py
+++ b/nova/objects/pci_device.py
@@ -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
diff --git a/nova/objects/security_group.py b/nova/objects/security_group.py
index 0ec544fb57aa..ccb4af996a5c 100644
--- a/nova/objects/security_group.py
+++ b/nova/objects/security_group.py
@@ -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'
diff --git a/nova/objects/security_group_rule.py b/nova/objects/security_group_rule.py
index 97d18723db56..c8809cda9631 100644
--- a/nova/objects/security_group_rule.py
+++ b/nova/objects/security_group_rule.py
@@ -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'),
         }
diff --git a/nova/objects/service.py b/nova/objects/service.py
index 2329a2819f73..0121068963b4 100644
--- a/nova/objects/service.py
+++ b/nova/objects/service.py
@@ -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
diff --git a/nova/objects/tag.py b/nova/objects/tag.py
index d7477662ba3c..ce54934e3373 100644
--- a/nova/objects/tag.py
+++ b/nova/objects/tag.py
@@ -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'
 
diff --git a/nova/objects/virtual_interface.py b/nova/objects/virtual_interface.py
index 211494b1fbc1..5f1e58e5c788 100644
--- a/nova/objects/virtual_interface.py
+++ b/nova/objects/virtual_interface.py
@@ -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 = {