From 386ae8c17162d8cc950c0f6c71fa364b9cbea9d4 Mon Sep 17 00:00:00 2001
From: Attila Fazekas <afazekas@redhat.com>
Date: Mon, 21 Oct 2013 09:27:18 +0200
Subject: [PATCH] Additional ssh tests with tempest

The run_ssh option is used on the default 'false',
 so several test case and validation step was disabled.

It was disabled because:
 * Admin password injection with the cirros image is not supported.
  (We 'cannot' inject password/shadow to a ram disk.)
 * In the current system setup floating IP is required for connecting
   with neutron

The run_ssh boolean option will be removed from tempest, it will be replaced
with ssh_connect_method and ssh_auth_method.

Since using a floating ip with nova flat network is not required in these
case, the 'fixed'/private IPs (ssh_connect_method) will be used with nova network
, and we will use the 'floating' IPs with neutron when the NAMESPACES
are enabled(default).

The default value of ssh_auth_method is keypair, it works in both cases.

Change-Id: I3d47811d801985687526749a430ed6db64224f99
---
 lib/tempest | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/tempest b/lib/tempest
index 8e4e5210ea..677d66b50d 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -75,6 +75,7 @@ function configure_tempest() {
     local public_router_id
     local tenant_networks_reachable
     local boto_instance_type="m1.tiny"
+    local ssh_connect_method="fixed"
 
     # TODO(afazekas):
     # sudo python setup.py deploy
@@ -182,10 +183,13 @@ function configure_tempest() {
 
     if [ "$Q_USE_NAMESPACE" != "False" ]; then
         tenant_networks_reachable=false
+        ssh_connect_method="floating"
     else
         tenant_networks_reachable=true
     fi
 
+    ssh_connect_method=${TEMPEST_SSH_CONNECT_METHOD:-$ssh_connect_method}
+
     if is_service_enabled q-l3; then
         public_network_id=$(neutron net-list | grep $PUBLIC_NETWORK_NAME | \
             awk '{print $2}')
@@ -248,6 +252,7 @@ function configure_tempest() {
     iniset $TEMPEST_CONF compute flavor_ref_alt $flavor_ref_alt
     iniset $TEMPEST_CONF compute live_migration_available ${LIVE_MIGRATION_AVAILABLE:-False}
     iniset $TEMPEST_CONF compute use_block_migration_for_live_migration ${USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION:-False}
+    iniset $TEMPEST_CONF compute ssh_connect_method $ssh_connect_method
 
     # Compute admin
     iniset $TEMPEST_CONF "compute-admin" password "$password" # DEPRECATED