summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCheung, Pat (kc1472) <kc1472@att.com>2021-01-12 02:04:08 +0000
committerCheung, Pat (kc1472) <kc1472@att.com>2021-01-12 02:04:08 +0000
commita39383b062aca05e110163eb4fa5a9bcd0e0b208 (patch)
treeeb565c2c5bfda369c9e77b18486c1f4f7afe47ba
parente71c86c428806b55076c1687bb180176f87e6a23 (diff)
Add vf-module,port-mirror, allotted-resource rpc and CRUD
Adding methods for vf-mdoule, port-mirror, policy-update-notify, and vnf-get-resource rpc and CRUD Issue-ID: SDNC-1424 Signed-off-by: Cheung, Pat (kc1472) <kc1472@att.com> Change-Id: I68fceab7ba0cfab2bd297150e5c7ca102e50c900
-rw-r--r--ms/generic-resource-api/pom.xml2
-rwxr-xr-xms/generic-resource-api/src/main/dc/docker-compose.yaml2
-rw-r--r--ms/generic-resource-api/src/main/docker/Dockerfile3
3 files changed, 3 insertions, 4 deletions
diff --git a/ms/generic-resource-api/pom.xml b/ms/generic-resource-api/pom.xml
index 555f2a2..6f91bb4 100644
--- a/ms/generic-resource-api/pom.xml
+++ b/ms/generic-resource-api/pom.xml
@@ -26,7 +26,7 @@
<sdnc.northbound.version>2.1.1-SNAPSHOT</sdnc.northbound.version>
<sdnc.oam.version>2.1.1-SNAPSHOT</sdnc.oam.version>
- <base.image.name>nexus3.onap.org:10001/onap/ccsdk-alpine-j11-image</base.image.name>
+ <base.image.name>onap/ccsdk-alpine-j11-image</base.image.name>
<image.name>onap/sdnc-gra-image</image.name>
<ccsdk.project.version>${project.version}</ccsdk.project.version>
<ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp>
diff --git a/ms/generic-resource-api/src/main/dc/docker-compose.yaml b/ms/generic-resource-api/src/main/dc/docker-compose.yaml
index ba7b5fa..fc70f43 100755
--- a/ms/generic-resource-api/src/main/dc/docker-compose.yaml
+++ b/ms/generic-resource-api/src/main/dc/docker-compose.yaml
@@ -1,4 +1,4 @@
-version: '2.0'
+version: '2.1'
services:
db:
diff --git a/ms/generic-resource-api/src/main/docker/Dockerfile b/ms/generic-resource-api/src/main/docker/Dockerfile
index 9c925f2..79dda69 100644
--- a/ms/generic-resource-api/src/main/docker/Dockerfile
+++ b/ms/generic-resource-api/src/main/docker/Dockerfile
@@ -26,8 +26,7 @@ ENV LOG_PATH /var/log/onap/sdnc
USER root
# Install sudo and IP utilities
-#RUN apk update && apk --no-cache add sudo iputils openssl
-RUN HTTP_PROXY=http://135.28.13.29:8080 && apk update && apk --no-cache add sudo iputils openssl
+RUN apk update && apk --no-cache add sudo iputils openssl
# Enable wheel group