From ce37b262a5afa80ca883506cf362a165114ce3de Mon Sep 17 00:00:00 2001 From: Dimitrios Markou Date: Sat, 3 Mar 2018 03:38:31 +0200 Subject: Assign nova instance to security group Support the assigning of a nova instance to an existing security group through the operation perspective Change-Id: Ic1c26031c25d400fede2ecb298a66aec42dcfbc5 Signed-off-by: Dimitrios Markou --- .../nova/add_server_to_existing_secgroup.bash | 26 ++++++++++++++++++++++ .../ha_tools/nova/remove_server_from_secgroup.bash | 25 +++++++++++++++++++++ .../scenarios/availability/operation_conf.yaml | 4 ++++ 3 files changed, 55 insertions(+) create mode 100644 yardstick/benchmark/scenarios/availability/ha_tools/nova/add_server_to_existing_secgroup.bash create mode 100644 yardstick/benchmark/scenarios/availability/ha_tools/nova/remove_server_from_secgroup.bash diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/nova/add_server_to_existing_secgroup.bash b/yardstick/benchmark/scenarios/availability/ha_tools/nova/add_server_to_existing_secgroup.bash new file mode 100644 index 000000000..3a50626f5 --- /dev/null +++ b/yardstick/benchmark/scenarios/availability/ha_tools/nova/add_server_to_existing_secgroup.bash @@ -0,0 +1,26 @@ +#!/bin/bash + +############################################################################## +# Copyright (c) 2018 Intracom Telecom and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +# add server to existing security group +# parameters: $1 - server name, $2 - security group name + +set -e + +if [ $OS_INSECURE ] && [ "$(echo $OS_INSECURE | tr '[:upper:]' '[:lower:]')" = "true" ]; then + SECURE="--insecure" +else + SECURE="" +fi + +SECGROUPNAME="$(openstack ${SECURE} security group list -f value -c Name | grep $2)" + +openstack ${SECURE} server add security group $1 ${SECGROUPNAME} + diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/nova/remove_server_from_secgroup.bash b/yardstick/benchmark/scenarios/availability/ha_tools/nova/remove_server_from_secgroup.bash new file mode 100644 index 000000000..61d0a2b49 --- /dev/null +++ b/yardstick/benchmark/scenarios/availability/ha_tools/nova/remove_server_from_secgroup.bash @@ -0,0 +1,25 @@ +#!/bin/bash + +############################################################################## +# Copyright (c) 2018 Intracom Telecom and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +# remove server from existing security group +# parameters: $1 - server name, $2 - security group name + +set -e + +if [ $OS_INSECURE ] && [ "$(echo $OS_INSECURE | tr '[:upper:]' '[:lower:]')" = "true" ]; then + SECURE="--insecure" +else + SECURE="" +fi + +SECGROUPNAME="$(openstack ${SECURE} security group list -f value -c Name | grep $2)" + +openstack ${SECURE} server remove security group $1 ${SECGROUPNAME} diff --git a/yardstick/benchmark/scenarios/availability/operation_conf.yaml b/yardstick/benchmark/scenarios/availability/operation_conf.yaml index 0ca88393b..cee63fbd0 100644 --- a/yardstick/benchmark/scenarios/availability/operation_conf.yaml +++ b/yardstick/benchmark/scenarios/availability/operation_conf.yaml @@ -38,3 +38,7 @@ get-vip-host: start-service: action_script: ha_tools/start_service.bash rollback_script: ha_tools/check_process_python.bash + +add-server-to-secgroup: + action_script: ha_tools/nova/add_server_to_existing_secgroup.bash + rollback_script: ha_tools/nova/remove_server_from_secgroup.bash -- cgit 1.2.3-korg From 0ffdf06d26538e42befc8045eecc04a466fd3d54 Mon Sep 17 00:00:00 2001 From: Dimitrios Markou Date: Thu, 1 Mar 2018 14:17:50 +0200 Subject: Fetch Nova instance's private IP Add the capability to fetch the private IP of a Nova instance through the operation perspective. JIRA: YARDSTICK-1040 Change-Id: Idc3d62bcd3f477a03a89f7dcc8d8616f3cfa2742 Signed-off-by: Dimitrios Markou --- .../ha_tools/nova/get_server_privateip.bash | 24 ++++++++++++++++++++++ .../scenarios/availability/operation_conf.yaml | 4 ++++ 2 files changed, 28 insertions(+) create mode 100644 yardstick/benchmark/scenarios/availability/ha_tools/nova/get_server_privateip.bash diff --git a/yardstick/benchmark/scenarios/availability/ha_tools/nova/get_server_privateip.bash b/yardstick/benchmark/scenarios/availability/ha_tools/nova/get_server_privateip.bash new file mode 100644 index 000000000..7f2bad540 --- /dev/null +++ b/yardstick/benchmark/scenarios/availability/ha_tools/nova/get_server_privateip.bash @@ -0,0 +1,24 @@ +#!/bin/bash + +############################################################################## +# Copyright (c) 2018 Intracom Telecom and others. +# +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## + +# get private ip of a server +# parameter: $1 - server name + +set -e + +if [ $OS_INSECURE ] && [ "$(echo $OS_INSECURE | tr '[:upper:]' '[:lower:]')" = "true" ]; then + SECURE="--insecure" +else + SECURE="" +fi + +openstack ${SECURE} server list -f value -c Name -c Networks | grep $1 | awk '{print $2}' | sed -r 's/.*=([0-9\.\:]+)[;,]*/\1/' + diff --git a/yardstick/benchmark/scenarios/availability/operation_conf.yaml b/yardstick/benchmark/scenarios/availability/operation_conf.yaml index cee63fbd0..5f3f6c91e 100644 --- a/yardstick/benchmark/scenarios/availability/operation_conf.yaml +++ b/yardstick/benchmark/scenarios/availability/operation_conf.yaml @@ -42,3 +42,7 @@ start-service: add-server-to-secgroup: action_script: ha_tools/nova/add_server_to_existing_secgroup.bash rollback_script: ha_tools/nova/remove_server_from_secgroup.bash + +get-privateip: + action_script: ha_tools/nova/get_server_privateip.bash + rollback_script: ha_tools/nova/list_servers.bash -- cgit 1.2.3-korg