From 9ea0e262d12f2a091daffb66191165bb650dbd68 Mon Sep 17 00:00:00 2001
From: "Singal, Kapil (ks220y)" <ks220y@att.com>
Date: Thu, 26 Sep 2019 13:07:32 -0400
Subject: Fixing distribution and properties

Excluding to embedd Target path, and renaming blueprint to blueprints in properties

Issue-ID: CCSDK-1758
Signed-off-by: Singal, Kapil (ks220y) <ks220y@att.com>
Change-Id: Ie6f0ff177e0945fb252710a425a16afade1b01a3
---
 .../src/main/resources/application-dev.properties        | 16 +++++-----------
 .../src/main/resources/application.properties            | 16 +++++-----------
 2 files changed, 10 insertions(+), 22 deletions(-)

(limited to 'ms/blueprintsprocessor/application/src/main/resources')

diff --git a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
index e177c18cf..e40ccba09 100755
--- a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
+++ b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
@@ -95,12 +95,6 @@ blueprints.processor.functions.python.executor.modulePaths=./../../../components
 
 # SDN-C's ODL Restconf Connection Details
 blueprintsprocessor.restconfEnabled=true
-blueprintsprocessor.restclient.sdncodl.type=basic-auth
-blueprintsprocessor.restclient.sdncodl.url=http://localhost:8282/
-blueprintsprocessor.restclient.sdncodl.username=admin
-blueprintsprocessor.restclient.sdncodl.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-
-# Config Data REST client settings
 blueprintsprocessor.restclient.sdnc.type=basic-auth
 blueprintsprocessor.restclient.sdnc.url=http://sdnc:8282
 blueprintsprocessor.restclient.sdnc.username=admin
@@ -113,13 +107,13 @@ blueprintsprocessor.restclient.aai-data.username=aai@aai.onap.org
 blueprintsprocessor.restclient.aai-data.password=demo123456!
 
 # Executor Options
-blueprintprocessor.resourceResolution.enabled=true
-blueprintprocessor.netconfExecutor.enabled=true
-blueprintprocessor.restConfExecutor.enabled=true
+blueprintsprocessor.resourceResolution.enabled=true
+blueprintsprocessor.netconfExecutor.enabled=true
+blueprintsprocessor.restConfExecutor.enabled=true
 blueprintsprocessor.cliExecutor.enabled=true
 ### If enabling remote python executor, set this value to true
-### blueprintprocessor.remoteScriptCommand.enabled=true
-blueprintprocessor.remoteScriptCommand.enabled=false
+### blueprintsprocessor.remoteScriptCommand.enabled=true
+blueprintsprocessor.remoteScriptCommand.enabled=false
 
 # Kafka-message-lib Configurations
 blueprintsprocessor.messageconsumer.self-service-api.kafkaEnable=false
diff --git a/ms/blueprintsprocessor/application/src/main/resources/application.properties b/ms/blueprintsprocessor/application/src/main/resources/application.properties
index 6d8a4fa2b..1378c62c5 100755
--- a/ms/blueprintsprocessor/application/src/main/resources/application.properties
+++ b/ms/blueprintsprocessor/application/src/main/resources/application.properties
@@ -69,19 +69,12 @@ security.user.name: ccsdkapps
 endpoints.user.name=ccsdkapps
 endpoints.user.password=ccsdkapps
 
-# SDN-C's ODL Restconf Connection Details
-blueprintsprocessor.restconfEnabled=true
-blueprintsprocessor.restclient.sdncodl.type=basic-auth
-blueprintsprocessor.restclient.sdncodl.url=http://sdnc:8282/
-blueprintsprocessor.restclient.sdncodl.username=admin
-blueprintsprocessor.restclient.sdncodl.password=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-
 # Executor Options
-blueprintprocessor.resourceResolution.enabled=true
-blueprintprocessor.netconfExecutor.enabled=true
-blueprintprocessor.restConfExecutor.enabled=true
+blueprintsprocessor.resourceResolution.enabled=true
+blueprintsprocessor.netconfExecutor.enabled=true
+blueprintsprocessor.restConfExecutor.enabled=true
 blueprintsprocessor.cliExecutor.enabled=true
-blueprintprocessor.remoteScriptCommand.enabled=true
+blueprintsprocessor.remoteScriptCommand.enabled=true
 
 # Command executor
 blueprintsprocessor.grpcclient.remote-python.type=token-auth
@@ -90,6 +83,7 @@ blueprintsprocessor.grpcclient.remote-python.port=50051
 blueprintsprocessor.grpcclient.remote-python.token=Basic Y2NzZGthcHBzOmNjc2RrYXBwcw==
 
 # Config Data REST client settings
+blueprintsprocessor.restconfEnabled=true
 blueprintsprocessor.restclient.sdnc.type=basic-auth
 blueprintsprocessor.restclient.sdnc.url=http://sdnc:8282
 blueprintsprocessor.restclient.sdnc.username=admin
-- 
cgit 1.2.3-korg