diff options
| -rwxr-xr-x | deployment/heat/onap-oom/scripts/deploy.sh | 65 | ||||
| -rwxr-xr-x | test/csit/plans/dmaap-datarouter/dr-suite/setup.sh | 1 | ||||
| -rwxr-xr-x | test/csit/tests/dmaap-datarouter/dr-suite/dr-suite.robot | 30 | ||||
| -rwxr-xr-x | test/ete/scripts/teardown-onap.sh | 127 | ||||
| -rw-r--r-- | test/mocks/pnfsimulator/pom.xml | 56 | ||||
| -rw-r--r-- | test/mocks/pnfsimulator/src/main/resources/log4j2.xml | 24 |
6 files changed, 212 insertions, 91 deletions
diff --git a/deployment/heat/onap-oom/scripts/deploy.sh b/deployment/heat/onap-oom/scripts/deploy.sh index 8a41a78de..11b2938ee 100755 --- a/deployment/heat/onap-oom/scripts/deploy.sh +++ b/deployment/heat/onap-oom/scripts/deploy.sh @@ -9,16 +9,61 @@ # http://www.apache.org/licenses/LICENSE-2.0 # +install_name="onap-oom" +full_deletion=false + if [ -z "$WORKSPACE" ]; then export WORKSPACE=`git rev-parse --show-toplevel` fi +usage() { echo "Usage: $0 [-n <number of VMs {2-15}>] [ -r ] <env-name>" 1>&2; exit 1; } + if [ "$#" -ne 1 ]; then - echo "Usage: $0 <env-name>" - exit 1 + usage fi ENV_FILE=$1 +while getopts ":n:s:" o; do + case "${o}" in + n) + if [[ ${OPTARG} =~ ^[0-9]+$ ]];then + vm_num=${OPTARG} + if [ ${OPTARG} > 15 ] || [ ${OPTARG} < 2 ]; then + usage + fi + else + usage + fi + ;; + r) + echo "The following command will delete all information relating to onap within your enviroment" + read -p "Are you certain this is what you want? (type y to confirm):" answer + + if [ $answer = "y" ] || [ $answer = "Y" ] || [ $answer = "yes" ] || [ $answer = "Yes"]; then + echo "This may delete the work of other colleages within the same enviroment" + read -p "Are you certain this is what you want? (type y to confirm):" answer2 + + if [ $answer2 = "y" ] || [ $answer2 = "Y" ] || [ $answer2 = "yes" ] || [ $answer2 = "Yes"]; then + full_deletion=true + else + echo "Ending program" + exit 1 + fi + else + echo "Ending program" + exit 1 + fi + ;; + q) + full_deletion=true + ;; + *) + usage + ;; + esac +done +shift $((OPTIND-1)) + SSH_KEY=~/.ssh/onap_key source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh @@ -27,20 +72,24 @@ SO_ENCRYPTION_KEY=aa3871669d893c7fb8abbcda31b88b4f export OS_PASSWORD_ENCRYPTED=$(echo -n "$OS_PASSWORD" | openssl aes-128-ecb -e -K "$SO_ENCRYPTION_KEY" -nosalt | xxd -c 256 -p) for n in $(seq 1 5); do - $WORKSPACE/test/ete/scripts/teardown-onap.sh + if [ $full_deletion = true ] ; then + $WORKSPACE/test/ete/scripts/teardown-onap.sh -n $install_name -q + else + $WORKSPACE/test/ete/scripts/teardown-onap.sh -n $install_name + fi cd $WORKSPACE/deployment/heat/onap-oom envsubst < $ENV_FILE > $ENV_FILE~ - if ! openstack stack create -t ./onap-oom.yaml -e $ENV_FILE~ onap-oom; then + if ! openstack stack create -t ./$install_name.yaml -e $ENV_FILE~ $install_name; then break fi - while [ "CREATE_IN_PROGRESS" == "$(openstack stack show -c stack_status -f value onap-oom)" ]; do + while [ "CREATE_IN_PROGRESS" == "$(openstack stack show -c stack_status -f value $install_name)" ]; do sleep 20 done - STATUS=$(openstack stack show -c stack_status -f value onap-oom) + STATUS=$(openstack stack show -c stack_status -f value $install_name) echo $STATUS if [ "CREATE_COMPLETE" != "$STATUS" ]; then break @@ -48,8 +97,8 @@ for n in $(seq 1 5); do for i in $(seq 1 30); do sleep 30 - RANCHER_IP=$(openstack stack output show onap-oom rancher_vm_ip -c output_value -f value) - K8S_IP=$(openstack stack output show onap-oom k8s_1_vm_ip -c output_value -f value) + RANCHER_IP=$(openstack stack output show $install_name rancher_vm_ip -c output_value -f value) + K8S_IP=$(openstack stack output show $install_name k8s_1_vm_ip -c output_value -f value) timeout 1 ping -c 1 "$RANCHER_IP" && break done diff --git a/test/csit/plans/dmaap-datarouter/dr-suite/setup.sh b/test/csit/plans/dmaap-datarouter/dr-suite/setup.sh index 31e4d1fae..c1bb75967 100755 --- a/test/csit/plans/dmaap-datarouter/dr-suite/setup.sh +++ b/test/csit/plans/dmaap-datarouter/dr-suite/setup.sh @@ -7,6 +7,7 @@ mkdir -p $WORKSPACE/archives/dmaapdr cd $WORKSPACE/archives/dmaapdr git clone --depth 1 https://gerrit.onap.org/r/dmaap/datarouter -b master +cd datarouter git pull cd $WORKSPACE/archives/dmaapdr/datarouter/datarouter-prov/src/main/resources/docker-compose/ diff --git a/test/csit/tests/dmaap-datarouter/dr-suite/dr-suite.robot b/test/csit/tests/dmaap-datarouter/dr-suite/dr-suite.robot index d1de683ef..527a9e2bd 100755 --- a/test/csit/tests/dmaap-datarouter/dr-suite/dr-suite.robot +++ b/test/csit/tests/dmaap-datarouter/dr-suite/dr-suite.robot @@ -6,23 +6,35 @@ Library Collections Library String *** Variables *** -${TARGETURL_FEED} https://${DR_PROV_IP}:8443 -${CREATE_FEED_DATA} {"name": "CSIT_Test", "version": "m1.0", "description": "CSIT_Test", "business_description": "CSIT_Test", "suspend": false, "deleted": false, "changeowner": true, "authorization": {"classification": "unclassified", "endpoint_addrs": ["${DR_PROV_IP}"], "endpoint_ids": [{"password": "rs873m", "id": "rs873m"}]}} +${TARGET_URL_FEED} https://${DR_PROV_IP}:8443 +${TARGET_URL_SUBSCRIBE} https://${DR_PROV_IP}:8443/subscribe/1 +${CREATE_FEED_DATA} {"name": "CSIT_Test", "version": "m1.0", "description": "CSIT_Test", "business_description": "CSIT_Test", "suspend": false, "deleted": false, "changeowner": true, "authorization": {"classification": "unclassified", "endpoint_addrs": ["${DR_PROV_IP}"], "endpoint_ids": [{"password": "rs873m", "id": "rs873m"}]}} +${SUBSCRIBE_DATA} {"delivery":{ "url":"https://${DR_PROV_IP}:8080/", "user":"rs873m", "password":"rs873m", "use100":true}, "metadataOnly":false, "suspend":false, "groupid":29, "subscriber":"sg481n"} +${FEED_CONTENT_TYPE} application/vnd.att-dr.feed +${SUBSCRIBE_CONTENT_TYPE} application/vnd.att-dr.subscription *** Test Cases *** Run Feed Creation [Documentation] Feed Creation [Timeout] 1 minute - ${resp}= PostFeed ${TARGETURL_FEED} ${CREATE_FEED_DATA} - log ${TARGETURL_FEED} + ${resp}= PostCall ${TARGET_URL_FEED} ${CREATE_FEED_DATA} ${FEED_CONTENT_TYPE} rs873m + log ${TARGET_URL_FEED} log ${resp.text} Should Be Equal As Strings ${resp.status_code} 201 log 'JSON Response Code:'${resp} +Run Subscribe to Feed + [Documentation] Subscribe to Feed + [Timeout] 1 minute + ${resp}= PostCall ${TARGET_URL_SUBSCRIBE} ${SUBSCRIBE_DATA} ${SUBSCRIBE_CONTENT_TYPE} sg481n + log ${TARGET_URL_SUBSCRIBE} + log ${resp.text} + Should Be Equal As Strings ${resp.status_code} 201 + log 'JSON Response Code:'${resp} *** Keywords *** -PostFeed - [Arguments] ${url} ${data} - ${headers}= Create Dictionary X-ATT-DR-ON-BEHALF-OF=rs873m Content-Type=application/vnd.att-dr.feed - ${resp}= Evaluate requests.post('${url}',data='${data}', headers=${headers},verify=False) requests - [Return] ${resp} +PostCall + [Arguments] ${url} ${data} ${content_type} ${user} + ${headers}= Create Dictionary X-ATT-DR-ON-BEHALF-OF=${user} Content-Type=${content_type} + ${resp}= Evaluate requests.post('${url}',data='${data}', headers=${headers},verify=False) requests + [Return] ${resp} diff --git a/test/ete/scripts/teardown-onap.sh b/test/ete/scripts/teardown-onap.sh index 9080e20ac..61e643b64 100755 --- a/test/ete/scripts/teardown-onap.sh +++ b/test/ete/scripts/teardown-onap.sh @@ -1,49 +1,110 @@ #!/bin/bash -x +full_deletion=false + +usage() { echo "Usage: $0 [-n <string>] [-r]" 1>&2; exit 1; } + +while getopts ":rqn:" o; do + case "${o}" in + + r) + echo "The following command will delete all information relating to onap within your enviroment" + read -p "Are you certain this is what you want? (type y to confirm):" answer + + if [ $answer = "y" ] || [ $answer = "Y" ] || [ $answer = "yes" ] || [ $answer = "Yes"]; then + echo "This may delete the work of other colleages within the same enviroment" + read -p "Are you certain this is what you want? (type y to confirm):" answer2 + + if [ $answer2 = "y" ] || [ $answer2 = "Y" ] || [ $answer2 = "yes" ] || [ $answer2 = "Yes"]; then + full_deletion=true + else + echo "Ending program" + exit 1 + fi + else + echo "Ending program" + exit 1 + fi + ;; + q) + full_deletion=true + ;; + n) + install_name=${OPTARG} + ;; + + *) + usage + ;; + esac +done +shift $((OPTIND-1)) + if [ -z "$WORKSPACE" ]; then export WORKSPACE=`git rev-parse --show-toplevel` fi source $WORKSPACE/test/ete/scripts/install_openstack_cli.sh -# delete all instances -openstack server delete $(openstack server list -c ID -f value) -sleep 1 - -# miscellaneous cleanup -openstack floating ip delete $(openstack floating ip list -c ID -f value) -sleep 1 - -ROUTERS=$(openstack router list -c ID -f value) -echo $ROUTERS -for ROUTER in $ROUTERS; do - echo $ROUTER; - PORTS=$(openstack router show $ROUTER -c "interfaces_info" -f "value" | jq -r '.[].port_id') - for PORT in $PORTS; do - openstack router remove port $ROUTER $PORT +if [ "$full_deletion" = true ];then + echo "Commencing delete, press CRTL-C to stop" + sleep 10 + + # delete all instances + openstack server delete $(openstack server list -c ID -f value) + sleep 1 + + # miscellaneous cleanup + openstack floating ip delete $(openstack floating ip list -c ID -f value) + sleep 1 + + ROUTERS=$(openstack router list -c ID -f value) + echo $ROUTERS + for ROUTER in $ROUTERS; do + echo $ROUTER; + PORTS=$(openstack router show $ROUTER -c "interfaces_info" -f "value" | jq -r '.[].port_id') + for PORT in $PORTS; do + openstack router remove port $ROUTER $PORT + done + openstack router delete $ROUTER done - openstack router delete $ROUTER -done -openstack port delete $(openstack port list -f value -c ID) -openstack volume delete $(openstack volume list -f value -c ID) + openstack port delete $(openstack port list -f value -c ID) + openstack volume delete $(openstack volume list -f value -c ID) + + # delete all except "default" security group + SECURITY_GROUPS=$(openstack security group list -c ID -f value | grep -v default) + openstack security group delete $SECURITY_GROUPS + sleep 1 -# delete all except "default" security group -SECURITY_GROUPS=$(openstack security group list -c ID -f value | grep -v default) -openstack security group delete $SECURITY_GROUPS -sleep 1 + # Delete all existing stacks + STACKS=$(openstack stack list -c "Stack Name" -f value) -# Delete all existing stacks -STACKS=$(openstack stack list -c "Stack Name" -f value) + if [ ! -z "${STACKS}" ]; then + openstack stack delete -y $STACKS + for STACK in ${STACKS}; do + until [ "DELETE_IN_PROGRESS" != "$(openstack stack show -c stack_status -f value $STACK)" ]; do + sleep 2 + done + done + else + echo "No existing stacks to delete." + fi + +else + #Restrained teardown + echo "Restrained teardown" + + STACK=$install_name -if [ ! -z "${STACKS}" ]; then - openstack stack delete -y $STACKS - for STACK in ${STACKS}; do + if [ ! -z "${STACK}" ]; then + openstack stack delete $STACK + until [ "DELETE_IN_PROGRESS" != "$(openstack stack show -c stack_status -f value $STACK)" ]; do - sleep 2 + sleep 2 done - done -else - echo "No existing stacks to delete." -fi + else + echo "No existing stack with the name $install_name." + fi +fi
\ No newline at end of file diff --git a/test/mocks/pnfsimulator/pom.xml b/test/mocks/pnfsimulator/pom.xml index 442d3fcaa..03dc374ad 100644 --- a/test/mocks/pnfsimulator/pom.xml +++ b/test/mocks/pnfsimulator/pom.xml @@ -125,12 +125,6 @@ <scope>test</scope> </dependency> <dependency> - <groupId>org.junit.vintage</groupId> - <artifactId>junit-vintage-engine</artifactId> - <version>${junit.vintage.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>org.assertj</groupId> <artifactId>assertj-core</artifactId> <version>3.9.1</version> @@ -273,41 +267,69 @@ </goals> </execution> <execution> - <id>tag-and-push-image-latest</id> - <phase>deploy</phase> + <id>tag-image-latest</id> + <phase>package</phase> <goals> <goal>tag</goal> </goals> <configuration> <image>${docker.image.name}:latest</image> <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</newName> + <!-- WA in case push does not wort at seconf job - to remove <pushImage>true</pushImage> + --> </configuration> </execution> <execution> - <id>tag-and-push-image-with-version</id> - <phase>deploy</phase> + <id>push-image-latest</id> + <phase>none</phase> + <goals> + <goal>push</goal> + </goals> + <configuration> + <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:latest</imageName> + </configuration> + </execution> + <execution> + <id>tag-image-with-version</id> + <phase>package</phase> <goals> <goal>tag</goal> </goals> <configuration> <image>${docker.image.name}:latest</image> <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</newName> - <pushImage>true</pushImage> </configuration> </execution> <execution> - <id>tag-and-push-image-with-version-and-date</id> - <phase>deploy</phase> + <id>push-image-with-version</id> + <phase>none</phase> + <goals> + <goal>push</goal> + </goals> + <configuration> + <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}</imageName> + </configuration> + </execution> + <execution> + <id>tag-image-with-version-and-date</id> + <phase>package</phase> <goals> <goal>tag</goal> </goals> <configuration> <image>${docker.image.name}:latest</image> - <newName> - ${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp} - </newName> - <pushImage>true</pushImage> + <newName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}</newName> + </configuration> + </execution> + <execution> + <id>push-image-with-version-and-date</id> + <phase>none</phase> + <goals> + <goal>push</goal> + </goals> + <configuration> + <imageName>${onap.nexus.dockerregistry.daily}/${docker.image.name}:${project.version}-${maven.build.timestamp}</imageName> </configuration> </execution> </executions> diff --git a/test/mocks/pnfsimulator/src/main/resources/log4j2.xml b/test/mocks/pnfsimulator/src/main/resources/log4j2.xml deleted file mode 100644 index d3941d32d..000000000 --- a/test/mocks/pnfsimulator/src/main/resources/log4j2.xml +++ /dev/null @@ -1,24 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Configuration status="WARN"> - <Properties> - <Property name="log4j.logLevel" value="info"/> - </Properties> - <Appenders> - <Console name="Console" target="SYSTEM_OUT"> - <PatternLayout pattern="%d{ISO8601} +%r [%t] %-5p %c %x - %m%n"/> - </Console> - <Console name="ColorConsole" target="SYSTEM_OUT"> - <PatternLayout - pattern="%style{%d{ISO8601} +%r}{yellow} %highlight{%-5level}{STYLE=Logback} %style{[%t]}{yellow} %style{%c{1.}}{BRIGHT} %message%n"/> - </Console> - <File name="File" fileName="/var/log/pnfsimulator.log"> - <PatternLayout pattern="%d{ISO8601} +%r [%t] %-5p %c %x - %m%n"/> - </File> - </Appenders> - <Loggers> - <Root level="${sys:log4j.logLevel}"> - <AppenderRef ref="File"/> - <AppenderRef ref="ColorConsole"/> - </Root> - </Loggers> -</Configuration> |