Add more field's in InstancePayload

Add instance's locked field and instance's
display_description field in InstancePayload.

Implements: bp additional-notification-fields-for-searchlight

Change-Id: Iceae25ca8a0d7f2e5f22cab1364215bda2fae93c

doc/notification_samples/instance-create-end.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,8 +57,8 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"
-}
+}

doc/notification_samples/instance-create-error.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault": {
                 "nova_object.data": {
                     "exception": "FlavorDiskTooSmall",
@@ -25,6 +26,7 @@
             "launched_at":null,
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -52,8 +54,8 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"ERROR",
     "publisher_id":"nova-compute:compute"
-}
+}

doc/notification_samples/instance-create-start.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":null,
             "host_name":"some-server",
@@ -15,6 +16,7 @@
             "launched_at":null,
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":null,
             "os_type":null,
             "progress":0,
@@ -42,8 +44,8 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"
-}
+}

doc/notification_samples/instance-delete-end.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":"2012-10-29T13:42:11Z",
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -15,6 +16,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -42,8 +44,8 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"
-}
+}

doc/notification_samples/instance-delete-start.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,8 +57,8 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"
-}
+}

doc/notification_samples/instance-pause-end.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-pause-start.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-power_off-end.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-power_off-start.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-power_on-end.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,8 +57,8 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"
-}
+}

doc/notification_samples/instance-power_on-start.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,8 +57,8 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"
-}
+}

doc/notification_samples/instance-resize-end.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-resize-start.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-resize_finish-end.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-resize_finish-start.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-restore-end.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,8 +57,8 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"
-}
+}

doc/notification_samples/instance-restore-start.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,8 +57,8 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"
-}
+}

doc/notification_samples/instance-resume-end.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-resume-start.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-shelve-end.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-shelve-start.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-shelve_offload-end.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":null,
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":null,
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-shelve_offload-start.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,8 +57,9 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"
 }
+

doc/notification_samples/instance-shutdown-end.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-shutdown-start.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-snapshot-end.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-snapshot-start.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-suspend-end.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-suspend-start.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-unpause-end.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-unpause-start.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-unshelve-end.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":"compute",
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":"fake-mini",
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-unshelve-start.json

@@ -7,6 +7,7 @@
             "created_at":"2012-10-29T13:42:11Z",
             "deleted_at":null,
             "display_name":"some-server",
+            "display_description":"some-server",
             "fault":null,
             "host":null,
             "host_name":"some-server",
@@ -28,6 +29,7 @@
             "launched_at":"2012-10-29T13:42:11Z",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "metadata":{},
+            "locked":false,
             "node":null,
             "os_type":null,
             "progress":0,
@@ -55,7 +57,7 @@
         },
         "nova_object.name":"InstanceActionPayload",
         "nova_object.namespace":"nova",
-        "nova_object.version":"1.0"
+        "nova_object.version":"1.1"
     },
     "priority":"INFO",
     "publisher_id":"nova-compute:compute"

doc/notification_samples/instance-update.json

@@ -16,12 +16,14 @@
             "created_at": "2012-10-29T13:42:11Z",
             "deleted_at": null,
             "display_name": "some-server",
+            "display_description":"some-server",
             "host": "compute",
             "host_name": "some-server",
             "image_uuid": "155d900f-4e14-4e4c-a73d-069cbf4541e6",
             "kernel_id": "",
             "launched_at": null,
             "metadata": {},
+            "locked":false,
             "node": "fake-mini",
             "old_display_name": null,
             "os_type": null,
@@ -59,7 +61,7 @@
             "uuid": "c03c0bf9-f46e-4e4f-93f1-817568567ee2"},
         "nova_object.name": "InstanceUpdatePayload",
         "nova_object.namespace": "nova",
-        "nova_object.version": "1.0"},
+        "nova_object.version": "1.1"},
     "priority": "INFO",
     "publisher_id": "nova-compute:fake-mini"
 }

doc/notification_samples/instance-volume_swap-end.json

@@ -7,6 +7,7 @@
             "created_at": "2012-10-29T13:42:11Z",
             "deleted_at": null,
             "display_name": "some-server",
+            "display_description":"some-server",
             "fault": null,
             "flavor": {
                 "nova_object.data": {
@@ -40,6 +41,7 @@
             "kernel_id": "",
             "launched_at": "2012-10-29T13:42:11Z",
             "metadata": {},
+            "locked":false,
             "new_volume_id": "227cc671-f30b-4488-96fd-7d0bf13648d8",
             "node": "fake-mini",
             "old_volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113",
@@ -57,7 +59,7 @@
         },
         "nova_object.name": "InstanceActionVolumeSwapPayload",
         "nova_object.namespace": "nova",
-        "nova_object.version": "1.0"
+        "nova_object.version": "1.1"
     },
     "priority": "INFO",
     "publisher_id": "nova-compute:compute"

doc/notification_samples/instance-volume_swap-error.json

@@ -7,6 +7,7 @@
             "created_at": "2012-10-29T13:42:11Z",
             "deleted_at": null,
             "display_name": "some-server",
+            "display_description":"some-server",
             "fault": {
                 "nova_object.data": {
                     "exception": "TypeError",
@@ -50,6 +51,7 @@
             "kernel_id": "",
             "launched_at": "2012-10-29T13:42:11Z",
             "metadata": {},
+            "locked":false,
             "new_volume_id": "9c6d9c2d-7a8f-4c80-938d-3bf062b8d489",
             "node": "fake-mini",
             "old_volume_id": "828419fa-3efb-4533-b458-4267ca5fe9b1",
@@ -67,7 +69,7 @@
         },
         "nova_object.name": "InstanceActionVolumeSwapPayload",
         "nova_object.namespace": "nova",
-        "nova_object.version": "1.0"
+        "nova_object.version": "1.1"
     },
     "priority": "ERROR",
     "publisher_id": "nova-compute:compute"

doc/notification_samples/instance-volume_swap-start.json

@@ -7,6 +7,7 @@
             "created_at": "2012-10-29T13:42:11Z",
             "deleted_at": null,
             "display_name": "some-server",
+            "display_description":"some-server",
             "fault": null,
             "flavor": {
                 "nova_object.data": {
@@ -40,6 +41,7 @@
             "kernel_id": "",
             "launched_at": "2012-10-29T13:42:11Z",
             "metadata": {},
+            "locked":false,
             "new_volume_id": "227cc671-f30b-4488-96fd-7d0bf13648d8",
             "node": "fake-mini",
             "old_volume_id": "a07f71dc-8151-4e7d-a0cc-cd24a3f11113",
@@ -57,7 +59,7 @@
         },
         "nova_object.name": "InstanceActionVolumeSwapPayload",
         "nova_object.namespace": "nova",
-        "nova_object.version": "1.0"
+        "nova_object.version": "1.1"
     },
     "priority": "INFO",
     "publisher_id": "nova-compute:compute"

nova/notifications/objects/instance.py

@@ -23,6 +23,7 @@ class InstancePayload(base.NotificationPayloadBase):
         'tenant_id': ('instance', 'project_id'),
         'reservation_id': ('instance', 'reservation_id'),
         'display_name': ('instance', 'display_name'),
+        'display_description': ('instance', 'display_description'),
         'host_name': ('instance', 'hostname'),
         'host': ('instance', 'host'),
         'node': ('instance', 'node'),
@@ -46,15 +47,18 @@ class InstancePayload(base.NotificationPayloadBase):
         'progress': ('instance', 'progress'),
 
         'metadata': ('instance', 'metadata'),
+        'locked': ('instance', 'locked'),
     }
     # Version 1.0: Initial version
-    VERSION = '1.0'
+    # Version 1.1: add locked and display_description field
+    VERSION = '1.1'
     fields = {
         'uuid': fields.UUIDField(),
         'user_id': fields.StringField(nullable=True),
         'tenant_id': fields.StringField(nullable=True),
         'reservation_id': fields.StringField(nullable=True),
         'display_name': fields.StringField(nullable=True),
+        'display_description': fields.StringField(nullable=True),
         'host_name': fields.StringField(nullable=True),
         'host': fields.StringField(nullable=True),
         'node': fields.StringField(nullable=True),
@@ -81,6 +85,7 @@ class InstancePayload(base.NotificationPayloadBase):
         'ip_addresses': fields.ListOfObjectsField('IpPayload'),
 
         'metadata': fields.DictOfStringsField(),
+        'locked': fields.BooleanField(),
     }
 
     def __init__(self, instance, **kwargs):
@@ -92,7 +97,8 @@ class InstancePayload(base.NotificationPayloadBase):
 class InstanceActionPayload(InstancePayload):
     # No SCHEMA as all the additional fields are calculated
 
-    VERSION = '1.0'
+    # Version 1.1: locked and display_description added to InstancePayload
+    VERSION = '1.1'
     fields = {
         'fault': fields.ObjectField('ExceptionPayload', nullable=True),
     }
@@ -110,7 +116,8 @@ class InstanceActionPayload(InstancePayload):
 class InstanceActionVolumeSwapPayload(InstanceActionPayload):
     # No SCHEMA as all the additional fields are calculated
 
-    VERSION = '1.0'
+    # Version 1.1: locked and display_description added to InstancePayload
+    VERSION = '1.1'
     fields = {
         'old_volume_id': fields.UUIDField(),
         'new_volume_id': fields.UUIDField(),
@@ -130,7 +137,8 @@ class InstanceActionVolumeSwapPayload(InstanceActionPayload):
 @nova_base.NovaObjectRegistry.register_notification
 class InstanceUpdatePayload(InstancePayload):
     # Version 1.0: Initial version
-    VERSION = '1.0'
+    # Version 1.1: locked and display_description added to InstancePayload
+    VERSION = '1.1'
     fields = {
         'state_update': fields.ObjectField('InstanceStateUpdatePayload'),
         'audit_period': fields.ObjectField('AuditPeriodPayload'),

nova/tests/unit/compute/test_compute_utils.py

@@ -514,7 +514,7 @@ class UsageInfoTestCase(test.TestCase):
         self.assertEqual(str(flavor['flavorid']), flavorid)
 
         for attr in ('display_name', 'created_at', 'launched_at',
-                     'state', 'task_state'):
+                     'state', 'task_state', 'display_description', 'locked'):
             self.assertIn(attr, payload, "Key %s not in payload" % attr)
 
         self.assertEqual(payload['image_uuid'], uuids.fake_image_ref)

nova/tests/unit/notifications/objects/test_notification.py

@@ -264,14 +264,14 @@ notification_object_data = {
     'ExceptionPayload': '1.0-27db46ee34cd97e39f2643ed92ad0cc5',
     'FlavorPayload': '1.0-89b17e778291bba22025b5956e072b66',
     'InstanceActionNotification': '1.0-a73147b93b520ff0061865849d3dfa56',
-    'InstanceActionPayload': '1.0-3145ac549217f46e88173c437917ca7a',
+    'InstanceActionPayload': '1.1-8d12efc3251c606b61b3d479a9da51be',
     'InstanceActionVolumeSwapNotification':
     '1.0-a73147b93b520ff0061865849d3dfa56',
-    'InstanceActionVolumeSwapPayload': '1.0-3915e3dcb1cd80d3006a5c662a31b999',
-    'InstancePayload': '1.0-0eb2a5dd53358f9f9b0ad030a987a591',
+    'InstanceActionVolumeSwapPayload': '1.1-fbb6618f652a7f88742495ea3185582c',
+    'InstancePayload': '1.1-5b9e3a4bb805d9fed20063bc237e4913',
     'InstanceStateUpdatePayload': '1.0-07e111c0fa0f6db0f79b0726d593e3da',
     'InstanceUpdateNotification': '1.0-a73147b93b520ff0061865849d3dfa56',
-    'InstanceUpdatePayload': '1.0-868bf558327efffed4fb8b1e87515182',
+    'InstanceUpdatePayload': '1.1-12955de638c3a4bcd734601711214d39',
     'IpPayload': '1.0-8ecf567a99e516d4af094439a7632d34',
     'NotificationPublisher': '1.0-bbbc1402fb0e443a3eb227cc52b61545',
     'ServiceStatusNotification': '1.0-a73147b93b520ff0061865849d3dfa56',