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

diff --git a/ms/blueprintsprocessor/application/src/main/docker/distribution.xml b/ms/blueprintsprocessor/application/src/main/docker/distribution.xml
index 2ff3739..aed4175 100755 (executable)
--- a/ms/blueprintsprocessor/application/src/main/docker/distribution.xml
+++ b/ms/blueprintsprocessor/application/src/main/docker/distribution.xml
@@ -26,7 +26,7 @@
     </formats>
     <dependencySets>
         <dependencySet>
-            <outputDirectory>/opt/app/onap/lib</outputDirectory>
+            <outputDirectory>opt/app/onap/lib</outputDirectory>
             <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <excludes>
                 <exclude>org.slf4j:slf4j-simple</exclude>
@@ -41,21 +41,24 @@
                 <include>application.properties</include>
                 <include>logback.xml</include>
             </includes>
-            <outputDirectory>/opt/app/onap/config</outputDirectory>
+            <outputDirectory>opt/app/onap/config</outputDirectory>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
         <fileSet>
             <directory>${project.basedir}/../../../components/model-catalog</directory>
-            <outputDirectory>/opt/app/onap/model-catalog</outputDirectory>
+            <outputDirectory>opt/app/onap/model-catalog</outputDirectory>
             <includes>
                 <include>blueprint-model/service-blueprint/**</include>
                 <include>definition-type/starter-type/**</include>
                 <include>resource-dictionary/starter-dictionary/**</include>
             </includes>
+            <excludes>
+                <exclude>**/target/**</exclude>
+            </excludes>
         </fileSet>
         <fileSet>
             <directory>${project.basedir}/../../../components/scripts/python</directory>
-            <outputDirectory>/opt/app/onap/scripts/jython</outputDirectory>
+            <outputDirectory>opt/app/onap/scripts/jython</outputDirectory>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
     </fileSets>

diff --git a/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties b/ms/blueprintsprocessor/application/src/main/resources/application-dev.properties
index e177c18..e40ccba 100755 (executable)
--- 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 6d8a4fa..1378c62 100755 (executable)
--- 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

diff --git a/ms/blueprintsprocessor/application/src/test/resources/application-test.properties b/ms/blueprintsprocessor/application/src/test/resources/application-test.properties
index 74c8a23..0f34574 100644 (file)
--- a/ms/blueprintsprocessor/application/src/test/resources/application-test.properties
+++ b/ms/blueprintsprocessor/application/src/test/resources/application-test.properties
@@ -45,6 +45,6 @@ blueprints.processor.functions.python.executor.modulePaths=\
 
 # Executor Options
 blueprintsprocessor.cliExecutor.enabled=true
-blueprintprocessor.netconfExecutor.enabled=true
+blueprintsprocessor.netconfExecutor.enabled=true
 
 blueprintsprocessor.restconfEnabled=true

diff --git a/ms/blueprintsprocessor/application/src/test/resources/application.properties b/ms/blueprintsprocessor/application/src/test/resources/application.properties
index d56e958..92d54f6 100644 (file)
--- a/ms/blueprintsprocessor/application/src/test/resources/application.properties
+++ b/ms/blueprintsprocessor/application/src/test/resources/application.properties
@@ -62,11 +62,11 @@ security.user.password:{bcrypt}$2a$10$duaUzVUVW0YPQCSIbGEkQOXwafZGwQ/b32/Ys4R1iw
 security.user.name:ccsdkapps
 
 # 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=false
+blueprintsprocessor.remoteScriptCommand.enabled=false
 
 
 # Kafka-message-lib Configuration

diff --git a/ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/application-test.properties b/ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/application-test.properties
index 2bbe31b..8b6bad2 100644 (file)
--- a/ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/application-test.properties
+++ b/ms/blueprintsprocessor/functions/ansible-awx-executor/src/test/resources/application-test.properties
@@ -32,4 +32,4 @@ blueprints.processor.functions.python.executor.executionPath=./../../../../compo
 blueprints.processor.functions.python.executor.modulePaths=./../../../../components/scripts/python/ccsdk_blueprints
 
 # Executor Options
-blueprintprocessor.netconfExecutor.enabled=true
+blueprintsprocessor.netconfExecutor.enabled=true

diff --git a/ms/blueprintsprocessor/functions/config-snapshots/src/test/resources/application-test.properties b/ms/blueprintsprocessor/functions/config-snapshots/src/test/resources/application-test.properties
index 74c478a..817b8c4 100644 (file)
--- a/ms/blueprintsprocessor/functions/config-snapshots/src/test/resources/application-test.properties
+++ b/ms/blueprintsprocessor/functions/config-snapshots/src/test/resources/application-test.properties
@@ -29,4 +29,4 @@ blueprints.processor.functions.python.executor.executionPath=./../../../../compo
 blueprints.processor.functions.python.executor.modulePaths=./../../../../components/scripts/python/ccsdk_blueprints
 
 # Executor Options
-blueprintprocessor.netconfExecutor.enabled=true
+blueprintsprocessor.netconfExecutor.enabled=true

diff --git a/ms/blueprintsprocessor/functions/netconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/NetconfExecutorConfiguration.kt b/ms/blueprintsprocessor/functions/netconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/NetconfExecutorConfiguration.kt
index 77a2d3b..2149693 100644 (file)
--- a/ms/blueprintsprocessor/functions/netconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/NetconfExecutorConfiguration.kt
+++ b/ms/blueprintsprocessor/functions/netconf-executor/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/netconf/executor/NetconfExecutorConfiguration.kt
@@ -24,5 +24,5 @@ import org.springframework.context.annotation.Configuration
 @Configuration
 @ComponentScan
 @EnableConfigurationProperties
-@ConditionalOnProperty(name = ["blueprintprocessor.netconfExecutor.enabled"], havingValue = "true")
+@ConditionalOnProperty(name = ["blueprintsprocessor.netconfExecutor.enabled"], havingValue = "true")
 open class NetconfExecutorConfiguration
\ No newline at end of file

diff --git a/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/application-test.properties b/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/application-test.properties
index 2bbe31b..8b6bad2 100644 (file)
--- a/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/application-test.properties
+++ b/ms/blueprintsprocessor/functions/netconf-executor/src/test/resources/application-test.properties
@@ -32,4 +32,4 @@ blueprints.processor.functions.python.executor.executionPath=./../../../../compo
 blueprints.processor.functions.python.executor.modulePaths=./../../../../components/scripts/python/ccsdk_blueprints
 
 # Executor Options
-blueprintprocessor.netconfExecutor.enabled=true
+blueprintsprocessor.netconfExecutor.enabled=true

diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceAssignmentProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceAssignmentProcessor.kt
index 2120449..0f5d914 100644 (file)
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceAssignmentProcessor.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/DatabaseResourceAssignmentProcessor.kt
@@ -91,7 +91,8 @@ open class DatabaseResourceAssignmentProcessor(
             "failed to get input-key-mappings for $dName under $dSource properties"
         }
 
-        logger.info("$dSource dictionary information : ($sql), ($inputKeyMapping), (${sourceProperties.outputKeyMapping})")
+        logger.info("DatabaseResource ($dSource) dictionary information: " +
+                "Query:($sql), input-key-mapping:($inputKeyMapping), output-key-mapping:(${sourceProperties.outputKeyMapping})")
         val jdbcTemplate = blueprintDBLibService(sourceProperties)
 
         val rows = jdbcTemplate.query(sql, populateNamedParameter(inputKeyMapping))

diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessor.kt
index 70da462..2b9239f 100644 (file)
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessor.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/main/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/processor/RestResourceResolutionProcessor.kt
@@ -81,7 +81,8 @@ open class RestResourceResolutionProcessor(private val blueprintRestLibPropertyS
                     resolveFromInputKeyMapping(checkNotNull(sourceProperties.urlPath), resolvedInputKeyMapping)
                 val verb = resolveFromInputKeyMapping(nullToEmpty(sourceProperties.verb), resolvedInputKeyMapping)
 
-                logger.info("$dSource dictionary information : ($urlPath), ($inputKeyMapping), (${sourceProperties.outputKeyMapping})")
+                logger.info("RestResource ($dSource) dictionary information: " +
+                        "URL:($urlPath), input-key-mapping:($inputKeyMapping), output-key-mapping:(${sourceProperties.outputKeyMapping})")
                 // Get the Rest Client Service
                 val restClientService = blueprintWebClientService(resourceAssignment, sourceProperties)
 

diff --git a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/mock/MockRestResourceResolutionProcessor.kt b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/mock/MockRestResourceResolutionProcessor.kt
index 203b7ea..e5b5598 100644 (file)
--- a/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/mock/MockRestResourceResolutionProcessor.kt
+++ b/ms/blueprintsprocessor/functions/resource-resolution/src/test/kotlin/org/onap/ccsdk/cds/blueprintsprocessor/functions/resource/resolution/mock/MockRestResourceResolutionProcessor.kt
@@ -77,7 +77,8 @@ class MockRestResourceResolutionProcessor(private val blueprintRestLibPropertySe
                     resolveFromInputKeyMapping(checkNotNull(sourceProperties.urlPath), resolvedInputKeyMapping)
                 val verb = resolveFromInputKeyMapping(nullToEmpty(sourceProperties.verb), resolvedInputKeyMapping)
 
-                logger.info("$dSource dictionary information : ($urlPath), ($inputKeyMapping), (${sourceProperties.outputKeyMapping})")
+                logger.info("MockRestResource ($dSource) dictionary information: " +
+                        "URL:($urlPath), input-key-mapping:($inputKeyMapping), output-key-mapping:(${sourceProperties.outputKeyMapping})")
 
                 // Get the Rest Client Service
                 val restClientService = blueprintWebClientService(executionRequest)

diff --git a/ms/command-executor/src/main/docker/distribution.xml b/ms/command-executor/src/main/docker/distribution.xml
index 1a714b8..7a16062 100755 (executable)
--- a/ms/command-executor/src/main/docker/distribution.xml
+++ b/ms/command-executor/src/main/docker/distribution.xml
@@ -25,7 +25,7 @@
     <fileSets>
         <fileSet>
             <directory>${project.basedir}/src/main/python</directory>
-            <outputDirectory>/opt/app/onap/python</outputDirectory>
+            <outputDirectory>opt/app/onap/python</outputDirectory>
         </fileSet>
     </fileSets>
 </assembly>
\ No newline at end of file

diff --git a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtils.kt b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtils.kt
index 60fe6a7..cd887bf 100644 (file)
--- a/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtils.kt
+++ b/ms/controllerblueprints/modules/resource-dict/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/resource/dict/utils/BulkResourceSequencingUtils.kt
@@ -35,7 +35,7 @@ object BulkResourceSequencingUtils {
     fun process(resourceAssignments: MutableList<ResourceAssignment>): List<List<ResourceAssignment>> {
         val resourceAssignmentMap: MutableMap<String, ResourceAssignment> = hashMapOf()
         val sequenceBatchResourceAssignment = ArrayList<List<ResourceAssignment>>()
-        log.info("Assignments ({})", resourceAssignments)
+        log.trace("Assignments ({})", resourceAssignments)
         // Prepare Map
         resourceAssignments.forEach { resourceAssignment ->
             log.trace("Processing Key ({})", resourceAssignment.name)
@@ -64,7 +64,7 @@ object BulkResourceSequencingUtils {
         }
 
         val sequencedResourceAssignments: MutableList<ResourceAssignment> = topologySorting.topSort()!! as MutableList<ResourceAssignment>
-        log.info("Sorted Sequenced Assignments ({})", sequencedResourceAssignments)
+        log.trace("Sorted Sequenced Assignments ({})", sequencedResourceAssignments)
 
         var batchResourceAssignment: MutableList<ResourceAssignment>? = null
         var batchAssignmentName: MutableList<String>? = null

diff --git a/ms/sdclistener/distribution/src/main/docker/distribution.xml b/ms/sdclistener/distribution/src/main/docker/distribution.xml
index e9e8eef..335973e 100755 (executable)
--- a/ms/sdclistener/distribution/src/main/docker/distribution.xml
+++ b/ms/sdclistener/distribution/src/main/docker/distribution.xml
@@ -25,7 +25,7 @@
     </formats>
     <dependencySets>
         <dependencySet>
-            <outputDirectory>/opt/app/onap/lib</outputDirectory>
+            <outputDirectory>opt/app/onap/lib</outputDirectory>
             <outputFileNameMapping>${artifact.groupId}-${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
             <excludes>
                 <exclude>org.slf4j:slf4j-simple</exclude>
@@ -40,7 +40,7 @@
                 <include>application.yml</include>
                 <include>logback.xml</include>
             </includes>
-            <outputDirectory>/opt/app/onap/config</outputDirectory>
+            <outputDirectory>opt/app/onap/config</outputDirectory>
             <useDefaultExcludes>true</useDefaultExcludes>
         </fileSet>
     </fileSets>