diff options
author | 2016-05-10 15:53:50 +0800 | |
---|---|---|
committer | 2016-05-10 16:05:13 +0800 | |
commit | 33d7006546e40ca96013dbe49c9b7dedb9325415 (patch) | |
tree | 1053a7cf956a57729ae69a51c396b729cc08c561 /testsuites/rubbos/run_rubbos.py | |
parent | 4f8ab04db81191b3a1608e150db1ad6cedfc38d4 (diff) |
bugfix: fix ssh issue between puppet master and agents
JIRA: BOTTLENECK-75
Change-Id: If15aa3da04d650fb26ce099adbe37ac3c98c638b
Signed-off-by: wangyaoguang <sunshine.wang@huawei.com>
Diffstat (limited to 'testsuites/rubbos/run_rubbos.py')
-rwxr-xr-x | testsuites/rubbos/run_rubbos.py | 32 |
1 files changed, 26 insertions, 6 deletions
diff --git a/testsuites/rubbos/run_rubbos.py b/testsuites/rubbos/run_rubbos.py index 0b4a6130..4005f4eb 100755 --- a/testsuites/rubbos/run_rubbos.py +++ b/testsuites/rubbos/run_rubbos.py @@ -195,6 +195,18 @@ def get_instances(nova_client): print "Error [get_instances(nova_client)]:", e return None +def reboot_instances(): + print("========== reboot instances ==========") + nova = _get_nova_client() + print("nova servers list:") + print(nova.servers.list()) + for instance in nova.servers.list(): + name = getattr(instance, 'name') + if name.find("rubbos") >= 0: + print("reboot %s" % name) + instance.reboot() + print("Finish reboot all rubbos servers.") + def rubbos_run(): print "========== run rubbos ===========" @@ -263,9 +275,11 @@ def rubbos_run(): cmd = "sudo chmod 0600 " + Bottlenecks_repo_dir + "/utils/infra_setup/bottlenecks_key/bottlenecks_key" 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 #################" + cmd = 'ssh-keygen -f "/root/.ssh/known_hosts" -R ' + control_public_ip + subprocess.call(cmd, shell=True) print "## Ping test:" cmd = "ping -c 5 " + control_public_ip print cmd @@ -312,23 +326,23 @@ 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/bottlenecks-trusty-server.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: master_user_data=f.read() - master_user_data = master_user_data.replace('REPLACED_PUPPET_MASTER_SERVER','rubbos_control') + master_user_data = master_user_data.replace('REPLACED_PUPPET_MASTER_SERVER','rubbos-control') with open(Bottlenecks_repo_dir+"/utils/infra_setup/user_data/p-agent-user-data") as f: agent_user_data=f.read() - agent_user_data = agent_user_data.replace('REPLACED_PUPPET_MASTER_SERVER','rubbos_control') + agent_user_data = agent_user_data.replace('REPLACED_PUPPET_MASTER_SERVER','rubbos-control') parameters={'image': 'bottlenecks_rubbos_image', 'key_name': 'bottlenecks_rubbos_keypair', @@ -357,6 +371,12 @@ def main(): print "Cannot create instances, as Failed to create image(s)." exit (-1) + print "Wait 150 seconds after stack creation........." + time.sleep(150) + + reboot_instances() + time.sleep(30) + rubbos_run() rubbos_env_cleanup() |