From dd0d1336f9bb74390b44460889a684e58ffb74ce Mon Sep 17 00:00:00 2001 From: Victor Morales Date: Mon, 17 Sep 2018 04:42:59 -0700 Subject: Refactor plugin.sh functional test There are some instructions located in plugin.sh script which can be exported to a common place like _common.sh library. This change moves those instructions. Change-Id: I44aeaf75ea70aa2148b17bbcb82314ea339d7a00 Signed-off-by: Victor Morales Issue-ID: MULTICLOUD-301 --- vagrant/tests/_common.sh | 58 +++++++++++++++++++++++++++++++++- vagrant/tests/plugin.sh | 82 ++++++++++-------------------------------------- 2 files changed, 74 insertions(+), 66 deletions(-) (limited to 'vagrant/tests') diff --git a/vagrant/tests/_common.sh b/vagrant/tests/_common.sh index d1b6315d..fb5d1798 100755 --- a/vagrant/tests/_common.sh +++ b/vagrant/tests/_common.sh @@ -19,6 +19,8 @@ image_name=virtlet.cloud/ubuntu/16.04 multus_deployment_name=multus-deployment virtlet_image=virtlet.cloud/fedora virtlet_deployment_name=virtlet-deployment +plugin_deployment_name=plugin-deployment +plugin_service_name=plugin-service # popule_CSAR_containers_vFW() - This function creates the content of CSAR file # required for vFirewal using only containers @@ -572,5 +574,59 @@ spec: # This memory limit is applied to the libvirt domain definition memory: 160Mi DEPLOYMENT -popd + popd +} + +# populate_CSAR_plugin()- Creates content used for Plugin functional tests +function populate_CSAR_plugin { + local csar_id=$1 + + _checks_args $csar_id + pushd ${CSAR_DIR}/${csar_id} + + cat << META > metadata.yaml +resources: + deployment: + - $plugin_deployment_name.yaml + service: + - service.yaml +META + + cat << DEPLOYMENT > $plugin_deployment_name.yaml +apiVersion: apps/v1 +kind: Deployment +metadata: + name: $plugin_deployment_name +spec: + replicas: 1 + selector: + matchLabels: + app: plugin + template: + metadata: + labels: + app: plugin + spec: + containers: + - name: $plugin_deployment_name + image: "busybox" + command: ["top"] + stdin: true + tty: true +DEPLOYMENT + + cat << SERVICE > service.yaml +apiVersion: v1 +kind: Service +metadata: + name: $plugin_service_name +spec: + ports: + - port: 80 + protocol: TCP + selector: + app: sise +SERVICE + popd } + diff --git a/vagrant/tests/plugin.sh b/vagrant/tests/plugin.sh index ac373cd3..16d8d306 100755 --- a/vagrant/tests/plugin.sh +++ b/vagrant/tests/plugin.sh @@ -13,6 +13,14 @@ set -o nounset set -o pipefail #set -o xtrace +source _common.sh +source _functions.sh + +base_url="http://localhost:8081/v1/vnf_instances/" +cloud_region_id="krd" +namespace="default" +csar_id="94e414f6-9ca4-11e8-bb6a-52540067263b" + # _build_generic_sim() - Creates a generic simulator image in case that doesn't exist function _build_generic_sim { if [[ -n $(docker images -q generic_sim) ]]; then @@ -42,72 +50,13 @@ function start_aai_service { docker run --name aai -v $(mktemp):/tmp/generic_sim/ -v $(pwd)/generic_simulator/aai/:/etc/generic_sim/ -p 8443:8080 -d generic_sim } -# populate_csar_dir()- Creates content used for Functional tests -function populate_csar_dir { - mkdir -p ${CSAR_DIR}/${csar_id} - cat << META > ${CSAR_DIR}/${csar_id}/metadata.yaml -resources: - deployment: - - deployment.yaml - service: - - service.yaml -META - - cat << DEPLOYMENT > ${CSAR_DIR}/${csar_id}/deployment.yaml -apiVersion: apps/v1 -kind: Deployment -metadata: - name: $deployment_name - labels: - app: multus -spec: - replicas: 1 - selector: - matchLabels: - app: multus - template: - metadata: - labels: - app: multus - annotations: - kubernetes.v1.cni.cncf.io/networks: '[ - { "name": "bridge-conf", "interfaceRequest": "eth1" }, - { "name": "bridge-conf", "interfaceRequest": "eth2" } - ]' - spec: - containers: - - name: multus-deployment - image: "busybox" - command: ["top"] - stdin: true - tty: true -DEPLOYMENT - cat << SERVICE > ${CSAR_DIR}/${csar_id}/service.yaml -apiVersion: v1 -kind: Service -metadata: - name: $service_name -spec: - ports: - - port: 80 - protocol: TCP - selector: - app: sise -SERVICE -} - -# Configuration -base_url="http://localhost:8081/v1/vnf_instances/" -cloud_region_id="krd" -namespace="default" -csar_id="94e414f6-9ca4-11e8-bb6a-52540067263b" -deployment_name="test-deployment" -service_name="test-service" +# Setup +destroy_deployment $plugin_deployment_name #start_aai_service -populate_csar_dir +populate_CSAR_plugin $csar_id -#Functional Tests execution +# Test payload_raw=" { \"cloud_region_id\": \"$cloud_region_id\", @@ -119,8 +68,8 @@ payload=$(echo $payload_raw | tr '\n' ' ') echo "Creating VNF Instance" vnf_id=$(curl -s -d "$payload" "${base_url}" | jq -r '.vnf_id') echo "=== Validating Kubernetes ===" -kubectl get --no-headers=true --namespace=${namespace} deployment ${cloud_region_id}-${namespace}-${vnf_id}-${deployment_name} -kubectl get --no-headers=true --namespace=${namespace} service ${cloud_region_id}-${namespace}-${vnf_id}-$service_name +kubectl get --no-headers=true --namespace=${namespace} deployment ${cloud_region_id}-${namespace}-${vnf_id}-${plugin_deployment_name} +kubectl get --no-headers=true --namespace=${namespace} service ${cloud_region_id}-${namespace}-${vnf_id}-${plugin_service_name} echo "VNF Instance created succesfully with id: $vnf_id" vnf_id_list=$(curl -s -X GET "${base_url}${cloud_region_id}/${namespace}" | jq -r '.vnf_id_list') @@ -143,3 +92,6 @@ if [[ -n $(curl -s -X GET "${base_url}${cloud_region_id}/${namespace}/${vnf_id}" echo "VNF Instance not deleted" exit 1 fi + +# Teardown +teardown $plugin_deployment_name -- cgit 1.2.3-korg