diff options
| author |   Patrick Brady <patrick.brady@att.com> | 2019-05-29 00:46:03 -0700 |
|---|---|---|
| committer |   Takamune Cho <takamune.cho@att.com> | 2019-05-29 12:57:52 +0000 |
| commit | 23299c969a313f8e3740bceb070655810f5e3efb (patch) | |
| tree | b074ed46912c515f377c0a5ace0fefad491e5647 /installation | |
| parent | 6919392881a94fa9823e5ebf8748682a4c499e98 (diff) | |
Fix for aai in vcpe
Adding the template file and replaced the generic
restart DG to enable the workaround that was used
in casablanca. DG is modified to lookup aai
information from property files so that no values
need to be hardcoded.
Change-Id: I48569f133b301509204a879af133386e741dc142
Signed-off-by: Patrick Brady <patrick.brady@att.com>
Issue-ID: APPC-1614
(cherry picked from commit 4dce366b94f679ac0870230aa8eb32ae248c609f)
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/appc/pom.xml | 4 | ||||
| -rwxr-xr-x | installation/appc/src/main/resources/aai-named-query.json | 14 | ||||
| -rw-r--r-- | installation/appc/src/main/scripts/installFeatures.sh | 5 |
3 files changed, 22 insertions, 1 deletions
diff --git a/installation/appc/pom.xml b/installation/appc/pom.xml index 8b8dd9f..82c3d14 100644 --- a/installation/appc/pom.xml +++ b/installation/appc/pom.xml @@ -3,7 +3,7 @@ ============LICENSE_START========================================== ONAP : APPC =================================================================== -Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. +Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. =================================================================== Unless otherwise specified, all software contained herein is licensed @@ -116,6 +116,7 @@ limitations under the License. <include>*.sh</include> <include>*.cfg</include> <include>*.xml</include> + <include>*.json</include> </includes> <filtering>false</filtering> </resource> @@ -362,6 +363,7 @@ limitations under the License. <include>*.sh</include> <include>*.cfg</include> <include>*.xml</include> + <include>*.json</include> </includes> <filtering>false</filtering> </resource> diff --git a/installation/appc/src/main/resources/aai-named-query.json b/installation/appc/src/main/resources/aai-named-query.json new file mode 100755 index 0000000..6ccb5de --- /dev/null +++ b/installation/appc/src/main/resources/aai-named-query.json @@ -0,0 +1,14 @@ +{ + "query-parameters": { + "named-query": { + "named-query-uuid": ${tmp.named-query-uuid} + } + }, + "instance-filters":{ + "instance-filter":[ { + "generic-vnf": { + "vnf-id": ${tmp.named-query-vnf-id} + } + } ] + } +} diff --git a/installation/appc/src/main/scripts/installFeatures.sh b/installation/appc/src/main/scripts/installFeatures.sh index 9ad6898..4138fdc 100644 --- a/installation/appc/src/main/scripts/installFeatures.sh +++ b/installation/appc/src/main/scripts/installFeatures.sh @@ -175,3 +175,8 @@ do sleep 7s echo "Sleep Finished" done + +#Copy json template file for use by the generic restart DG aai fix +mkdir -p /opt/onap/appc/restapi/templates +cp /opt/onap/appc/data/aai-named-query.json /opt/onap/appc/restapi/templates/aai-named-query.json + |