Merge "Transform instance.power_off 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 ae136721cc487bf3d8f09c3889a35a5788c8005d,d42293722805ba26ba80b8cb7a444a570be92863..2858ae571a12888b55c39e0894468e5411b317da
--- 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
@@@ -60,15 -39,11 +60,15 @@@ class TestInstanceNotificationSample
              extra_params={'networks': [{'port': self.neutron.port_1['id']}]})
  
          actions = [
-             self._test_power_on_server,
+             self._test_power_off_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

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