Update docker-compose to onap-sdnc:2.1.3

 - .env updated with new sdnc version
 - docker-compose needs a new parameter for sdnr-only==true
 - typo in event-list template fixed

IssueID: OAM-181
Change-Id: Id58c573e1ad05280fc82a76ab8a43da3de3fce1f
Signed-off-by: demx8as6 <martin.skorupski@highstreet-technologies.com>

diff --git a/solution/dev/ves-test-collector/client-scripts-ves-v7/json/templates/event-list.json b/solution/dev/ves-test-collector/client-scripts-ves-v7/json/templates/event-list.json
index 1485f04..e2b0b2d 100644 (file)
--- a/solution/dev/ves-test-collector/client-scripts-ves-v7/json/templates/event-list.json
+++ b/solution/dev/ves-test-collector/client-scripts-ves-v7/json/templates/event-list.json
@@ -10,7 +10,7 @@
             "reportingEntityId": "",
             "reportingEntityName": "@controllerName@",
             "sourceId": "",
-            "sourceName": "martindev",
+            "sourceName": "@controllerName@",
             "startEpochMicrosec": "@timestamp@",
             "lastEpochMicrosec": "@timestamp@",
             "nfNamingCode": "@type@",

diff --git a/solution/integration/smo/.env b/solution/integration/smo/.env
index 86810e0..fde8c37 100644 (file)
--- a/solution/integration/smo/.env
+++ b/solution/integration/smo/.env
@@ -33,7 +33,7 @@ IPv4_SDNRDB=172.40.0.30
 IPv6_SDNRDB=2001:db8:1:1::30
 
 # SDN Controller
-SDNC_IMAGE=nexus3.onap.org:10001/onap/sdnc-image:2.1.1
+SDNC_IMAGE=nexus3.onap.org:10001/onap/sdnc-image:2.1.3
 IPv4_SDNC=172.40.0.21
 IPv6_SDNC=2001:db8:1:1::21
 ODL_CERT_DIR=/opt/opendaylight/current/certs

diff --git a/solution/integration/smo/docker-compose.yml b/solution/integration/smo/docker-compose.yml
index 2b34b32..4e059ab 100755 (executable)
--- a/solution/integration/smo/docker-compose.yml
+++ b/solution/integration/smo/docker-compose.yml
@@ -42,6 +42,7 @@ services:
       - SDNRINIT=true
       - SDNRONLY=true
       - SDNRDBURL=http://sdnrdb:9200
+      - A1_ADAPTER_NORTHBOUND=false
       - ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD}
       - JAVA_OPTS=-Xms256m -Xmx2g
     volumes: