Merge "Transform instance.resume notifications"

diff --cc nova/compute/manager.py
Simple merge

diff --cc nova/notifications/objects/instance.py
Simple merge

diff --cc nova/tests/functional/notification_sample_tests/test_instance.py
index 472e9d0e7dad2a8bca8fc800205a90ed55ac6484,87753da29b88ef13a01aece5400c6316d445c2f1..e0399ca8b1f0ce0bc70fadcbcd112afa471258f1
--- 1/nova/tests/functional/notification_sample_tests/test_instance.py
--- 2/nova/tests/functional/notification_sample_tests/test_instance.py
+++ b/nova/tests/functional/notification_sample_tests/test_instance.py
@@@ -63,9 -63,9 +63,10 @@@ class TestInstanceNotificationSample
              self._test_power_on_server,
              self._test_restore_server,
              self._test_suspend_server,
+             self._test_resume_server,
              self._test_pause_server,
              self._test_shelve_server,
 +            self._test_shelve_offload_server,
              self._test_resize_server,
          ]
  

diff --cc nova/tests/unit/compute/test_compute.py
Simple merge