diff options
| author |   wangyaoguang <sunshine.wang@huawei.com> | 2016-05-05 20:29:38 +0800 |
|---|---|---|
| committer | wangyaoguang <sunshine.wang@huawei.com> | 2016-05-05 20:31:33 +0800 |
| commit | d84a31795de0ba81f07f063574dab6f31b2198e7 (patch) | |
| tree | 5abac08ec256dfd29a8465343b9594ae5481b961 /testsuites/rubbos/run_rubbos.py | |
| parent | 6f9afdd078c848de886a85f9d216f60fedd92a79 (diff) | |
bugfix: Correct instance's hostname and nameservers
JIRA: BOTTLENECK-75
Change-Id: Ib6db60956285e172c93411e23454a7c5240eacde
Signed-off-by: wangyaoguang <sunshine.wang@huawei.com>
Diffstat (limited to 'testsuites/rubbos/run_rubbos.py')
| -rwxr-xr-x | testsuites/rubbos/run_rubbos.py | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/testsuites/rubbos/run_rubbos.py b/testsuites/rubbos/run_rubbos.py index 11b3f962..0b4a6130 100755 --- 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] @@ -276,10 +276,8 @@ def rubbos_run(): subprocess.call(cmd, shell=True) print "## neutruon net-list:" subprocess.call("neutron net-list", shell=True) - print "## neutron subnet-list:" - subprocess.call("neutron subnet-list", shell=True) - print "## neutron security-group-list:" - subprocess.call("neutron security-group-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/" |