X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsrc%2Fmain%2Fproperties%2Fgeneric-resource-api-dg.properties;h=4ba46954957a4ce81cf4024c874d46ee38315a62;hb=2360082ba553bc6cac39e7f7e6951d20a72e9582;hp=5d4654a3b0e3c4947bd810a50d4754a7ea4cbb2a;hpb=13267a899ccd06491f79f653caf1483957563149;p=sdnc%2Foam.git

diff --git a/installation/src/main/properties/generic-resource-api-dg.properties b/installation/src/main/properties/generic-resource-api-dg.properties
index 5d4654a3..4ba46954 100644
--- a/installation/src/main/properties/generic-resource-api-dg.properties
+++ b/installation/src/main/properties/generic-resource-api-dg.properties
@@ -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_PASSWORD}
 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
@@ -44,6 +44,23 @@ 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.p2p-otn-src-domain-creation.templatefile=p2p-otn-tunnel-src-domain.json
+restapi.p2p-otn-dst-domain-creation.templatefile=p2p-otn-tunnel-dst-domain.json
+restapi.p2p-otn-domainG-creation.templatefile=p2p-otn-tunnel-domainG.json
+restapi.p2p-ethernet-service.templatefile=p2p-ethernet-service.json
+restapi.p2p-subscribe-notification.templatefile=p2p-subscribe-notification.json
+restapi.p2p-terminate-notification.templatefile=p2p-terminate-notification.json
+restapi.p2p-create-pm-data.templatefile=p2p-create-pm-data.json
+restapi.p2p-call-ves.templatefile=p2p-call-ves.json
+restapi.cll-ethernet-service-loop.templatefile=cll-ethernet-service-loop.json
+restapi.cll-ethernet-service-loop-protection.templatefile=cll-ethernet-service-loop-protection.json
+restapi.cll-otn-src-domain-creation.templatefile=cll-otn-tunnel-src-domain.json
+restapi.cll-otn-dst-domain-creation.templatefile=cll-otn-tunnel-dst-domain.json
+restapi.cll-otn-domainG-creation.templatefile=cll-otn-tunnel-domainG.json
+restapi.cll-subscribe-notification.templatefile=cll-subscribe-notification.json
+restapi.cll-terminate-notification.templatefile=cll-terminate-notification.json
+restapi.cll-create-pm-data.templatefile=cll-create-pm-data.json
+restapi.cll-call-ves.templatefile=cll-call-ves.json
 restapi.naming.gen-name.templatefile=naming-ms-post-gen-name.json
 restapi.ss.pnf.templatefile=self-serve-pnf-assignments.json
 restapi.ss.vnf.templatefile=self-serve-vnf-assignments.json