722e789309
The dict compat support in NovaObject is useful for incrementally converting existing code over to use objects. Any brand new objects though have no reason to support dictionary access, so there should be a way to disable this compat mode. This moves all the dict compat support methods out of NovaObject, to a new class NovaObjectDictCompat. All existing objects are updated to add this new class as a mix-in parent. In future any completely new objects (ie ones which aren't being used to converted existing code from dict instances) should avoid inheriting from NovaObjectDictCompat. Existing objects should also have this parent class removed once all callers are audited and/or updated to ensure they do not require dict compat. Change-Id: I03f93f0c40df6f5f7df9cefe28dff900c22294c9
56 lines
1.7 KiB
Python
56 lines
1.7 KiB
Python
# Copyright 2014 Red Hat, Inc.
|
|
#
|
|
# 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.
|
|
|
|
from nova.objects import base as obj_base
|
|
from nova.objects import fields
|
|
|
|
EVENT_NAMES = [
|
|
# Network has changed for this instance, rebuild info_cache
|
|
'network-changed',
|
|
|
|
# VIF plugging notifications, tag is port_id
|
|
'network-vif-plugged',
|
|
'network-vif-unplugged',
|
|
|
|
]
|
|
|
|
EVENT_STATUSES = ['failed', 'completed', 'in-progress']
|
|
|
|
|
|
# TODO(berrange): Remove NovaObjectDictCompat
|
|
class InstanceExternalEvent(obj_base.NovaObject,
|
|
obj_base.NovaObjectDictCompat):
|
|
# Version 1.0: Initial version
|
|
# Supports network-changed and vif-plugged
|
|
VERSION = '1.0'
|
|
|
|
fields = {
|
|
'instance_uuid': fields.UUIDField(),
|
|
'name': fields.StringField(),
|
|
'status': fields.StringField(),
|
|
'tag': fields.StringField(nullable=True),
|
|
'data': fields.DictOfStringsField(),
|
|
}
|
|
|
|
@staticmethod
|
|
def make_key(name, tag=None):
|
|
if tag is not None:
|
|
return '%s-%s' % (name, tag)
|
|
else:
|
|
return name
|
|
|
|
@property
|
|
def key(self):
|
|
return self.make_key(self.name, self.tag)
|