summaryrefslogtreecommitdiffstats
path: root/testsuites/rubbos
diff options
context:
space:
mode:
authorwangyaoguang <sunshine.wang@huawei.com>2016-05-10 15:53:50 +0800
committerwangyaoguang <sunshine.wang@huawei.com>2016-05-10 16:05:13 +0800
commit33d7006546e40ca96013dbe49c9b7dedb9325415 (patch)
tree1053a7cf956a57729ae69a51c396b729cc08c561 /testsuites/rubbos
parent4f8ab04db81191b3a1608e150db1ad6cedfc38d4 (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')
-rwxr-xr-xtestsuites/rubbos/puppet_manifests/internal/run_rubbos_internal.sh99
-rwxr-xr-xtestsuites/rubbos/run_rubbos.py32
2 files changed, 77 insertions, 54 deletions
diff --git a/testsuites/rubbos/puppet_manifests/internal/run_rubbos_internal.sh b/testsuites/rubbos/puppet_manifests/internal/run_rubbos_internal.sh
index c28213b3..2d7677d8 100755
--- a/testsuites/rubbos/puppet_manifests/internal/run_rubbos_internal.sh
+++ b/testsuites/rubbos/puppet_manifests/internal/run_rubbos_internal.sh
@@ -21,10 +21,12 @@ controller_host=`hostname`
REMOTE_GIT_REPO=git://git.opnfv.org/bottlenecks
REMOTE_ARTIFACTS_REPO=http://artifacts.opnfv.org/bottlenecks/rubbos/rubbos_files.tar.gz
-LOCAL_GIT_REPO=/btnks-git
-LOCAL_ARTIFACTS_REPO=/btnks-artifacts
-LOCAL_RUBBOS_MANIFESTS_HOME=/btnks-git/bottlenecks/testsuites/rubbos/puppet_manifests
-LOCAL_ARTIFACTS_RUBBOS_HOME=/btnks-artifacts/rubbos_files
+LOCAL_GIT_REPO=/home/ubuntu/btnks-git
+LOCAL_ARTIFACTS_REPO=/home/ubuntu/btnks-artifacts
+LOCAL_RUBBOS_MANIFESTS_HOME=/home/ubuntu/btnks-git/bottlenecks/testsuites/rubbos/puppet_manifests
+LOCAL_ARTIFACTS_RUBBOS_HOME=/home/ubuntu/btnks-artifacts/rubbos_files
+
+SSH_ARGS="-o StrictHostKeyChecking=no -o BatchMode=yes -i /home/ubuntu/.ssh/id_rsa"
# conf properties from the input config file
client_servers=
@@ -171,7 +173,7 @@ fetch_remote_resources() {
fi
mkdir -p $LOCAL_ARTIFACTS_REPO
cd $LOCAL_ARTIFACTS_REPO
- wget ${REMOTE_ARTIFACTS_REPO}
+ wget -nv ${REMOTE_ARTIFACTS_REPO}
tar xvzf rubbos_files.tar.gz
if [ -d $local_results_dir ];then
@@ -182,47 +184,61 @@ fetch_remote_resources() {
# ssh all vms/instances once only after first creation
direct_ssh() {
- sudo cp ${LOCAL_GIT_REPO}/bottlenecks/utils/infra_setup/bottlenecks_key/bottlenecks_key /home/ubuntu/.ssh/id_rsa
+ echo "127.0.0.1 $(hostname)" >> /etc/hosts
+ echo "write hosts file: 127.0.0.1 $(hostname)"
+ cp ${LOCAL_GIT_REPO}/bottlenecks/utils/infra_setup/bottlenecks_key/bottlenecks_key /home/ubuntu/.ssh/id_rsa
sudo chmod 0600 /home/ubuntu/.ssh/id_rsa
echo 'StrictHostKeyChecking no' > /home/ubuntu/.ssh/config
- sudo cp /home/ubuntu/.ssh/id_rsa /root/.ssh/
- sudo cp /home/ubuntu/.ssh/config /root/.ssh/
- local ssh_args="-o StrictHostKeyChecking=no -o BatchMode=yes -i /home/ubuntu/.ssh/id_rsa"
+ sudo chown -R ubuntu:ubuntu /home/ubuntu/.ssh
i=1
- while [ $i -lt ${#hostname_arr[@]} ]; do
- echo ${hostip_arr[$i]}" "${hostname_arr[$i]}
+ while [ $i -lt ${#hostip_arr[@]} ]; do
+ echo ${hostip_arr[$i]}" "${hostname_arr[$i]} >> /etc/hosts
+ let i=i+1
+ done
+ echo "Done controller."
+
+ i=1
+ while [ $i -lt ${#hostip_arr[@]} ]; do
if [ ${hostname_arr[$i]} == ${controller_host} ];then
let i=i+1
continue
fi
- echo ${hostip_arr[$i]}" "${hostname_arr[$i]} >> /etc/hosts
- ssh ${ssh_args} ubuntu@${hostname_arr[$i]} "echo 'StrictHostKeyChecking no' > /home/ubuntu/.ssh/config"
- ssh ${ssh_args} ubuntu@${hostname_arr[$i]} "sudo cp /home/ubuntu/.ssh/config /root/.ssh/"
- scp ${ssh_args} /home/ubuntu/.ssh/id_rsa ubuntu@${hostname_arr[$i]}:/home/ubuntu/.ssh/
- ssh ${ssh_args} ubuntu@${hostname_arr[$i]} "sudo cp /home/ubuntu/.ssh/id_rsa /root/.ssh/"
- echo "Append hosts for "${hostname_arr[$i]}
- ssh ${ssh_args} ubuntu@${hostname_arr[$i]} "sudo cp /etc/hosts /home/ubuntu/ && sudo chmod 646 /home/ubuntu/hosts"
+ echo "Processing: "${hostip_arr[$i]}" "${hostname_arr[$i]}
+ echo "ssh *sudo hostname* test:"
+ ssh ${SSH_ARGS} ubuntu@${hostip_arr[$i]} "sudo hostname"
+
+ ssh ${SSH_ARGS} ubuntu@${hostip_arr[$i]} "sudo cp /etc/hosts /home/ubuntu/ && sudo chmod 646 /home/ubuntu/hosts"
+ ssh ${SSH_ARGS} ubuntu@${hostip_arr[$i]} "echo 127.0.0.1 ${hostname_arr[$i]} >> /home/ubuntu/hosts"
j=1
- while [ $j -lt ${#hostname_arr[@]} ];do
+ while [ $j -lt ${#hostip_arr[@]} ];do
local host_item=${hostip_arr[$j]}" "${hostname_arr[$j]}
- ssh ${ssh_args} ubuntu@${hostname_arr[$i]} "sudo echo ${host_item} >> /home/ubuntu/hosts"
+ ssh ${SSH_ARGS} ubuntu@${hostip_arr[$i]} "echo ${host_item} >> /home/ubuntu/hosts"
let j=j+1
done
- ssh ${ssh_args} ubuntu@${hostname_arr[$i]} "sudo chmod 644 /home/ubuntu/hosts && sudo cp /home/ubuntu/hosts /etc/ && sudo rm -rf /home/ubuntu/hosts"
+ ssh ${SSH_ARGS} ubuntu@${hostip_arr[$i]} "sudo chmod 644 /home/ubuntu/hosts && sudo cp /home/ubuntu/hosts /etc/ && sudo rm -rf /home/ubuntu/hosts"
+ echo "done hosts"
+
+ sudo ssh ${SSH_ARGS} ubuntu@${hostip_arr[$i]} "echo 'StrictHostKeyChecking no' > /home/ubuntu/.ssh/config"
+ sudo scp ${SSH_ARGS} /home/ubuntu/.ssh/id_rsa ubuntu@${hostip_arr[$i]}:/home/ubuntu/.ssh/
+
let i=i+1
done
}
start_puppet_service() {
# Start puppetserver
- local ssh_args="-o StrictHostKeyChecking=no -o BatchMode=yes -i /home/ubuntu/.ssh/id_rsa"
- sudo service puppetserver status
+ sudo service puppetserver stop
sudo service puppetserver start
+ sudo service puppetserver status
# Start all puppet agents
for host in "${all_agents_arr[@]}";do
- ssh ${ssh_args} ubuntu@${host} "sudo service puppet start --no-client"
+ echo "start puppet agent on:"${host}
+ ssh ${SSH_ARGS} ubuntu@${host} "sudo service puppet status"
+ ssh ${SSH_ARGS} ubuntu@${host} "sudo service puppet stop"
+ ssh ${SSH_ARGS} ubuntu@${host} "sudo service puppet start --no-client"
+ ssh ${SSH_ARGS} ubuntu@${host} "sudo service puppet status"
done
- sudo service puppetserver status
+
sudo puppet cert list --all
sudo puppet cert sign --all
sudo puppet cert list --all
@@ -277,30 +293,17 @@ _to_puppet_class_nodes() {
# inline function
_execute_catalog() {
- # use *class_nodes* to receive return vale
- _to_puppet_class_nodes ${client_servers}
- sed -i 's/REPLACED_CLIENT_NODES/'${class_nodes}'/g' /etc/puppet/manifests/site.pp
-
- _to_puppet_class_nodes ${web_servers}
- sed -i 's/REPLACED_HTTPD_NODES/'${class_nodes}'/g' /etc/puppet/manifests/site.pp
-
- _to_puppet_class_nodes ${app_servers}
- sed -i 's/REPLACED_TOMCAT_NODES/'${class_nodes}'/g' /etc/puppet/manifests/site.pp
-
- _to_puppet_class_nodes ${database_servers}
- sed -i 's/REPLACED_MYSQL_NODES/'${class_nodes}'/g' /etc/puppet/manifests/site.pp
-
for host in "${clients_arr[@]}"; do
- ssh ubuntu@${host} 'sudo puppet agent -t' &
+ ssh ${SSH_ARGS} ubuntu@${host} 'sudo puppet agent -t' &
done
for host in "${webservers_arr[@]}"; do
- ssh ubuntu@${host} 'sudo puppet agent -t'
+ ssh ${SSH_ARGS} ubuntu@${host} 'sudo puppet agent -t'
done
for host in "${appservers_arr[@]}"; do
- ssh ubuntu@${host} 'sudo puppet agent -t'
+ ssh ${SSH_ARGS} ubuntu@${host} 'sudo puppet agent -t'
done
for host in "${dbservers_arr[@]}"; do
- ssh ubuntu@${host} 'sudo puppet agent -t'
+ ssh ${SSH_ARGS} ubuntu@${host} 'sudo puppet agent -t'
done
}
@@ -340,24 +343,24 @@ execute_catalog() {
run_emulator() {
# prepare data in db servers
for host in "${dbservers_arr[@]}"; do
- ssh ubuntu@${host} 'sudo scp ubuntu@'${controller_host}':/etc/puppet/modules/rubbos_mysql/files/rubbos_data_sql.tar.gz '${rubbos_home}''
- ssh ubuntu@${host} 'cd '${rubbos_home}' && sudo ./prepare_rubbos_mysql_db.sh ./rubbos_data_sql.tar.gz ./rubbos_data_sql_dir'
+ ssh ${SSH_ARGS} ubuntu@${host} 'sudo scp ubuntu@'${controller_host}':/etc/puppet/modules/rubbos_mysql/files/rubbos_data_sql.tar.gz '${rubbos_home}''
+ ssh ${SSH_ARGS} ubuntu@${host} 'cd '${rubbos_home}' && sudo ./prepare_rubbos_mysql_db.sh ./rubbos_data_sql.tar.gz ./rubbos_data_sql_dir'
done
# run emulator.sh ( Modify rubbos.properties file first)
- ssh ubuntu@${bench_client} 'sudo rm -rf '${rubbos_home}'/bench/bench'
+ ssh ${SSH_ARGS} ubuntu@${bench_client} 'sudo rm -rf '${rubbos_home}'/bench/bench'
for x in "${clients_per_node_arr[@]}";do
echo "run emulator with clients_per_node="$x
for host in "${clients_arr[@]}";do
- ssh ubuntu@${host} "sed -e 's/REPLACED_NUMBER_OF_CLIENTS_PER_NODE/'${x}'/g' '${rubbos_home}'/Client/rubbos.properties.template > '${rubbos_home}'/Client/rubbos.properties "
+ ssh ${SSH_ARGS} ubuntu@${host} "sed -e 's/REPLACED_NUMBER_OF_CLIENTS_PER_NODE/'${x}'/g' '${rubbos_home}'/Client/rubbos.properties.template > '${rubbos_home}'/Client/rubbos.properties "
done
- ssh ubuntu@${bench_client} 'cd '${rubbos_home}'/bench && ./run_emulator.sh'
+ ssh ${SSH_ARGS} ubuntu@${bench_client} 'cd '${rubbos_home}'/bench && ./run_emulator.sh'
done
}
collect_results() {
# collect results, from bench_host to controller
- scp -r ubuntu@${bench_client}:${rubbos_home}/bench/bench/* ${local_results_dir}
+ scp ${SSH_ARGS} -r ubuntu@${bench_client}:${rubbos_home}/bench/bench/* ${local_results_dir}
}
process_results() {
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()