objects: Remove 'bandwidth' fields from notifications

Finish up removing these entries from the versioned instance
notifications. They're useless since we dropped support for the XenAPI
virt driver. The underlying model is retained for now: that will be
handled separately.

Change-Id: I774c50fca99bc655ca5010e3b9d8247b739293b3
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

2 files changed, 10 insertions, 41 deletions

diff --git a/nova/notifications/base.py b/nova/notifications/base.py
index a3f4c7cb45..85a820949c 100644
--- a/nova/notifications/base.py
+++ b/nova/notifications/base.py
@@ -189,10 +189,6 @@ def send_instance_update_notification(context, instance, old_vm_state=None,
     payload["audit_period_beginning"] = null_safe_isotime(audit_start)
     payload["audit_period_ending"] = null_safe_isotime(audit_end)
 
-    # add bw usage info:
-    # TODO(stephenfin): Remove this, the feature is dead
-    payload["bandwidth"] = {}
-
     # add old display name if it is changed
     if old_display_name:
         payload["old_display_name"] = old_display_name
@@ -222,15 +218,11 @@ def _send_versioned_instance_update(context, instance, payload, host, service):
         audit_period_beginning=payload.get('audit_period_beginning'),
         audit_period_ending=payload.get('audit_period_ending'))
 
-    # TODO(stephenfin): Remove this, the feature is dead
-    bandwidth = []
-
     versioned_payload = instance_notification.InstanceUpdatePayload(
         context=context,
         instance=instance,
         state_update=state_update,
         audit_period=audit_period,
-        bandwidth=bandwidth,
         old_display_name=payload.get('old_display_name'))
 
     notification = instance_notification.InstanceUpdateNotification(
diff --git a/nova/notifications/objects/instance.py b/nova/notifications/objects/instance.py
index bf53e83633..d1c47c5e35 100644
--- a/nova/notifications/objects/instance.py
+++ b/nova/notifications/objects/instance.py
@@ -296,23 +296,21 @@ class InstanceUpdatePayload(InstancePayload):
     # Version 1.8: Added action_initiator_user and action_initiator_project to
     #              InstancePayload
     # Version 1.9: Added locked_reason field to InstancePayload
-    VERSION = '1.9'
+    # Version 2.0: Remove bandwidth field
+    VERSION = '2.0'
     fields = {
         'state_update': fields.ObjectField('InstanceStateUpdatePayload'),
         'audit_period': fields.ObjectField('AuditPeriodPayload'),
-        # TODO(stephenfin): Remove this field in 2.0
-        'bandwidth': fields.ListOfObjectsField('BandwidthPayload'),
         'old_display_name': fields.StringField(nullable=True),
         'tags': fields.ListOfStringsField(),
     }
 
-    def __init__(self, context, instance, state_update, audit_period,
-                 bandwidth, old_display_name):
-        super(InstanceUpdatePayload, self).__init__(
-            context=context, instance=instance)
+    def __init__(
+        self, context, instance, state_update, audit_period, old_display_name,
+    ):
+        super().__init__(context=context, instance=instance)
         self.state_update = state_update
         self.audit_period = audit_period
-        self.bandwidth = bandwidth
         self.old_display_name = old_display_name
         self.tags = [instance_tag.tag
                      for instance_tag in instance.tags.objects]
@@ -412,24 +410,6 @@ class IpPayload(base.NotificationPayloadBase):
         return ips
 
 
-# TODO(stephenfin): Drop this object
-@nova_base.NovaObjectRegistry.register_notification
-class BandwidthPayload(base.NotificationPayloadBase):
-    # Version 1.0: Initial version
-    VERSION = '1.0'
-    fields = {
-        'network_name': fields.StringField(),
-        'in_bytes': fields.IntegerField(),
-        'out_bytes': fields.IntegerField(),
-    }
-
-    def __init__(self, network_name, in_bytes, out_bytes):
-        super(BandwidthPayload, self).__init__()
-        self.network_name = network_name
-        self.in_bytes = in_bytes
-        self.out_bytes = out_bytes
-
-
 @nova_base.NovaObjectRegistry.register_notification
 class AuditPeriodPayload(base.NotificationPayloadBase):
     # Version 1.0: Initial version
@@ -721,18 +701,15 @@ class InstanceExistsPayload(InstancePayload):
     # Version 1.1: Added action_initiator_user and action_initiator_project to
     #              InstancePayload
     # Version 1.2: Added locked_reason field to InstancePayload
-    VERSION = '1.2'
+    # Version 2.0: Remove bandwidth field
+    VERSION = '2.0'
     fields = {
         'audit_period': fields.ObjectField('AuditPeriodPayload'),
-        # TODO(stephenfin): Remove this field in version 2.0
-        'bandwidth': fields.ListOfObjectsField('BandwidthPayload'),
     }
 
-    def __init__(self, context, instance, audit_period, bandwidth):
-        super(InstanceExistsPayload, self).__init__(context=context,
-                                                    instance=instance)
+    def __init__(self, context, instance, audit_period):
+        super().__init__(context=context, instance=instance)
         self.audit_period = audit_period
-        self.bandwidth = bandwidth
 
 
 @base.notification_sample('instance-exists.json')