diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/optf-has/has/has-properties/conductor.conf.onap | 3 | ||||
| -rwxr-xr-x | scripts/optf-has/has/has_script.sh | 4 | ||||
| -rwxr-xr-x | scripts/optf-has/has/setup-sms.sh | 71 | ||||
| -rw-r--r-- | scripts/optf-osdf/osdf/osdf-properties/osdf.json | 25 | ||||
| -rwxr-xr-x | scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml | 5 | ||||
| -rwxr-xr-x | scripts/optf-osdf/osdf/osdf_script.sh | 6 | ||||
| -rwxr-xr-x | scripts/optf-osdf/osdf/setup-sms.sh | 71 | ||||
| -rwxr-xr-x | scripts/policy/config/drools-apps/custom/noop.pre.sh | 6 | ||||
| -rw-r--r-- | scripts/policy/config/drools-apps/env/base.conf | 9 | ||||
| -rw-r--r-- | scripts/policy/config/drools/env/base.conf | 18 | ||||
| -rw-r--r-- | scripts/policy/config/pap/onap.policies.monitoring.cdap.tca.hi.lo.app.json | 210 | ||||
| -rw-r--r-- | scripts/policy/config/pap/vCPE.policy.monitoring.input.tosca.json | 51 | ||||
| -rw-r--r-- | scripts/policy/docker-compose-api.yml | 13 | ||||
| -rw-r--r-- | scripts/policy/docker-compose-pap.yml | 17 | ||||
| -rw-r--r-- | scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml | 17 | ||||
| -rw-r--r-- | scripts/sdc/setup_sdc_for_sanity.sh | 2 |
16 files changed, 213 insertions, 315 deletions
diff --git a/scripts/optf-has/has/has-properties/conductor.conf.onap b/scripts/optf-has/has/has-properties/conductor.conf.onap index 55f557c3..8df0d076 100644 --- a/scripts/optf-has/has/has-properties/conductor.conf.onap +++ b/scripts/optf-has/has/has-properties/conductor.conf.onap @@ -131,6 +131,9 @@ log_dir = /var/log #fatal_deprecations = false +[auth] +appkey = h@ss3crtky400fdntc#001 + [aaf_api] # diff --git a/scripts/optf-has/has/has_script.sh b/scripts/optf-has/has/has_script.sh index 9aa7606f..862691f4 100755 --- a/scripts/optf-has/has/has_script.sh +++ b/scripts/optf-has/has/has_script.sh @@ -72,9 +72,9 @@ sed -i -e "s%localhost:8100/%${AAFSIM_IP}:8100/%g" /tmp/conductor/properties/co #SMS sed -i -e "s%aaf-sms.onap:10443%${SMS_IP}:10443%g" /tmp/conductor/properties/conductor.conf #Preload secrets -docker exec -i sms /bin/sh -c "mkdir -p /preload/config" +docker exec --user root -i sms /bin/sh -c "mkdir -p /preload/config" docker cp /tmp/sms/properties/has.json sms:/preload/config/has.json -docker exec -i sms /bin/sh -c "/sms/bin/preload -cacert /sms/certs/aaf_root_ca.cer -jsondir /preload/config -serviceport 10443 -serviceurl http://localhost" +docker exec --user root -i sms /bin/sh -c "/sms/bin/preload -cacert /sms/certs/aaf_root_ca.cer -jsondir /preload/config -serviceport 10443 -serviceurl http://localhost" docker logs vault #onboard conductor into music diff --git a/scripts/optf-has/has/setup-sms.sh b/scripts/optf-has/has/setup-sms.sh new file mode 100755 index 00000000..e6a4b227 --- /dev/null +++ b/scripts/optf-has/has/setup-sms.sh @@ -0,0 +1,71 @@ +#!/bin/bash +# +# Copyright 2018 Intel Corporation +# +# 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. +# + +# Not sure why this is needed. +source ${SCRIPTS}/common_functions.sh + +CONFIG_FILE=$(pwd)/config/smsconfig.json + +mkdir -p $(pwd)/config + +docker login -u docker -p docker nexus3.onap.org:10001 +docker pull nexus3.onap.org:10001/onap/aaf/sms +docker pull docker.io/vault:1.3.3 + +# +# Running vault in dev server mode here for CSIT +# In HELM it runs in production mode +# +docker run -e "VAULT_DEV_ROOT_TOKEN_ID=aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee" \ + -e SKIP_SETCAP=true \ + --name vault -d -p 8200:8200 vault:1.3.3 + +SMSDB_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' vault) +cat << EOF > $CONFIG_FILE +{ + "cafile": "auth/selfsignedca.pem", + "servercert": "auth/server.cert", + "serverkey": "auth/server.key", + + "smsdbaddress": "http://$SMSDB_IP:8200", + "vaulttoken": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee", + "disable_tls": true +} +EOF + +cat $CONFIG_FILE + +docker run --workdir /sms -v $CONFIG_FILE:/sms/smsconfig.json \ + --name sms -d -p 10443:10443 --user root nexus3.onap.org:10001/onap/aaf/sms + +SMS_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sms) + +echo "###### WAITING FOR ALL CONTAINERS TO COME UP" +sleep 20 +for i in {1..20}; do + curl -sS -m 1 http://${SMSDB_IP}:8200/v1/sys/seal-status && break + echo sleep $i + sleep $i +done + +# +# add here all ROBOT_VARIABLES settings +# +echo "# sms robot variables settings"; +ROBOT_VARIABLES="-v SMS_HOSTNAME:http://${SMS_IP} -v SMS_PORT:10443" + +echo ${ROBOT_VARIABLES} diff --git a/scripts/optf-osdf/osdf/osdf-properties/osdf.json b/scripts/optf-osdf/osdf/osdf-properties/osdf.json index 0950957b..e52cb0cd 100644 --- a/scripts/optf-osdf/osdf/osdf-properties/osdf.json +++ b/scripts/optf-osdf/osdf/osdf-properties/osdf.json @@ -13,21 +13,21 @@ "name": "conductor", "values": { "UserName": "admin1", - "Password": "plan.15" + "Password": "22234d3472ef5da8ecba5a096110a024f1db5cf195c665f910d558c9e83db19d" } }, { "name": "policyPlatform", "values": { "UserName": "testpdp", - "Password": "alpha123" + "Password": "7a03bdee7a0381daf4ee426b9d2b695e3f4233ffd19a852a3fb0ff0156fbdde7" } }, { "name": "policyClient", "values": { "UserName": "python", - "Password": "test" + "Password": "3a3c8546c91f99f4becc069ba0fbb13ef46f4f3028f5bba09f3f4a9030ddc0a0" } }, { @@ -48,35 +48,35 @@ "name": "osdfPlacement", "values": { "UserName": "test", - "Password": "testpwd" + "Password": "c66b1570ae257375e500f9fe0e62b2a325466137ac5f29581e2e05cce1170212" } }, { "name": "osdfPlacementSO", "values": { "UserName": "so_test", - "Password": "so_testpwd" + "Password": "3d62d49b3e4ada38fd4146d2d82f4ba2f09345a46f15970cd439924c991b8202" } }, { "name": "osdfPlacementVFC", "values": { "UserName": "vfc_test", - "Password": "vfc_testpwd" + "Password": "1fb1cd581f96060d29ecad06be97151656bf29bce66bad587cd2fbaf5ea1e66d" } }, { "name": "osdfCMScheduler", "values": { "UserName": "test1", - "Password": "testpwd1" + "Password": "c5279fb02d7bac5269b1a644ac8e36f41f6ba7a2eae03dc469cb80d71811322b" } }, { "name": "configDb", "values": { "UserName": "osdf", - "Password": "passwd" + "Password": "40697f254409c2b97763892ecdeb50c847d605f5beb6f988f1c142a7e0344d0c" } }, { @@ -90,7 +90,14 @@ "name": "osdfPCIOpt", "values": { "UserName": "pci_test", - "Password": "pci_testpwd" + "Password": "fbf4dcb7f7cda8fdfb742838b0c90ae5bea249801f3f725fdc98941a6e4c347c" + } + }, + { + "name": "osdfOptEngine", + "values": { + "UserName": "opt_test", + "Password": "02946408ce6353d45540cd01d912686f19f48c3d8a955d5effdc14c6a43477e5" } } ] diff --git a/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml b/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml index f8f75005..6578567f 100755 --- a/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml +++ b/scripts/optf-osdf/osdf/osdf-properties/osdf_config.yaml @@ -18,7 +18,7 @@ conductorMaxRetries: 5 # if we don't get something in 30 minutes, give up conductorMinorVersion: 0 # Policy Platform -- requires ClientAuth, Authorization, and Environment -policyPlatformUrl: http://127.0.0.1:5000/simulated/policy/pdp-has-vcpe-good/getConfig # Policy Dev platform URL +policyPlatformUrl: http://127.0.0.1:5000/simulated/policy/pdpx/decision/v1 # Policy Dev platform URL policyPlatformEnv: TEST # Environment for policy platform # Config for DMaaP @@ -47,3 +47,6 @@ aaf_ca_certs: ssl_certs/aaf_root_ca.cer configDbUrl: http://127.0.0.1:5000/simulated/configdb configDbGetCellListUrl: 'getCellList' configDbGetNbrListUrl: 'getNbrList' + +#key +appkey: os35@rrtky400fdntc#001t5
\ No newline at end of file diff --git a/scripts/optf-osdf/osdf/osdf_script.sh b/scripts/optf-osdf/osdf/osdf_script.sh index 6d4efa19..3554b55e 100755 --- a/scripts/optf-osdf/osdf/osdf_script.sh +++ b/scripts/optf-osdf/osdf/osdf_script.sh @@ -34,7 +34,7 @@ cd ${DIR} # run docker containers OSDF_CONF=/tmp/osdf/properties/osdf_config.yaml IMAGE_NAME=nexus3.onap.org:10001/onap/optf-osdf -IMAGE_VER=1.2.4-SNAPSHOT-latest +IMAGE_VER=2.0.1-SNAPSHOT-latest mkdir -p /tmp/osdf/properties mkdir -p /tmp/sms/properties @@ -52,9 +52,9 @@ sed -i -e "s%127.0.0.1:5000%${OSDF_SIM_IP}:5000%g" $OSDF_CONF sed -i -e "s%aaf-sms.onap:10443%${SMS_IP}:10443%g" $OSDF_CONF #Preload secrets -docker exec -i sms /bin/sh -c "mkdir -p /preload/config" +docker exec --user root -i sms /bin/sh -c "mkdir -p /preload/config" docker cp /tmp/sms/properties/osdf.json sms:/preload/config/osdf.json -docker exec -i sms /bin/sh -c "/sms/bin/preload -cacert /sms/certs/aaf_root_ca.cer -jsondir /preload/config -serviceport 10443 -serviceurl http://localhost" +docker exec --user root -i sms /bin/sh -c "/sms/bin/preload -cacert /sms/certs/aaf_root_ca.cer -jsondir /preload/config -serviceport 10443 -serviceurl http://localhost" docker logs vault docker run -d --name optf-osdf -v ${OSDF_CONF}:/opt/osdf/config/osdf_config.yaml -p "8698:8699" ${IMAGE_NAME}:${IMAGE_VER} diff --git a/scripts/optf-osdf/osdf/setup-sms.sh b/scripts/optf-osdf/osdf/setup-sms.sh new file mode 100755 index 00000000..e6a4b227 --- /dev/null +++ b/scripts/optf-osdf/osdf/setup-sms.sh @@ -0,0 +1,71 @@ +#!/bin/bash +# +# Copyright 2018 Intel Corporation +# +# 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. +# + +# Not sure why this is needed. +source ${SCRIPTS}/common_functions.sh + +CONFIG_FILE=$(pwd)/config/smsconfig.json + +mkdir -p $(pwd)/config + +docker login -u docker -p docker nexus3.onap.org:10001 +docker pull nexus3.onap.org:10001/onap/aaf/sms +docker pull docker.io/vault:1.3.3 + +# +# Running vault in dev server mode here for CSIT +# In HELM it runs in production mode +# +docker run -e "VAULT_DEV_ROOT_TOKEN_ID=aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee" \ + -e SKIP_SETCAP=true \ + --name vault -d -p 8200:8200 vault:1.3.3 + +SMSDB_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' vault) +cat << EOF > $CONFIG_FILE +{ + "cafile": "auth/selfsignedca.pem", + "servercert": "auth/server.cert", + "serverkey": "auth/server.key", + + "smsdbaddress": "http://$SMSDB_IP:8200", + "vaulttoken": "aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee", + "disable_tls": true +} +EOF + +cat $CONFIG_FILE + +docker run --workdir /sms -v $CONFIG_FILE:/sms/smsconfig.json \ + --name sms -d -p 10443:10443 --user root nexus3.onap.org:10001/onap/aaf/sms + +SMS_IP=$(docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' sms) + +echo "###### WAITING FOR ALL CONTAINERS TO COME UP" +sleep 20 +for i in {1..20}; do + curl -sS -m 1 http://${SMSDB_IP}:8200/v1/sys/seal-status && break + echo sleep $i + sleep $i +done + +# +# add here all ROBOT_VARIABLES settings +# +echo "# sms robot variables settings"; +ROBOT_VARIABLES="-v SMS_HOSTNAME:http://${SMS_IP} -v SMS_PORT:10443" + +echo ${ROBOT_VARIABLES} diff --git a/scripts/policy/config/drools-apps/custom/noop.pre.sh b/scripts/policy/config/drools-apps/custom/noop.pre.sh index 909d8f48..4b0c2199 100755 --- a/scripts/policy/config/drools-apps/custom/noop.pre.sh +++ b/scripts/policy/config/drools-apps/custom/noop.pre.sh @@ -18,10 +18,8 @@ sed -i "s/^dmaap/noop/g" \ ${POLICY_HOME}/config/engine.properties \ ${POLICY_HOME}/config/feature-lifecycle.properties \ - ${POLICY_HOME}/config/frankfurt-controller.properties \ - ${POLICY_HOME}/config/usecases-controller.properties + ${POLICY_HOME}/config/frankfurt-controller.properties chmod 644 ${POLICY_HOME}/config/engine.properties \ ${POLICY_HOME}/config/feature-lifecycle.properties \ - ${POLICY_HOME}/config/frankfurt-controller.properties \ - ${POLICY_HOME}/config/usecases-controller.properties + ${POLICY_HOME}/config/frankfurt-controller.properties diff --git a/scripts/policy/config/drools-apps/env/base.conf b/scripts/policy/config/drools-apps/env/base.conf index c11e7e98..b5e7cbd1 100644 --- a/scripts/policy/config/drools-apps/env/base.conf +++ b/scripts/policy/config/drools-apps/env/base.conf @@ -80,11 +80,13 @@ PAP_PASSWORD=alpha123 PDP_HOST=pdp PDP_PORT=6969 +PDP_CONTEXT_URI=policy/pdpx/v1/ PDP_USERNAME=testpdp PDP_PASSWORD=alpha123 PDP_CLIENT_USERNAME=python PDP_CLIENT_PASSWORD=test PDP_ENVIRONMENT=TEST +GUARD_DISABLED=false # DCAE DMaaP @@ -100,7 +102,7 @@ DMAAP_SERVERS=mr.api.simpledemo.onap.org AAI_HOST=aai.api.simpledemo.onap.org AAI_PORT=8443 -AAI_URL=https://aai.api.simpledemo.onap.org:8443 +AAI_CONTEXT_URI= AAI_USERNAME=policy@policy.onap.org AAI_PASSWORD=demo123456! @@ -108,6 +110,7 @@ AAI_PASSWORD=demo123456! SO_HOST=vm1.mso.simpledemo.onap.org SO_PORT=8080 +SO_CONTEXT_URI=onap/so/infra/ SO_URL=http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra SO_USERNAME=InfraPortalClient SO_PASSWORD=password1$ @@ -116,7 +119,7 @@ SO_PASSWORD=password1$ VFC_HOST= VFC_PORT= -VFC_URL= +VFC_CONTEXT_URI=api/nslcm/v1/ VFC_USERNAME= VFC_PASSWORD= @@ -124,6 +127,6 @@ VFC_PASSWORD= SDNC_HOST= SDNC_PORT= -SDNC_URL= +SDNC_CONTEXT_URI=restconf/operations/ SDNC_USERNAME= SDNC_PASSWORD= diff --git a/scripts/policy/config/drools/env/base.conf b/scripts/policy/config/drools/env/base.conf index 8fef8a28..891de49f 100644 --- a/scripts/policy/config/drools/env/base.conf +++ b/scripts/policy/config/drools/env/base.conf @@ -79,11 +79,14 @@ PAP_PASSWORD= # PDP-X PDP_HOST= +PDP_PORT= +PDP_CONTEXT_URI=policy/pdpx/v1/ PDP_USERNAME= PDP_PASSWORD= PDP_CLIENT_USERNAME= PDP_CLIENT_PASSWORD= PDP_ENVIRONMENT= +GUARD_DISABLED=false # DCAE DMaaP @@ -97,24 +100,33 @@ DMAAP_SERVERS=mr.api.simpledemo.onap.org # AAI -AAI_URL=https://aai.api.simpledemo.onap.org:8443 +AAI_HOST=aai.api.simpledemo.onap.org +AAI_PORT=8443 +AAI_CONTEXT_URI= AAI_USERNAME=policy@policy.onap.org AAI_PASSWORD=demo123456! # MSO +SO_HOST=vm1.mso.simpledemo.onap.org +SO_PORT=8080 +SO_CONTEXT_URI=onap/so/infra/ SO_URL=http://vm1.mso.simpledemo.onap.org:8080/onap/so/infra SO_USERNAME=InfraPortalClient SO_PASSWORD=password1$ # VFC -VFC_URL= +VFC_HOST= +VFC_PORT= +VFC_CONTEXT_URI=api/nslcm/v1/ VFC_USERNAME= VFC_PASSWORD= # SDNC -SDNC_URL= +SDNC_HOST= +SDNC_PORT= +SDNC_CONTEXT_URI=restconf/operations/ SDNC_USERNAME= SDNC_PASSWORD= diff --git a/scripts/policy/config/pap/onap.policies.monitoring.cdap.tca.hi.lo.app.json b/scripts/policy/config/pap/onap.policies.monitoring.cdap.tca.hi.lo.app.json deleted file mode 100644 index 06574735..00000000 --- a/scripts/policy/config/pap/onap.policies.monitoring.cdap.tca.hi.lo.app.json +++ /dev/null @@ -1,210 +0,0 @@ -{ - "tosca_definitions_version": "tosca_simple_yaml_1_1_0", - "policy_types": { - "onap.policies.Monitoring": { - "derived_from": "tosca.policies.Root", - "description": "a base policy type for all policies that governs monitoring provisioning" - }, - "onap.policies.monitoring.cdap.tca.hi.lo.app": { - "derived_from": "onap.policies.Monitoring", - "version": "1.0.0", - "properties": { - "tca_policy": { - "type": "onap.datatypes.monitoring.tca_policy", - "description": "TCA Policy JSON" - } - } - } - }, - "data_types": { - "onap.datatypes.monitoring.metricsPerEventName": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "controlLoopSchemaType": { - "type": "string", - "required": true, - "description": "Specifies Control Loop Schema Type for the event Name e.g. VNF, VM", - "constraints": [ - { - "valid_values": [ - "VM", - "VNF" - ] - } - ] - }, - "eventName": { - "type": "string", - "required": true, - "description": "Event name to which thresholds need to be applied" - }, - "policyName": { - "type": "string", - "required": true, - "description": "TCA Policy Scope Name" - }, - "policyScope": { - "type": "string", - "required": true, - "description": "TCA Policy Scope" - }, - "policyVersion": { - "type": "string", - "required": true, - "description": "TCA Policy Scope Version" - }, - "thresholds": { - "type": "list", - "required": true, - "description": "Thresholds associated with eventName", - "entry_schema": { - "type": "onap.datatypes.monitoring.thresholds" - } - } - } - }, - "onap.datatypes.monitoring.tca_policy": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "domain": { - "type": "string", - "required": true, - "description": "Domain name to which TCA needs to be applied", - "default": "measurementsForVfScaling", - "constraints": [ - { - "equal": "measurementsForVfScaling" - } - ] - }, - "metricsPerEventName": { - "type": "list", - "required": true, - "description": "Contains eventName and threshold details that need to be applied to given eventName", - "entry_schema": { - "type": "onap.datatypes.monitoring.metricsPerEventName" - } - } - } - }, - "onap.datatypes.monitoring.thresholds": { - "derived_from": "tosca.datatypes.Root", - "properties": { - "closedLoopControlName": { - "type": "string", - "required": true, - "description": "Closed Loop Control Name associated with the threshold" - }, - "closedLoopEventStatus": { - "type": "string", - "required": true, - "description": "Closed Loop Event Status of the threshold", - "constraints": [ - { - "valid_values": [ - "ONSET", - "ABATED" - ] - } - ] - }, - "direction": { - "type": "string", - "required": true, - "description": "Direction of the threshold", - "constraints": [ - { - "valid_values": [ - "LESS", - "LESS_OR_EQUAL", - "GREATER", - "GREATER_OR_EQUAL", - "EQUAL" - ] - } - ] - }, - "fieldPath": { - "type": "string", - "required": true, - "description": "Json field Path as per CEF message which needs to be analyzed for TCA", - "constraints": [ - { - "valid_values": [ - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedTotalPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedOctetsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedUnicastPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedMulticastPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedBroadcastPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedDiscardedPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].receivedErrorPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsDelta", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedTotalPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedOctetsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedUnicastPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedMulticastPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedBroadcastPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedDiscardedPacketsAccumulated", - "$.event.measurementsForVfScalingFields.vNicPerformanceArray[*].transmittedErrorPacketsAccumulated", - "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuIdle", - "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageInterrupt", - "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageNice", - "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSoftIrq", - "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSteal", - "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuUsageSystem", - "$.event.measurementsForVfScalingFields.cpuUsageArray[*].cpuWait", - "$.event.measurementsForVfScalingFields.cpuUsageArray[*].percentUsage", - "$.event.measurementsForVfScalingFields.meanRequestLatency", - "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryBuffered", - "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryCached", - "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryConfigured", - "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryFree", - "$.event.measurementsForVfScalingFields.memoryUsageArray[*].memoryUsed", - "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value" - ] - } - ] - }, - "severity": { - "type": "string", - "required": true, - "description": "Threshold Event Severity", - "constraints": [ - { - "valid_values": [ - "CRITICAL", - "MAJOR", - "MINOR", - "WARNING", - "NORMAL" - ] - } - ] - }, - "thresholdValue": { - "type": "integer", - "required": true, - "description": "Threshold value for the field Path inside CEF message" - }, - "version": { - "type": "string", - "required": true, - "description": "Version number associated with the threshold" - } - } - } - } -} diff --git a/scripts/policy/config/pap/vCPE.policy.monitoring.input.tosca.json b/scripts/policy/config/pap/vCPE.policy.monitoring.input.tosca.json deleted file mode 100644 index 3003d9a8..00000000 --- a/scripts/policy/config/pap/vCPE.policy.monitoring.input.tosca.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "tosca_definitions_version": "tosca_simple_yaml_1_1_0", - "topology_template": { - "policies": [ - { - "onap.restart.tca": { - "type": "onap.policies.monitoring.cdap.tca.hi.lo.app", - "version": "1.0.0", - "type_version": "1.0.0", - "metadata": { - "policy-id": "onap.restart.tca" - }, - "properties": { - "tca_policy": { - "domain": "measurementsForVfScaling", - "metricsPerEventName": [ - { - "eventName": "Measurement_vGMUX", - "controlLoopSchemaType": "VNF", - "policyScope": "DCAE", - "policyName": "DCAE.Config_tca-hi-lo", - "policyVersion": "v0.0.1", - "thresholds": [ - { - "closedLoopControlName": "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e", - "version": "1.0.2", - "fieldPath": "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value", - "thresholdValue": 0, - "direction": "EQUAL", - "severity": "MAJOR", - "closedLoopEventStatus": "ABATED" - }, - { - "closedLoopControlName": "ControlLoop-vCPE-48f0c2c3-a172-4192-9ae3-052274181b6e", - "version": "1.0.2", - "fieldPath": "$.event.measurementsForVfScalingFields.additionalMeasurements[*].arrayOfFields[0].value", - "thresholdValue": 0, - "direction": "GREATER", - "severity": "CRITICAL", - "closedLoopEventStatus": "ONSET" - } - ] - } - ] - } - } - } - } - ] - } -} diff --git a/scripts/policy/docker-compose-api.yml b/scripts/policy/docker-compose-api.yml index 1bab1894..e32190f1 100644 --- a/scripts/policy/docker-compose-api.yml +++ b/scripts/policy/docker-compose-api.yml @@ -1,4 +1,4 @@ -# Copyright 2019 AT&T Intellectual Property. All rights reserved +# Copyright 2019-2020 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. @@ -12,9 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. version: '2' -networks: - default: - driver: bridge services: mariadb: image: mariadb:${POLICY_MARIADB_VER} @@ -24,16 +21,16 @@ services: env_file: config/db/db.conf volumes: - ./config/db:/docker-entrypoint-initdb.d - ports: - - "3306:3306" + expose: + - 3306 api: image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION} container_name: policy-api depends_on: - mariadb hostname: policy-api - ports: - - "6969:6969" + expose: + - 6969 start_dependencies: image: dadarek/wait-for-dependencies environment: diff --git a/scripts/policy/docker-compose-pap.yml b/scripts/policy/docker-compose-pap.yml index 970f1168..5438557b 100644 --- a/scripts/policy/docker-compose-pap.yml +++ b/scripts/policy/docker-compose-pap.yml @@ -1,4 +1,4 @@ -# Copyright 2019 AT&T Intellectual Property. All rights reserved +# Copyright 2019-2020 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. @@ -12,9 +12,6 @@ # See the License for the specific language governing permissions and # limitations under the License. version: '2' -networks: - default: - driver: bridge services: mariadb: image: mariadb:${POLICY_MARIADB_VER} @@ -24,24 +21,24 @@ services: env_file: config/db/db.conf volumes: - ./config/db:/docker-entrypoint-initdb.d - ports: - - "3306:3306" + expose: + - 3306 pap: image: nexus3.onap.org:10001/onap/policy-pap:${POLICY_PAP_VERSION} container_name: policy-pap depends_on: - mariadb hostname: policy-pap - ports: - - "6969:6969" + expose: + - 6969 api: image: nexus3.onap.org:10001/onap/policy-api:${POLICY_API_VERSION} container_name: policy-api depends_on: - mariadb hostname: policy-api - ports: - - "9969:6969" + expose: + - 6969 start_dependencies: image: dadarek/wait-for-dependencies environment: diff --git a/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml b/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml index af1cbaee..caf8315b 100644 --- a/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml +++ b/scripts/policy/policy-xacml-pdp/docker-compose-pdpx.yml @@ -1,5 +1,5 @@ # ============LICENSE_START======================================================= -# Copyright (C) 2019 AT&T Intellectual Property. All rights reserved. +# Copyright (C) 2019-2020 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. @@ -16,9 +16,6 @@ # SPDX-License-Identifier: Apache-2.0 # ============LICENSE_END========================================================= version: '2' -networks: - default: - driver: bridge services: mariadb: image: mariadb:${POLICY_MARIADB_VER} @@ -28,14 +25,14 @@ services: env_file: config/db/db.conf volumes: - ./config/db:/docker-entrypoint-initdb.d - ports: - - "3306:3306" + expose: + - 3306 message-router: image: dmaap/simulator container_name: dmaap-simulator hostname: dmaap-simulator - ports: - - "3904:3904" + expose: + - 3904 pap: image: nexus3.onap.org:10001/onap/policy-pap:${POLICY_PAP_VERSION} container_name: policy-pap @@ -57,8 +54,8 @@ services: - message-router - pap hostname: policy-xacml-pdp - ports: - - "6969:6969" + expose: + - 6969 start_dependencies: image: dadarek/wait-for-dependencies environment: diff --git a/scripts/sdc/setup_sdc_for_sanity.sh b/scripts/sdc/setup_sdc_for_sanity.sh index c5a923d8..90ffa230 100644 --- a/scripts/sdc/setup_sdc_for_sanity.sh +++ b/scripts/sdc/setup_sdc_for_sanity.sh @@ -94,7 +94,7 @@ chmod -R 777 "${WORKSPACE}/data/clone" export ENV_NAME='CSIT' export MR_IP_ADDR='10.0.0.1' -ifconfig +ip a IP_ADDRESS=`ip route get 8.8.8.8 | awk '/src/{ print $7 }'` export HOST_IP="$IP_ADDRESS" |