Merge "Controller Blueprints Microservice"

6 files changed, 26 insertions, 26 deletions

diff --git a/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContextTest.kt b/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContextTest.kt
index 0b2b39c3..7a74ca47 100644
--- a/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContextTest.kt
+++ b/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintContextTest.kt
@@ -23,8 +23,8 @@ import org.junit.Test
 import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants

 import org.onap.ccsdk.apps.controllerblueprints.core.factory.BluePrintParserFactory

 import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils

-import org.slf4j.Logger

-import org.slf4j.LoggerFactory

+import com.att.eelf.configuration.EELFLogger

+import com.att.eelf.configuration.EELFManager

 import java.io.File

 import java.nio.charset.Charset

 import kotlin.test.assertNotNull

@@ -35,7 +35,7 @@ import kotlin.test.assertNotNull
  */

 class BluePrintContextTest {

 

-    private val logger: Logger = LoggerFactory.getLogger(this::class.toString())

+    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())

 

     lateinit var bluePrintContext: BluePrintContext

 

@@ -63,7 +63,7 @@ class BluePrintContextTest {
     fun testChainedProperty() {

         val nodeType = bluePrintContext.nodeTypeChained("component-resource-assignment")

         assertNotNull(nodeType, "Failed to get chained node type")

-        logger.trace("Properties {}", JacksonUtils.getJson(nodeType, true))

+        log.trace("Properties {}", JacksonUtils.getJson(nodeType, true))

     }

 

 

diff --git a/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintParserFactoryTest.kt b/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintParserFactoryTest.kt
index 0f211ab5..5a5557d7 100644
--- a/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintParserFactoryTest.kt
+++ b/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintParserFactoryTest.kt
@@ -18,8 +18,8 @@ package org.onap.ccsdk.apps.controllerblueprints.core.service
 

 import org.junit.Test

 import org.onap.ccsdk.apps.controllerblueprints.core.factory.BluePrintParserFactory

-import org.slf4j.Logger

-import org.slf4j.LoggerFactory

+import com.att.eelf.configuration.EELFLogger

+import com.att.eelf.configuration.EELFManager

 import kotlin.test.assertNotNull

 

 /**

@@ -28,7 +28,7 @@ import kotlin.test.assertNotNull
  * @author Brinda Santh

  */

 class BluePrintParserFactoryTest {

-    private val logger: Logger = LoggerFactory.getLogger(this::class.toString())

+    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())

 

     @Test

     fun testBluePrintJson() {

@@ -37,6 +37,6 @@ class BluePrintParserFactoryTest {
         val bluePrintContext: BluePrintContext = BluePrintParserFactory.instance(org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants.TYPE_DEFAULT)!!

                 .readBlueprintFile("baseconfiguration/Definitions/activation-blueprint.json", basepath)

         assertNotNull(bluePrintContext, "Failed to populate Blueprint context")

-        logger.trace("Blue Print {}",bluePrintContext.blueprintJson(true))

+        log.trace("Blue Print {}",bluePrintContext.blueprintJson(true))

     }

 }
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt b/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
index 8ed161a1..5d24b072 100644
--- a/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
+++ b/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintRuntimeServiceTest.kt
@@ -25,8 +25,8 @@ import org.onap.ccsdk.apps.controllerblueprints.core.factory.BluePrintParserFact
 import org.onap.ccsdk.apps.controllerblueprints.core.utils.BluePrintRuntimeUtils

 import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils.jsonNodeFromFile

 import org.onap.ccsdk.apps.controllerblueprints.core.utils.JacksonUtils.jsonNodeFromObject

-import org.slf4j.Logger

-import org.slf4j.LoggerFactory

+import com.att.eelf.configuration.EELFLogger

+import com.att.eelf.configuration.EELFManager

 import kotlin.test.assertEquals

 import kotlin.test.assertNotNull

 

@@ -36,7 +36,7 @@ import kotlin.test.assertNotNull
  * @author Brinda Santh

  */

 class BluePrintRuntimeServiceTest {

-    private val logger: Logger = LoggerFactory.getLogger(this::class.toString())

+    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())

     val basepath = "load/blueprints"

 

 

@@ -47,7 +47,7 @@ class BluePrintRuntimeServiceTest {
 

     @Test

     fun testResolveNodeTemplateProperties() {

-        logger.info("************************ testResolveNodeTemplateProperties **********************")

+        log.info("************************ testResolveNodeTemplateProperties **********************")

         val bluePrintContext: BluePrintContext = BluePrintParserFactory.instance(BluePrintConstants.TYPE_DEFAULT)!!

                 .readBlueprintFile("baseconfiguration/Definitions/activation-blueprint.json", basepath)

 

@@ -61,7 +61,7 @@ class BluePrintRuntimeServiceTest {
         bluePrintRuntimeService.assignInputs(inputNode)

 

         val propContext: MutableMap<String, Any?> = bluePrintRuntimeService.resolveNodeTemplateProperties("activate-process")

-        logger.info("Context {}" ,bluePrintRuntimeService.context)

+        log.info("Context {}" ,bluePrintRuntimeService.context)

 

         assertNotNull(propContext, "Failed to populate interface property values")

         assertEquals(propContext.get("process-name"), jsonNodeFromObject("sample-action"), "Failed to populate parameter process-name")

@@ -70,7 +70,7 @@ class BluePrintRuntimeServiceTest {
 

     @Test

     fun testResolveNodeTemplateInterfaceOperationInputs() {

-        logger.info("************************ testResolveNodeTemplateInterfaceOperationInputs **********************")

+        log.info("************************ testResolveNodeTemplateInterfaceOperationInputs **********************")

         val bluePrintContext: BluePrintContext = BluePrintParserFactory.instance(BluePrintConstants.TYPE_DEFAULT)!!

                 .readBlueprintFile("baseconfiguration/Definitions/activation-blueprint.json", basepath)

         assertNotNull(bluePrintContext, "Failed to populate Blueprint context")

@@ -84,12 +84,12 @@ class BluePrintRuntimeServiceTest {
 

         val bluePrintRuntimeService = BluePrintRuntimeService(bluePrintContext, context)

 

-        logger.info("Prepared Context {}" ,context)

+        log.info("Prepared Context {}" ,context)

 

         val inContext: MutableMap<String, Any?> = bluePrintRuntimeService.resolveNodeTemplateInterfaceOperationInputs("resource-assignment",

                 "DefaultComponentNode", "process")

 

-        logger.trace("In Context {}" ,inContext)

+        log.trace("In Context {}" ,inContext)

 

         assertNotNull(inContext, "Failed to populate interface input property values")

         assertEquals(inContext.get("action-name"), jsonNodeFromObject("sample-action"), "Failed to populate parameter action-name")

@@ -100,7 +100,7 @@ class BluePrintRuntimeServiceTest {
 

     @Test

     fun testResolveNodeTemplateInterfaceOperationOutputs() {

-        logger.info("************************ testResolveNodeTemplateInterfaceOperationOutputs **********************")

+        log.info("************************ testResolveNodeTemplateInterfaceOperationOutputs **********************")

         val bluePrintContext: BluePrintContext = BluePrintParserFactory.instance(BluePrintConstants.TYPE_DEFAULT)!!

                 .readBlueprintFile("baseconfiguration/Definitions/activation-blueprint.json", basepath)

         assertNotNull(bluePrintContext, "Failed to populate Blueprint context")

diff --git a/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorDefaultServiceTest.kt b/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorDefaultServiceTest.kt
index 50d2ce44..b05fcb61 100644
--- a/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorDefaultServiceTest.kt
+++ b/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/service/BluePrintValidatorDefaultServiceTest.kt
@@ -20,8 +20,8 @@ import org.junit.Before
 import org.junit.Test

 import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants

 import org.onap.ccsdk.apps.controllerblueprints.core.factory.BluePrintParserFactory

-import org.slf4j.Logger

-import org.slf4j.LoggerFactory

+import com.att.eelf.configuration.EELFLogger

+import com.att.eelf.configuration.EELFManager

 

 /**

  *

@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory
  * @author Brinda Santh

  */

 class BluePrintValidatorDefaultServiceTest {

-    private val logger: Logger = LoggerFactory.getLogger(this::class.toString())

+    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())

     val basepath = "load/blueprints"

 

     @Before

@@ -44,6 +44,6 @@ class BluePrintValidatorDefaultServiceTest {
         val properties : MutableMap<String, Any> = hashMapOf()

         val validatorService = BluePrintValidatorDefaultService()

         validatorService.validateBlueprint(bluePrintContext.serviceTemplate,properties)

-        logger.info("Validation Message {}", properties)

+        log.info("Validation Message {}", properties)

     }

 }
\ No newline at end of file
diff --git a/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonUtilsTest.kt b/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonUtilsTest.kt
index 8d0f968f..a5a630e3 100644
--- a/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonUtilsTest.kt
+++ b/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/JacksonUtilsTest.kt
@@ -20,8 +20,8 @@ package org.onap.ccsdk.apps.controllerblueprints.core.utils
 import org.junit.Test

 import org.onap.ccsdk.apps.controllerblueprints.core.BluePrintConstants

 import org.onap.ccsdk.apps.controllerblueprints.core.data.ServiceTemplate

-import org.slf4j.Logger

-import org.slf4j.LoggerFactory

+import com.att.eelf.configuration.EELFLogger

+import com.att.eelf.configuration.EELFManager

 import kotlin.test.assertEquals

 import kotlin.test.assertNotNull

 import kotlin.test.assertTrue

@@ -33,7 +33,7 @@ import kotlin.test.assertTrue
  */

 class JacksonUtilsTest {

 

-    private val log: Logger = LoggerFactory.getLogger(this::class.toString())

+    private val log: EELFLogger = EELFManager.getInstance().getLogger(this::class.toString())

 

     val basePath = "load/blueprints"

 

@@ -71,7 +71,7 @@ class JacksonUtilsTest {
     @Test

     fun testJsonValue() {

         val filePath = "data/alltype-data.json"

-        val rootJson = JacksonUtils.jsonNodeFromClassPathFile(filePath);

+        val rootJson = JacksonUtils.jsonNodeFromClassPathFile(filePath)

         assertNotNull(rootJson, "Failed to get all type data json node")

         val intValue = rootJson.get("intValue")

         assertTrue(JacksonUtils.checkJsonNodeValueOfType(BluePrintConstants.DATA_TYPE_INTEGER, intValue), "Failed to get as int value")

diff --git a/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/TopologicalSortingUtilsTest.kt b/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/TopologicalSortingUtilsTest.kt
index 907eb2e0..3fa4f75d 100644
--- a/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/TopologicalSortingUtilsTest.kt
+++ b/ms/controllerblueprints/modules/core/src/test/kotlin/org/onap/ccsdk/apps/controllerblueprints/core/utils/TopologicalSortingUtilsTest.kt
@@ -22,7 +22,7 @@ class TopologicalSortingUtilsTest {
     

     @Test

     fun testSorting(): Unit {

-        val graph: TopologicalSortingUtils<String> = TopologicalSortingUtils<String>()

+        val graph: TopologicalSortingUtils<String> = TopologicalSortingUtils()

         graph.add("bundle-id", "bundle-mac")

         graph.add("bundle-id", "bundle-ip")

         graph.add("bundle-mac", "bundle-ip")