From 4d7d6d918a724e9c83692bf8e5c7a491f073d970 Mon Sep 17 00:00:00 2001
From: Alexis de Talhouët <adetalhouet89@gmail.com>
Date: Mon, 11 Feb 2019 17:23:48 -0500
Subject: Fixes: manual integration test of CDS
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- support to overwrite cba
- fix map to json
- finish meshing
- fix python context not having the bluePrintRuntimeService injected
- load all properties in the properties store

Issue-ID: CCSDK-414
Change-Id: I6b65201529d0ffd9c3e18023a33e0081236b01de
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
---
 .../baseconfiguration/Definitions/activation-blueprint.json    | 10 +++++-----
 .../baseconfiguration/Definitions/node_types.json              |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'components/model-catalog/blueprint-model/test-blueprint')

diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json
index 822cc68b7..5af64caa7 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json
@@ -106,9 +106,9 @@
         }
       },
       "resource-assignment": {
-        "type": "component-resource-assignment",
+        "type": "component-resource-resolution",
         "interfaces": {
-          "ResourceAssignmentComponent": {
+          "ResourceResolutionComponent": {
             "operations": {
               "process": {
                 "inputs": {
@@ -151,9 +151,9 @@
         }
       },
       "resource-assignment-py": {
-        "type": "component-resource-assignment",
+        "type": "component-resource-resolution",
         "interfaces": {
-          "ResourceAssignmentComponent": {
+          "ResourceResolutionComponent": {
             "operations": {
               "process": {
                 "implementation": {
@@ -182,7 +182,7 @@
       "activate-jython": {
         "type": "component-jython-executor",
         "interfaces": {
-          "JythonExecutorComponent": {
+          "ComponentJythonExecutor": {
             "operations": {
               "process": {
                 "implementation": {
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
index f7970bfbd..400db435c 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/node_types.json
@@ -91,7 +91,7 @@
       },
       "derived_from": "tosca.nodes.component.Jython"
     },
-    "component-resource-assignment": {
+    "component-resource-resolution": {
       "description": "This is Resource Assignment Component API",
       "version": "1.0.0",
       "attributes": {
@@ -101,7 +101,7 @@
         }
       },
       "interfaces": {
-        "ResourceAssignmentComponent": {
+        "ResourceResolutionComponent": {
           "operations": {
             "process": {
               "inputs": {
@@ -158,7 +158,7 @@
         }
       },
       "interfaces": {
-        "JythonExecutorComponent": {
+        "ComponentJythonExecutor": {
           "operations": {
             "process": {
               "inputs": {
-- 
cgit 1.2.3-korg