summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwangyaoguang <sunshine.wang@huawei.com>2016-05-05 20:29:38 +0800
committerwangyaoguang <sunshine.wang@huawei.com>2016-05-05 20:31:33 +0800
commitd84a31795de0ba81f07f063574dab6f31b2198e7 (patch)
tree5abac08ec256dfd29a8465343b9594ae5481b961
parent6f9afdd078c848de886a85f9d216f60fedd92a79 (diff)
bugfix: Correct instance's hostname and nameservers
JIRA: BOTTLENECK-75 Change-Id: Ib6db60956285e172c93411e23454a7c5240eacde Signed-off-by: wangyaoguang <sunshine.wang@huawei.com>
-rwxr-xr-xtestsuites/rubbos/run_rubbos.py18
-rwxr-xr-xtestsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml17
2 files changed, 17 insertions, 18 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/"
diff --git a/testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml b/testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml
index 01e9d57d..f56e6022 100755
--- a/testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml
+++ b/testsuites/rubbos/testcase_cfg/rubbos_1-1-0-1.yaml
@@ -67,6 +67,7 @@ resources:
allocation_pools:
- start: { get_param: private_net_pool_start }
end: { get_param: private_net_pool_end }
+ dns_nameservers: [ "8.8.8.8" ]
router:
type: OS::Neutron::Router
@@ -110,7 +111,7 @@ resources:
rubbos_httpd:
type: OS::Nova::Server
properties:
- name: rubbos_httpd
+ name: rubbos-httpd
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
@@ -131,7 +132,7 @@ resources:
rubbos_mysql1:
type: OS::Nova::Server
properties:
- name: rubbos_mysql1
+ name: rubbos-mysql1
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
@@ -152,7 +153,7 @@ resources:
rubbos_tomcat1:
type: OS::Nova::Server
properties:
- name: rubbos_tomcat1
+ name: rubbos-tomcat1
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
@@ -173,7 +174,7 @@ resources:
rubbos_client1:
type: OS::Nova::Server
properties:
- name: rubbos_client1
+ name: rubbos-client1
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
@@ -194,7 +195,7 @@ resources:
rubbos_client2:
type: OS::Nova::Server
properties:
- name: rubbos_client2
+ name: rubbos-client2
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
@@ -215,7 +216,7 @@ resources:
rubbos_client3:
type: OS::Nova::Server
properties:
- name: rubbos_client3
+ name: rubbos-client3
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
@@ -236,7 +237,7 @@ resources:
rubbos_client4:
type: OS::Nova::Server
properties:
- name: rubbos_client4
+ name: rubbos-client4
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }
@@ -257,7 +258,7 @@ resources:
rubbos_client5:
type: OS::Nova::Server
properties:
- name: rubbos_client5
+ name: rubbos-client5
image: { get_param: image }
flavor: { get_param: flavor }
key_name: { get_param: key_name }