commit a130c4b3ec32b0f0c02b1ba20c5ed293044fff72
author Jenkins <jenkins@review.openstack.org> Wed Apr 23 02:46:34 2014 +0000
committer Gerrit Code Review <review@openstack.org> Wed Apr 23 02:46:34 2014 +0000
tree 1136726349142d9b0781cc51be8500127d228ff4
parent 32f8f83c2c89a1aac8409887d7cccc0b4c284be1
parent 4ac02748214a257184a2043a8809a367f272d916

Merge "Verify delete server attributes of Nova API"

tempest/api_schema/compute/servers.py

diff --git a/tempest/api_schema/compute/servers.py b/tempest/api_schema/compute/servers.py
index 5eb5ecb..a273abb 100644
--- a/tempest/api_schema/compute/servers.py
+++ b/tempest/api_schema/compute/servers.py
@@ -43,3 +43,7 @@
         'required': ['console']
     }
 }
+
+delete_server = {
+    'status_code': [204],
+}

tempest/services/compute/json/servers_client.py

diff --git a/tempest/services/compute/json/servers_client.py b/tempest/services/compute/json/servers_client.py
index cf1dad9..f44c303 100644
--- a/tempest/services/compute/json/servers_client.py
+++ b/tempest/services/compute/json/servers_client.py
@@ -136,7 +136,9 @@
 
     def delete_server(self, server_id):
         """Deletes the given server."""
-        return self.delete("servers/%s" % str(server_id))
+        resp, body = self.delete("servers/%s" % str(server_id))
+        self.validate_response(common_schema.delete_server, resp, body)
+        return resp, body
 
     def list_servers(self, params=None):
         """Lists all servers for a user."""

tempest/services/compute/v3/json/servers_client.py

diff --git a/tempest/services/compute/v3/json/servers_client.py b/tempest/services/compute/v3/json/servers_client.py
index caeb315..a70ac3d 100644
--- a/tempest/services/compute/v3/json/servers_client.py
+++ b/tempest/services/compute/v3/json/servers_client.py
@@ -136,7 +136,9 @@
 
     def delete_server(self, server_id):
         """Deletes the given server."""
-        return self.delete("servers/%s" % str(server_id))
+        resp, body = self.delete("servers/%s" % str(server_id))
+        self.validate_response(common_schema.delete_server, resp, body)
+        return resp, body
 
     def list_servers(self, params=None):
         """Lists all servers for a user."""