bugfix: Correct instance's hostname and nameservers

[bottlenecks.git] / testsuites / rubbos / run_rubbos.py

diff --git a/testsuites/rubbos/run_rubbos.py b/testsuites/rubbos/run_rubbos.py
index e49ff7e..0b4a613 100755 (executable)
--- a/testsuites/rubbos/run_rubbos.py
+++ b/testsuites/rubbos/run_rubbos.py
@@ -216,18 +216,18 @@ def rubbos_run():
         private_ip = [ x['addr'] for x in getattr(instance, 'addresses').itervalues().next() if x['OS-EXT-IPS:type'] == 'fixed']
         public_ip =  [ x['addr'] for x in getattr(instance, 'addresses').itervalues().next() if x['OS-EXT-IPS:type'] == 'floating']
 
-        if name.find("rubbos_control") >= 0:
+        if name.find("rubbos-control") >= 0:
             control_public_ip = public_ip[0]
             control_server = str(name) + ':' + public_ip[0] + ':' + private_ip[0]
-        if name.find("rubbos_client") >= 0:
+        if name.find("rubbos-client") >= 0:
             client_servers = client_servers + str(name)+':'+private_ip[0] + ","
-        if name.find("rubbos_httpd") >= 0:
+        if name.find("rubbos-httpd") >= 0:
             web_servers = web_servers + str(name)+':'+private_ip[0] + ","
-        if name.find("rubbos_tomcat") >= 0:
+        if name.find("rubbos-tomcat") >= 0:
             app_servers = app_servers + str(name) + ':' + private_ip[0] + ","
-        if name.find("rubbos_cjdbc") >= 0:
+        if name.find("rubbos-cjdbc") >= 0:
             cjdbc_controller = str(name) + ':' + private_ip[0]
-        if name.find("rubbos_mysql") >= 0:
+        if name.find("rubbos-mysql") >= 0:
             database_servers = database_servers + str(name) + ':' + private_ip[0] + ","
 
     client_servers = client_servers[0:len(client_servers)-1]
@@ -265,6 +265,21 @@ def rubbos_run():
     subprocess.call(cmd, shell=True)
 
     ssh_args = "-o StrictHostKeyChecking=no -o BatchMode=yes -i " + Bottlenecks_repo_dir + "/utils/infra_setup/bottlenecks_key/bottlenecks_key "
+    print "############### Test #################"
+    print "## Ping test:"
+    cmd = "ping -c 5 " + control_public_ip
+    print cmd
+    subprocess.call(cmd, shell=True)
+    print "## ssh date test:"
+    cmd = "ssh " + ssh_args + " ubuntu@" + control_public_ip + ' "date"'
+    print cmd
+    subprocess.call(cmd, shell=True)
+    print "## neutruon net-list:"
+    subprocess.call("neutron net-list", shell=True)
+    print "## nova list:"
+    subprocess.call("nova list", shell=True)
+    print "############### Test #################"
+
     cmd = "scp " + ssh_args + "rubbos.conf ubuntu@" + control_public_ip + ":/home/ubuntu/"
     print "Exec shell: " + cmd
     subprocess.call(cmd, shell=True)
@@ -297,14 +312,15 @@ def main():
     global image_url
     Bottlenecks_repo_dir = "/home/opnfv/bottlenecks"      # same in Dockerfile, docker directory
 
-    image_url = 'http://artifacts.opnfv.org/bottlenecks/rubbos/trusty-server-cloudimg-amd64-btnks.img'
+    #image_url = 'http://artifacts.opnfv.org/bottlenecks/rubbos/trusty-server-cloudimg-amd64-btnks.img'
+    image_url = 'http://artifacts.opnfv.org/bottlenecks/rubbos/bottlenecks-trusty-server.img'
 
     if not (args.conf):
        logger.error("Configuration files are not set for testcase")
        exit(-1)
     else:
        Heat_template = args.conf
-    
+ 
     master_user_data=""
     agent_user_data=""
     with open(Bottlenecks_repo_dir+"/utils/infra_setup/user_data/p-master-user-data") as f: