Fixes: manual integration test of CDS

- 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>

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 822cc68..5af64ca 100644 (file)
--- 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 f7970bf..400db43 100644 (file)
--- 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": {

diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-jython-executor.json b/components/model-catalog/definition-type/starter-type/node_type/component-jython-executor.json
index 4959a9d..af8aae1 100644 (file)
--- a/components/model-catalog/definition-type/starter-type/node_type/component-jython-executor.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/component-jython-executor.json
@@ -7,7 +7,7 @@
     }
   },
   "interfaces": {
-    "JythonExecutorComponent": {
+    "ComponentJythonExecutor": {
       "operations": {
         "process": {
           "inputs": {

diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-resource-assignment.json b/components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json
similarity index 90%
rename from components/model-catalog/definition-type/starter-type/node_type/component-resource-assignment.json
rename to components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json
index 38fc97d..d01660e 100644 (file)
--- a/components/model-catalog/definition-type/starter-type/node_type/component-resource-assignment.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/component-resource-resolution.json
@@ -1,82 +1,82 @@
-{\r
-  "description": "This is Resource Assignment Component API",\r
-  "version": "1.0.0",\r
-  "attributes": {\r
-    "assignment-params": {\r
-      "required": true,\r
-      "type": "string"\r
-    }\r
-  },\r
-  "capabilities": {\r
-    "component-node": {\r
-      "type": "tosca.capabilities.Node"\r
-    }\r
-  },\r
-  "interfaces": {\r
-    "ResourceAssignmentComponent": {\r
-      "operations": {\r
-        "process": {\r
-          "inputs": {\r
-            "template-name": {\r
-              "description": "Service Template Name.",\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "template-version": {\r
-              "description": "Service Template Version.",\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "resource-type": {\r
-              "description": "Request type.",\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "template-names": {\r
-              "description": "Name of the artifact Node Templates, to get the template Content.",\r
-              "required": true,\r
-              "type": "list",\r
-              "entry_schema": {\r
-                "type": "string"\r
-              }\r
-            },\r
-            "artifact-prefix-names": {\r
-              "required": false,\r
-              "description": "Template , Resource Assignment Artifact Prefix names",\r
-              "type": "list",\r
-              "entry_schema": {\r
-                "type": "string"\r
-              }\r
-            },\r
-            "request-id": {\r
-              "description": "Request Id, Unique Id for the request.",\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "resource-id": {\r
-              "description": "Resource Id.",\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "action-name": {\r
-              "description": "Action Name of the process",\r
-              "required": true,\r
-              "type": "string"\r
-            }\r
-          },\r
-          "outputs": {\r
-            "resource-assignment-params": {\r
-              "required": true,\r
-              "type": "string"\r
-            },\r
-            "status": {\r
-              "required": true,\r
-              "type": "string"\r
-            }\r
-          }\r
-        }\r
-      }\r
-    }\r
-  },\r
-  "derived_from": "tosca.nodes.Component"\r
+{
+  "description": "This is Resource Assignment Component API",
+  "version": "1.0.0",
+  "attributes": {
+    "assignment-params": {
+      "required": true,
+      "type": "string"
+    }
+  },
+  "capabilities": {
+    "component-node": {
+      "type": "tosca.capabilities.Node"
+    }
+  },
+  "interfaces": {
+    "ResourceResolutionComponent": {
+      "operations": {
+        "process": {
+          "inputs": {
+            "template-name": {
+              "description": "Service Template Name.",
+              "required": true,
+              "type": "string"
+            },
+            "template-version": {
+              "description": "Service Template Version.",
+              "required": true,
+              "type": "string"
+            },
+            "resource-type": {
+              "description": "Request type.",
+              "required": true,
+              "type": "string"
+            },
+            "template-names": {
+              "description": "Name of the artifact Node Templates, to get the template Content.",
+              "required": true,
+              "type": "list",
+              "entry_schema": {
+                "type": "string"
+              }
+            },
+            "artifact-prefix-names": {
+              "required": false,
+              "description": "Template , Resource Assignment Artifact Prefix names",
+              "type": "list",
+              "entry_schema": {
+                "type": "string"
+              }
+            },
+            "request-id": {
+              "description": "Request Id, Unique Id for the request.",
+              "required": false,
+              "type": "string"
+            },
+            "resource-id": {
+              "description": "Resource Id.",
+              "required": false,
+              "type": "string"
+            },
+            "action-name": {
+              "description": "Action Name of the process",
+              "required": false,
+              "type": "string"
+            }
+          },
+          "outputs": {
+            "resource-assignment-params": {
+              "required": true,
+              "type": "string"
+            },
+            "status": {
+              "required": true,
+              "type": "string"
+            }
+          }
+        }
+      }
+    }
+  },
+  "derived_from": "tosca.nodes.Component"
 }
\ No newline at end of file