summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2017-04-27 06:53:32 +0000
committerxudan <xudan16@huawei.com>2017-05-02 08:02:03 +0000
commit44df09b5fbf564c014020ea98ce7650b46bfd771 (patch)
tree9a3175110870cb210f476185d37fcb20dbc2011d
parenta19708f290905bbb831e7430a1d9a984d5fb6e79 (diff)
dovetail: create file pod.yaml for running HA test cases
JIRA: DOVETAIL-407 1. HA test cases need a file pod.yaml giving the info of the pod (node's ip, username, password/key_file). 2. Dovetail client has finished the adaption JIRA: DOVETAIL-405. 3. CI uses create_pod_file.py to generate /home/opnfv/dovetail/userconfig/pod.yaml 4. If INSTALLER_TYPE is fuel, fetch it's jumpserver key to /home/opnfv/dovetail/userconfig/id_rsa Change-Id: Iaf6afbdfb8e4331ae9a10ea3df060c37e9010a0a Signed-off-by: xudan <xudan16@huawei.com>
-rwxr-xr-xjjb/dovetail/dovetail-run.sh48
-rw-r--r--utils/create_pod_file.py102
2 files changed, 146 insertions, 4 deletions
diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index 5161a3c7c..fb16f6adc 100755
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -32,10 +32,11 @@ if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FOR
sudo iptables -I FORWARD -j RETURN
fi
+releng_repo=${WORKSPACE}/releng
+[ -d ${releng_repo} ] && sudo rm -rf ${releng_repo}
+git clone https://gerrit.opnfv.org/gerrit/releng ${releng_repo} >/dev/null
+
if [[ ${INSTALLER_TYPE} != 'joid' ]]; then
- releng_repo=${WORKSPACE}/releng
- [ -d ${releng_repo} ] && sudo rm -rf ${releng_repo}
- git clone https://gerrit.opnfv.org/gerrit/releng ${releng_repo} >/dev/null
${releng_repo}/utils/fetch_os_creds.sh -d ${OPENRC} -i ${INSTALLER_TYPE} -a ${INSTALLER_IP} >${redirect}
fi
@@ -47,16 +48,55 @@ else
exit 1
fi
+pip install virtualenv
+
+cd ${releng_repo}/modules
+virtualenv venv
+source venv/bin/activate
+sudo pip install -e ./ >/dev/null
+
+if [[ ${INSTALLER_TYPE} == compass ]]; then
+ options="-u root -p root"
+elif [[ ${INSTALLER_TYPE} == fuel ]]; then
+ options="-u root -p r00tme"
+else
+ echo "Don't support to generate pod.yaml on ${INSTALLER_TYPE} currently."
+ echo "HA test cases may not run properly."
+fi
+
+pod_file_dir="/home/opnfv/dovetail/userconfig"
+cmd="sudo python ${releng_repo}/utils/create_pod_file.py -t ${INSTALLER_TYPE} -i ${INSTALLER_IP} ${options} -f ${pod_file_dir}/pod.yaml"
+echo ${cmd}
+${cmd}
+
+deactivate
+
+if [ -f ${pod_file_dir}/pod.yaml ]; then
+ echo "file ${pod_file_dir}/pod.yaml:"
+ cat ${pod_file_dir}/pod.yaml
+else
+ echo "Error: There doesn't exist file ${pod_file_dir}/pod.yaml."
+ echo "HA test cases may not run properly."
+fi
+
+ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+
+if [ "$INSTALLER_TYPE" == "fuel" ]; then
+ echo "Fetching id_rsa file from jump_server $INSTALLER_IP..."
+ sshpass -p r00tme sudo scp $ssh_options root@${INSTALLER_IP}:~/.ssh/id_rsa ${pod_file_dir}/id_rsa
+fi
+
opts="--privileged=true -id"
results_envs="-v /var/run/docker.sock:/var/run/docker.sock \
-v /home/opnfv/dovetail/results:/home/opnfv/dovetail/results"
openrc_volume="-v ${OPENRC}:${OPENRC}"
+userconfig_volume="-v ${pod_file_dir}:${pod_file_dir}"
# Pull the image with correct tag
echo "Dovetail: Pulling image opnfv/dovetail:${DOCKER_TAG}"
docker pull opnfv/dovetail:$DOCKER_TAG >$redirect
-cmd="docker run ${opts} ${results_envs} ${openrc_volume} \
+cmd="docker run ${opts} ${results_envs} ${openrc_volume} ${userconfig_volume} \
${sshkey} opnfv/dovetail:${DOCKER_TAG} /bin/bash"
echo "Dovetail: running docker run command: ${cmd}"
${cmd} >${redirect}
diff --git a/utils/create_pod_file.py b/utils/create_pod_file.py
new file mode 100644
index 000000000..22943fc97
--- /dev/null
+++ b/utils/create_pod_file.py
@@ -0,0 +1,102 @@
+import os
+import yaml
+from opnfv.deployment import factory
+import argparse
+
+
+parser = argparse.ArgumentParser(description='OPNFV POD Info Generator')
+
+parser.add_argument("-t", "--INSTALLER_TYPE", help="Give INSTALLER_TYPE")
+parser.add_argument("-i", "--INSTALLER_IP", help="Give INSTALLER_IP")
+parser.add_argument("-u", "--user", help="Give username of this pod")
+parser.add_argument("-k", "--key", help="Give key file of the user")
+parser.add_argument("-p", "--password", help="Give password of the user")
+parser.add_argument("-f", "--filepath", help="Give dest path of output file")
+args = parser.parse_args()
+
+
+def check_params():
+ """
+ Check all the CLI inputs. Must give INSTALLER_TYPE, INSTALLER_IP, user
+ and filepath of the output file.
+ Need to give key or password.
+ """
+ if not args.INSTALLER_TYPE or not args.INSTALLER_IP or not args.user:
+ print("INSTALLER_TYPE, INSTALLER_IP and user are all needed.")
+ return False
+ if not args.key and not args.password:
+ print("key and password are all None. At least providing one.")
+ return False
+ if not args.filepath:
+ print("Must give the dest path of the output file.")
+ return False
+ return True
+
+
+def get_with_key():
+ """
+ Get handler of the nodes info with key file.
+ """
+ return factory.Factory.get_handler(args.INSTALLER_TYPE, args.INSTALLER_IP,
+ args.user, pkey_file=args.key)
+
+
+def get_with_passwd():
+ """
+ Get handler of the nodes info with password.
+ """
+ return factory.Factory.get_handler(args.INSTALLER_TYPE, args.INSTALLER_IP,
+ args.user, installer_pwd=args.password)
+
+
+def create_file(handler):
+ """
+ Create the yaml file of nodes info.
+ As Yardstick required, node name must be node1, node2, ... and node1 must
+ be controller.
+ Compass uses password of each node.
+ Other installers use key file of each node.
+ """
+ if not os.path.exists(os.path.dirname(args.filepath)):
+ os.path.makedirs(os.path.dirname(args.filepath))
+ nodes = handler.nodes
+ node_list = []
+ index = 1
+ for node in nodes:
+ if node.roles[0].lower() == "controller":
+ node_info = {'name': "node%s" % index, 'role': node.roles[0],
+ 'ip': node.ip, 'user': 'root'}
+ node_list.append(node_info)
+ index += 1
+ for node in nodes:
+ if node.roles[0].lower() == "compute":
+ node_info = {'name': "node%s" % index, 'role': node.roles[0],
+ 'ip': node.ip, 'user': 'root'}
+ node_list.append(node_info)
+ index += 1
+ if args.INSTALLER_TYPE == 'compass':
+ for item in node_list:
+ item['password'] = 'root'
+ else:
+ for item in node_list:
+ item['key_filename'] = '/root/.ssh/id_rsa'
+ data = {'nodes': node_list}
+ with open(args.filepath, "w") as fw:
+ yaml.dump(data, fw)
+
+
+def main():
+ if not check_params():
+ return 1
+ if args.key:
+ handler = get_with_key()
+ else:
+ handler = get_with_passwd()
+ if not handler:
+ print("Error: failed to get the node's handler.")
+ return 1
+ create_file(handler)
+
+
+if __name__ == '__main__':
+ main()