Merge "Transform instance.unpause 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 7f69b43af3b6f720ccfe368e234f9084f53b50c4,7305bdbb3fa8209530bbead44842b71a1a142265..ae136721cc487bf3d8f09c3889a35a5788c8005d
--- 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,11 -63,10 +63,12 @@@ 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_unpause_server,
              self._test_shelve_server,
              self._test_shelve_offload_server,
 +            self._test_unshelve_server,
              self._test_resize_server,
          ]
  

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