From 9cbcdacf01abd92ca0952410760d3d8545b23ad8 Mon Sep 17 00:00:00 2001 From: BT2983 Date: Thu, 16 Aug 2018 21:48:07 -0600 Subject: Naming micro-service code. Docker updates and tests. Change-Id: Iba669453c4035290441c757f5b1c673ab41213d6 Issue-ID: CCSDK-342 Signed-off-by: BT2983 --- ms/neng/src/test/sanity/README.txt | 6 ++++ ms/neng/src/test/sanity/add-policy.sh | 46 +++++++++++++++++++++++++++++ ms/neng/src/test/sanity/env.sh | 26 +++++++++++++++++ ms/neng/src/test/sanity/gen-name.sh | 52 +++++++++++++++++++++++++++++++++ ms/neng/src/test/sanity/get-policy.sh | 32 ++++++++++++++++++++ ms/neng/src/test/sanity/hello.sh | 38 ++++++++++++++++++++++++ ms/neng/src/test/sanity/policy-1.json | 32 ++++++++++++++++++++ ms/neng/src/test/sanity/release-name.sh | 49 +++++++++++++++++++++++++++++++ ms/neng/src/test/sanity/suite.sh | 31 ++++++++++++++++++++ 9 files changed, 312 insertions(+) create mode 100644 ms/neng/src/test/sanity/README.txt create mode 100644 ms/neng/src/test/sanity/add-policy.sh create mode 100644 ms/neng/src/test/sanity/env.sh create mode 100644 ms/neng/src/test/sanity/gen-name.sh create mode 100644 ms/neng/src/test/sanity/get-policy.sh create mode 100644 ms/neng/src/test/sanity/hello.sh create mode 100644 ms/neng/src/test/sanity/policy-1.json create mode 100644 ms/neng/src/test/sanity/release-name.sh create mode 100644 ms/neng/src/test/sanity/suite.sh (limited to 'ms/neng/src/test/sanity') diff --git a/ms/neng/src/test/sanity/README.txt b/ms/neng/src/test/sanity/README.txt new file mode 100644 index 00000000..b98414f8 --- /dev/null +++ b/ms/neng/src/test/sanity/README.txt @@ -0,0 +1,6 @@ +To run the sanity test, do the following: + + With no DB: + bring up the app with the 'dbless' profile. + Run from shell: + ./suite.sh diff --git a/ms/neng/src/test/sanity/add-policy.sh b/ms/neng/src/test/sanity/add-policy.sh new file mode 100644 index 00000000..108d0d48 --- /dev/null +++ b/ms/neng/src/test/sanity/add-policy.sh @@ -0,0 +1,46 @@ +#!/bin/bash +#============LICENSE_START======================================================= +# ONAP : CCSDK.apps +# ================================================================================ +# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END========================================================= + +#================================================================================== +# This script does a sanity test on the add-policy API of the micro-service. +#================================================================================== + +. ./env.sh +URL=web/service/v1/addPolicy +TEMP_FILE=/tmp/add-policy.$$.$RANDOM +EXTERNAL_KEY=${1:-123456789} + +printf '{ ' > $TEMP_FILE +printf '"policyName": "sanity-policy-' >> $TEMP_FILE +printf $EXTERNAL_KEY >> $TEMP_FILE +printf '", "policyValue" : "' >> $TEMP_FILE +cat ./policy-1.json | sed 's/\"/\\\"/g' | tr '\n' ' ' | tr '\r' ' ' >> $TEMP_FILE +echo '"}' >> $TEMP_FILE + +echo "===================================================" +echo "====== Adding Policy: ===========================" +cat $TEMP_FILE +echo "" +echo "===================================================" + +echo "===================================================" +curl -vi -H "Content-Type: application/json" --data @$TEMP_FILE $PROTOCOL://$HOST:$PORT/$URL +echo "===================================================" + +rm -f $TEMP_FILE diff --git a/ms/neng/src/test/sanity/env.sh b/ms/neng/src/test/sanity/env.sh new file mode 100644 index 00000000..8685bcf8 --- /dev/null +++ b/ms/neng/src/test/sanity/env.sh @@ -0,0 +1,26 @@ +#!/bin/bash +#============LICENSE_START======================================================= +# ONAP : CCSDK.apps +# ================================================================================ +# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END========================================================= + +#================================================================================== +# Sets up environment for testing. +#================================================================================== + +PORT=8080 +HOST=localhost +PROTOCOL=http diff --git a/ms/neng/src/test/sanity/gen-name.sh b/ms/neng/src/test/sanity/gen-name.sh new file mode 100644 index 00000000..fb106eda --- /dev/null +++ b/ms/neng/src/test/sanity/gen-name.sh @@ -0,0 +1,52 @@ +#!/bin/bash +#============LICENSE_START======================================================= +# ONAP : CCSDK.apps +# ================================================================================ +# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END========================================================= + +#================================================================================== +# This script does a sanity test on the generate-name API of this micro-service. +#================================================================================== + +. ./env.sh +URL=web/service/v1/genNetworkElementName +TEMP_FILE=/tmp/gen-name.$$.$RANDOM +EXTERNAL_KEY=${2:-123456789} + +USE_DB=${1:-'Y'} +USE_DB_BOOL=$([ "$USE_DB" == "Y" ] && echo "true" || echo "false") + +printf '{ "UseDb": "' > $TEMP_FILE +printf $USE_DB_BOOL >> $TEMP_FILE +printf '", "elements": [ { "external-key": "sanity-' >> $TEMP_FILE +printf $EXTERNAL_KEY >> $TEMP_FILE +printf '", "policy-instance-name": "sanity-policy-' >> $TEMP_FILE +printf $EXTERNAL_KEY >> $TEMP_FILE +printf '", "NF_NAMING_CODE": "helloname", ' >> $TEMP_FILE +printf '"resource-name": "sanity-1", "naming-type": "sanity-1" } ] }' >> $TEMP_FILE + +echo "===================================================" +echo "======== Generating name with request: ============" +cat $TEMP_FILE +echo "" +echo "===================================================" + +echo "===================================================" +curl -vi -H "Content-Type: application/json" --data @$TEMP_FILE $PROTOCOL://$HOST:$PORT/$URL +echo "===================================================" + +rm -f $TEMP_FILE + diff --git a/ms/neng/src/test/sanity/get-policy.sh b/ms/neng/src/test/sanity/get-policy.sh new file mode 100644 index 00000000..5c7136b6 --- /dev/null +++ b/ms/neng/src/test/sanity/get-policy.sh @@ -0,0 +1,32 @@ +#!/bin/bash +#============LICENSE_START======================================================= +# ONAP : CCSDK.apps +# ================================================================================ +# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END========================================================= + +#================================================================================== +# This script does a sanity test on the get-policy API of this micro-service. +# +#================================================================================== + +. ./env.sh +URL=web/service/v1/getpolicyresponse +EXTERNAL_KEY=${1:-123456789} + +echo "===================================================" +echo "====== Finding Policy: ===========================" +curl -vi $PROTOCOL://$HOST:$PORT/$URL?policyName=sanity-policy-$EXTERNAL_KEY +echo "===================================================" diff --git a/ms/neng/src/test/sanity/hello.sh b/ms/neng/src/test/sanity/hello.sh new file mode 100644 index 00000000..baa5b703 --- /dev/null +++ b/ms/neng/src/test/sanity/hello.sh @@ -0,0 +1,38 @@ +#!/bin/bash +#============LICENSE_START======================================================= +# ONAP : CCSDK.apps +# ================================================================================ +# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END========================================================= + +#================================================================================== +# This script does a sanity test on the micro-service, by sending the 'hello' message. +# +#================================================================================== +. ./env.sh +URL=web/service/hello + +echo "===================================================" +echo "===================================================" +echo 'This should show {"message":"Hello world!"}' +echo "===================================================" +curl -vi $PROTOCOL://$HOST:$PORT/$URL + +echo "===================================================" +echo "===================================================" +echo 'This should show {"message":"Hello you!"}' +echo "===================================================" +curl -vi $PROTOCOL://$HOST:$PORT/$URL?name=you +echo "===================================================" diff --git a/ms/neng/src/test/sanity/policy-1.json b/ms/neng/src/test/sanity/policy-1.json new file mode 100644 index 00000000..e85bc790 --- /dev/null +++ b/ms/neng/src/test/sanity/policy-1.json @@ -0,0 +1,32 @@ +[ + { + "config": { + "content": { + "naming-models":[ + { + "naming-properties":[ + { "property-name" : "COMPLEX", "property-operation" : "substr(5)" }, + { "property-name" : "SEQUENCE", "increment-sequence":{ + "max" : "zzz" , "scope" : "ENTIRETY" , "start-value" : "001" , "length" : "3", + "increment" : "1" , "sequence-type" : "alpha-numeric"} + }, + {"property-name" : "NF_NAMING_CODE"} + ], + "naming-type" : "VNF", + "nfRole" : "vPE", + "naming-recipe" : "COMPLEX|SEQUENCE|NF_NAMING_CODE" + }, + { + "naming-properties":[ + {"property-name" : "NF_NAMING_CODE"} + ], + "naming-type" : "sanity-1", + "nfRole" : "sanity-1", + "naming-recipe" : "NF_NAMING_CODE" + } + ] + } + }, + "policyName": "sanity-policy-1" + } +] diff --git a/ms/neng/src/test/sanity/release-name.sh b/ms/neng/src/test/sanity/release-name.sh new file mode 100644 index 00000000..2a6d16df --- /dev/null +++ b/ms/neng/src/test/sanity/release-name.sh @@ -0,0 +1,49 @@ +#!/bin/bash +#============LICENSE_START======================================================= +# ONAP : CCSDK.apps +# ================================================================================ +# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END========================================================= + +#================================================================================== +# This script does a sanity test on the release-name API of this micro-service. +#================================================================================== + +. ./env.sh +URL=web/service/v1/genNetworkElementName +TEMP_FILE=/tmp/gen-name.$$.$RANDOM +EXTERNAL_KEY=${2:-123456789} + +USE_DB=${1:-'Y'} +USE_DB_BOOL=$([ "$USE_DB" == "Y" ] && echo "true" || echo "false") + +printf '{ "UseDb": "' > $TEMP_FILE +printf $USE_DB_BOOL >> $TEMP_FILE +printf '", "elements": [ { "external-key": "sanity-' >> $TEMP_FILE +printf $EXTERNAL_KEY >> $TEMP_FILE +printf '", "resource-name": "sanity-1" } ] }' >> $TEMP_FILE + +echo "===================================================" +echo "======= Releasing name with request: ==============" +cat $TEMP_FILE +echo "" +echo "===================================================" + +echo "===================================================" +curl -vi -X "DELETE" -H "Content-Type: application/json" --data @$TEMP_FILE $PROTOCOL://$HOST:$PORT/$URL +echo "===================================================" + +rm -f $TEMP_FILE + diff --git a/ms/neng/src/test/sanity/suite.sh b/ms/neng/src/test/sanity/suite.sh new file mode 100644 index 00000000..79d5b414 --- /dev/null +++ b/ms/neng/src/test/sanity/suite.sh @@ -0,0 +1,31 @@ +#!/bin/bash +#============LICENSE_START======================================================= +# ONAP : CCSDK.apps +# ================================================================================ +# Copyright (C) 2018 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +#============LICENSE_END========================================================= + +#================================================================================== +# This script does a sanity test on the APIs of the micro-service. +#================================================================================== + +EXTERNAL_KEY=$(date +%s)$RANDOM + +./hello.sh +./add-policy.sh $EXTERNAL_KEY +./get-policy.sh $EXTERNAL_KEY +./gen-name.sh Y $EXTERNAL_KEY +./release-name.sh Y $EXTERNAL_KEY + -- cgit 1.2.3-korg