Merge "Add reset_state api for compute"

Jenkins · openstack-gerrit · commit ddd8139a99b6 · 2016-11-30T18:50:22.000Z
diff --git a/openstack/compute/v2/_proxy.py b/openstack/compute/v2/_proxy.py
@@ -435,6 +435,19 @@ def change_server_password(self, server, new_password):
         server = self._get_resource(_server.Server, server)
         server.change_password(self.session, new_password)
 
+    def reset_server_state(self, server, state):
+        """Reset the state of server
+
+        :param server: The server can be either the ID of a server or a
+                       :class:`~openstack.compute.v2.server.Server`.
+        :param state: The state of the server to be set, `active` or
+                      `error` are valid.
+
+        :returns: None
+        """
+        res = self._get_base_resource(server, _server.Server)
+        res.reset_state(self.session, state)
+
     def reboot_server(self, server, reboot_type):
         """Reboot a server
 
diff --git a/openstack/compute/v2/server.py b/openstack/compute/v2/server.py
@@ -205,6 +205,10 @@ def remove_security_group(self, session, security_group):
         body = {"removeSecurityGroup": {"name": security_group}}
         self._action(session, body)
 
+    def reset_state(self, session, state):
+        body = {"os-resetState": {"state": state}}
+        self._action(session, body)
+
 
 class ServerDetail(Server):
     base_path = '/servers/detail'
diff --git a/openstack/tests/unit/compute/v2/test_server.py b/openstack/tests/unit/compute/v2/test_server.py
@@ -309,3 +309,14 @@ def test_remove_security_group(self):
         headers = {'Accept': ''}
         self.sess.post.assert_called_with(
             url, endpoint_filter=sot.service, json=body, headers=headers)
+
+    def test_reset_state(self):
+        sot = server.Server(**EXAMPLE)
+
+        self.assertIsNone(sot.reset_state(self.sess, 'active'))
+
+        url = 'servers/IDENTIFIER/action'
+        body = {"os-resetState": {"state": 'active'}}
+        headers = {'Accept': ''}
+        self.sess.post.assert_called_with(
+            url, endpoint_filter=sot.service, json=body, headers=headers)
