From: Dan Timoney <dtimoney@att.com>
Date: Mon, 22 Feb 2021 20:57:39 +0000 (+0000)
Subject: Merge "Supporting 3 or more network domains for Transport Slicing use case. Issue... 
X-Git-Tag: 2.1.1~5
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=32cd336379716eb9ca73b0ca67fb9fe1168149f4;hp=-c;p=sdnc%2Foam.git

Merge "Supporting 3 or more network domains for Transport Slicing use case. Issue-ID: SDNC-1487"

Former-commit-id: 4d1ae7db95e95347bb0f2ceee64cecc3c080cad7
---

32cd336379716eb9ca73b0ca67fb9fe1168149f4
diff --combined installation/src/main/properties/generic-resource-api-dg.properties
index d633f926,5d4654a3..980a2819
--- a/installation/src/main/properties/generic-resource-api-dg.properties
+++ b/installation/src/main/properties/generic-resource-api-dg.properties
@@@ -1,23 -1,23 +1,23 @@@
  restapi.templateDir=/opt/onap/sdnc/restapi/templates
  controller.url=http://localhost:8181
 -controller.user=admin
 -controller.pwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
 +controller.user=${ODL_USER}
 +controller.pwd=${ODL_HOST}
  honeycomb.url=http://{honeycomb-instance-ip}:8183
 -honeycomb.user=admin
 -honeycomb.pwd=admin
 +honeycomb.user=${HONEYCOMB_USER}
 +honeycomb.pwd=${HONEYCOMB_PASSWORD}
  restapi.trustStoreFileName=/opt/onap/sdnc/data/stores/truststore.openecomp.client.jks
 -restapi.trustStorePassword=adminadmin
 +restapi.trustStorePassword=${TRUSTSTORE_PASSWORD}
  restapi.keyStoreFileName=/opt/onap/sdnc/data/stores/sdnc.p12
 -restapi.keyStorePassword=adminadmin
 +restapi.keyStorePassword=${KEYSTORE_PASSWORD}
  restapi.connection-oof-url=http://oof-osdf:8698/api/oof/v1/route
  naming.gen-name.url=http://neng-serv:8080
 -naming.gen-name.user=ccsdkapps
 -naming.gen-name.pwd=ccsdkapps
 -so.user=sdncaBpmn
 -so.pwd=password1$
 +naming.gen-name.user=${NENG_NAME}
 +naming.gen-name.pwd=${NENG_PASSWORD}
 +so.user=${SO_USER}
 +so.pwd=${SO_PASSWORD}
  cds.url=http://cds-blueprints-processor-http:8080
 -cds.user=ccsdkapps
 -cds.pwd=ccsdkapps
 +cds.user=${CDS_USER}
 +cds.pwd=${CDS_PASSWORD}
  
  # Templates
  restapi.sz.templatefile=security-zone-allotted-resource.json
@@@ -38,8 -38,10 +38,10 @@@ restapi.oof-getpath.templatefile=oof-ge
  restapi.transport-slice-creation.templatefile=ts-allocate-tn-slice.json
  restapi.transport-sliceA-list-creation.templatefile=ts-allocate-tn-sliceA-list.json
  restapi.transport-sliceB-list-creation.templatefile=ts-allocate-tn-sliceB-list.json
+ restapi.transport-sliceG-list-creation.templatefile=ts-allocate-tn-sliceG-list.json
  restapi.ts-otn-src-domain-creation.templatefile=ts-otn-tunnel-src-domain.json
  restapi.ts-otn-dst-domain-creation.templatefile=ts-otn-tunnel-dst-domain.json
+ restapi.ts-otn-domainG-creation.templatefile=ts-otn-tunnel-domainG.json
  restapi.ts-ethernet-service.templatefile=ts-ethernet-service.json
  restapi.ts-coloring-uni-port.templatefile=ts-coloring-uni-port.json
  restapi.naming.gen-name.templatefile=naming-ms-post-gen-name.json