Merge "Make CLI timeout tests configurable"
diff --git a/etc/tempest.conf.sample b/etc/tempest.conf.sample
index ab65914..4f433a6 100644
--- a/etc/tempest.conf.sample
+++ b/etc/tempest.conf.sample
@@ -98,7 +98,7 @@
fixed_network_name = private
# Network id used for SSH (public, private, etc)
-network_for_ssh = private
+network_for_ssh = public
# IP version of the address used for SSH
ip_version_for_ssh = 4
diff --git a/tempest/api/compute/servers/test_server_actions.py b/tempest/api/compute/servers/test_server_actions.py
index 66d8264..893d9e0 100644
--- a/tempest/api/compute/servers/test_server_actions.py
+++ b/tempest/api/compute/servers/test_server_actions.py
@@ -279,6 +279,15 @@
cls.server_id = server['id']
cls.password = server['adminPass']
+ @attr(type='gate')
+ def test_stop_start_server(self):
+ resp, server = self.servers_client.stop(self.server_id)
+ self.assertEqual(202, resp.status)
+ self.servers_client.wait_for_server_status(self.server_id, 'SHUTOFF')
+ resp, server = self.servers_client.start(self.server_id)
+ self.assertEqual(202, resp.status)
+ self.servers_client.wait_for_server_status(self.server_id, 'ACTIVE')
+
class ServerActionsTestXML(ServerActionsTestJSON):
_interface = 'xml'