Update starter-type

Change-Id: Ib9ed9aaa75896ad7870778420cd09e997dbbf592
Issue-ID: CCSDK-1181
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json
index 4484d55..e1d9be0 100644 (file)
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Definitions/vFW_spinup.json
@@ -3318,7 +3318,7 @@
       "version": "1.0.0",
       "derived_from": "tosca.nodes.Root"
     },
-    "tosca.nodes.DG": {
+    "tosca.nodes.Workflow": {
       "description": "This is Directed Graph Node Type",
       "version": "1.0.0",
       "derived_from": "tosca.nodes.Root"
@@ -3459,7 +3459,7 @@
           }
         }
       },
-      "derived_from": "tosca.nodes.DG"
+      "derived_from": "tosca.nodes.Workflow"
     },
     "artifact-config-template": {
       "description": "This is Configuration Velocity Template",

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 68a8ae6..3658a26 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
@@ -203,7 +203,7 @@
           }
         }
       },
-      "derived_from": "tosca.nodes.DG"
+      "derived_from": "tosca.nodes.Workflow"
     },
     "source-input": {
       "description": "This is Input Resource Source Node Type",
@@ -341,7 +341,7 @@
       "version": "1.0.0",
       "derived_from": "tosca.nodes.Root"
     },
-    "tosca.nodes.DG": {
+    "tosca.nodes.Workflow": {
       "description": "This is Directed Graph Node Type",
       "version": "1.0.0",
       "derived_from": "tosca.nodes.Root"

diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/node_types.json
index b40c8cb..7e78a42 100755 (executable)
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_python/Definitions/node_types.json
@@ -139,7 +139,7 @@
           }
         }
       },
-      "derived_from" : "tosca.nodes.DG"
+      "derived_from" : "tosca.nodes.Workflow"
     },
     "source-input" : {
       "description" : "This is Input Resource Source Node Type",
@@ -164,7 +164,7 @@
       "version" : "1.0.0",
       "derived_from" : "tosca.nodes.Root"
     },
-    "tosca.nodes.DG" : {
+    "tosca.nodes.Workflow" : {
       "description" : "This is Directed Graph Node Type",
       "version" : "1.0.0",
       "derived_from" : "tosca.nodes.Root"

diff --git a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json
index ed7c580..4a00417 100644 (file)
--- a/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/capability_restconf/Definitions/node_types.json
@@ -155,7 +155,7 @@
           }
         }
       },
-      "derived_from" : "tosca.nodes.DG"
+      "derived_from" : "tosca.nodes.Workflow"
     },
     "source-input" : {
       "description" : "This is Input Resource Source Node Type",
@@ -180,7 +180,7 @@
       "version" : "1.0.0",
       "derived_from" : "tosca.nodes.Root"
     },
-    "tosca.nodes.DG" : {
+    "tosca.nodes.Workflow" : {
       "description" : "This is Directed Graph Node Type",
       "version" : "1.0.0",
       "derived_from" : "tosca.nodes.Root"

diff --git a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/artifact_types.json b/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/artifact_types.json
deleted file mode 100644 (file)
index eadc848..0000000
--- a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/artifact_types.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "artifact_types" : { }
-}
\ No newline at end of file

diff --git a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/component_invoke.json b/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/component_invoke.json
deleted file mode 100644 (file)
index 9e040b8..0000000
--- a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/component_invoke.json
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  "tosca_definitions_version": "controller_blueprint_1_0_0",
-  "metadata": {
-    "template_author": "Brinda Santh <brindasanth@in.ibm.com>",
-    "template_name": "component_invoke",
-    "template_version": "1.0.0",
-    "template_tags": "brinda, component_invoke"
-  },
-  "imports": [
-    {
-      "file": "Definitions/data_types.json"
-    },
-    {
-      "file": "Definitions/relationship_types.json"
-    },
-    {
-      "file": "Definitions/artifact_types.json"
-    },
-    {
-      "file": "Definitions/node_types.json"
-    },
-    {
-      "file": "Definitions/policy_types.json"
-    }
-  ],
-  "topology_template": {
-    "workflows": {
-      "component-invoke": {
-        "steps": {
-          "activate-process": {
-            "description": "Sample Component Invocation flow",
-            "target": "sample-component",
-            "activities": [
-              {
-                "call_operation": "sample-component"
-              }
-            ]
-          }
-        },
-        "inputs": {
-          "request-id": {
-            "required": true,
-            "type": "string"
-          },
-          "action-name": {
-            "required": true,
-            "type": "string"
-          },
-          "scope-type": {
-            "required": true,
-            "type": "string"
-          },
-          "hostname": {
-            "required": true,
-            "type": "string"
-          }
-        },
-        "outputs": {
-          "response-property1": {
-            "type": "string",
-            "value": "executed"
-          },
-          "response-property2": {
-            "type": "string",
-            "value": {
-              "get_input": "action-name"
-            }
-          }
-        }
-      }
-    },
-    "node_templates": {
-      "sample-component": {
-        "type": "component-sample-executor",
-        "interfaces": {
-          "ComponentSampleExecutor": {
-            "operations": {
-              "process": {
-                "inputs": {
-                  "sample-property": "sample-value",
-                  "sample-list-property": [
-                    "json-parser-service"
-                  ],
-                  "dynamic-properties": {
-                    "prop1": "prop1-value",
-                    "prop2": "prop2-value"
-                  }
-                },
-                "outputs": {
-                  "response-data": "",
-                  "status": ""
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-  }
-}
\ No newline at end of file

diff --git a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/data_types.json b/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/data_types.json
deleted file mode 100644 (file)
index 8c304c4..0000000
--- a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/data_types.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "data_types" : { }
-}
\ No newline at end of file

diff --git a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/node_types.json
deleted file mode 100644 (file)
index 1e02cef..0000000
--- a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/node_types.json
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  "node_types": {
-    "component-sample-executor": {
-      "description": "This is Sample Component API",
-      "version": "1.0.0",
-      "interfaces": {
-        "ComponentSampleExecutor": {
-          "operations": {
-            "process": {
-              "inputs": {
-                "sample-property": {
-                  "description": "Sample Property.",
-                  "required": true,
-                  "type": "string"
-                },
-                "sample-list-property": {
-                  "description": "Dependent Step Components NodeTemplate name.",
-                  "required": true,
-                  "type": "list",
-                  "entry_schema": {
-                    "type": "string"
-                  }
-                },
-                "dynamic-properties": {
-                  "description": "Dynamic Json Content or DSL Json reference.",
-                  "required": false,
-                  "type": "json"
-                }
-              },
-              "outputs": {
-                "response-data": {
-                  "description": "Execution Response Data in JSON format.",
-                  "required": false,
-                  "type": "string"
-                },
-                "status": {
-                  "description": "Status of the Component Execution ( success or failure )",
-                  "required": true,
-                  "type": "string"
-                }
-              }
-            }
-          }
-        }
-      },
-      "derived_from": "tosca.nodes.Component"
-    },
-    "tosca.nodes.Component": {
-      "description": "This is default Component Node",
-      "version": "1.0.0",
-      "derived_from": "tosca.nodes.Root"
-    }
-  }
-}
\ No newline at end of file

diff --git a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/policy_types.json b/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/policy_types.json
deleted file mode 100644 (file)
index 1e44cc7..0000000
--- a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/policy_types.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "policy_types" : { }
-}
\ No newline at end of file

diff --git a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/relationship_types.json b/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/relationship_types.json
deleted file mode 100644 (file)
index 4ddd7a5..0000000
--- a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/relationship_types.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "relationship_types" : { }
-}
\ No newline at end of file

diff --git a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/resources_definition_types.json
deleted file mode 100644 (file)
index 6f31cf5..0000000
--- a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/Definitions/resources_definition_types.json
+++ /dev/null
@@ -1 +0,0 @@
-{ }
\ No newline at end of file

diff --git a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/TOSCA-Metadata/TOSCA.meta b/components/model-catalog/blueprint-model/test-blueprint/component_invoke/TOSCA-Metadata/TOSCA.meta
deleted file mode 100644 (file)
index a7c130a..0000000
--- a/components/model-catalog/blueprint-model/test-blueprint/component_invoke/TOSCA-Metadata/TOSCA.meta
+++ /dev/null
@@ -1,5 +0,0 @@
-TOSCA-Meta-File-Version: 1.0.0
-CSAR-Version: 1.0
-Created-By: Brinda Santh <brindasanth@in.ibm.com>
-Entry-Definitions: Definitions/component_invoke.json
-Template-Tags: Brinda Santh, component_invoke
\ No newline at end of file

diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json
index f143e56..c1cded2 100644 (file)
--- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/node_types.json
@@ -162,7 +162,7 @@
           }
         }
       },
-      "derived_from" : "tosca.nodes.DG"
+      "derived_from" : "tosca.nodes.Workflow"
     },
     "source-capability" : {
       "description" : "This is Component Resource Source Node Type",
@@ -353,7 +353,7 @@
       "version" : "1.0.0",
       "derived_from" : "tosca.nodes.Root"
     },
-    "tosca.nodes.DG" : {
+    "tosca.nodes.Workflow" : {
       "description" : "This is Directed Graph Node Type",
       "version" : "1.0.0",
       "derived_from" : "tosca.nodes.Root"

diff --git a/components/model-catalog/definition-type/starter-type/node_type/artifact-config-template.json b/components/model-catalog/definition-type/starter-type/node_type/artifact-config-template.json
deleted file mode 100644 (file)
index af99d75..0000000
--- a/components/model-catalog/definition-type/starter-type/node_type/artifact-config-template.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{\r
-       "description": "This is Configuration Velocity Template",\r
-       "version": "1.0.0",\r
-       "properties": {\r
-               "action-names": {\r
-                       "required": true,\r
-                       "type": "list",\r
-                       "entry_schema": {\r
-                               "type": "string"\r
-                       }\r
-               }\r
-       },\r
-       "capabilities": {\r
-               "content": {\r
-                       "type": "tosca.capabilities.Content",\r
-                       "properties": {\r
-                               "content": {\r
-                                       "required": true,\r
-                                       "type": "string"\r
-                               }\r
-                       }\r
-               },\r
-               "mapping": {\r
-                       "type": "tosca.capabilities.Mapping",\r
-                       "properties": {\r
-                               "mapping": {\r
-                                       "required": false,\r
-                                       "type": "list",\r
-                                       "entry_schema": {\r
-                                               "type": "datatype-resource-assignment"\r
-                                       }\r
-                               }\r
-                       }\r
-               }\r
-       },\r
-       "derived_from": "tosca.nodes.Artifact"\r
-}
\ No newline at end of file

diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-config-generator.json b/components/model-catalog/definition-type/starter-type/node_type/component-config-generator.json
deleted file mode 100644 (file)
index 263882a..0000000
--- a/components/model-catalog/definition-type/starter-type/node_type/component-config-generator.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{\r
-       "description": "This is Generate Configuration Component API",\r
-       "version": "1.0.0",\r
-       "capabilities": {\r
-               "component-node": {\r
-                       "type": "tosca.capabilities.Node"\r
-               }\r
-       },\r
-       "interfaces": {\r
-               "ConfigGeneratorComponent": {\r
-                       "operations": {\r
-                               "process": {\r
-                                       "inputs": {\r
-                                               "template-data": {\r
-                                                       "description": "Conditional : JSON string which is used to mash with template. Either template-data or ( resource-id and resource-type ) should be present",\r
-                                                       "required": false,\r
-                                                       "type": "string"\r
-                                               },\r
-                                               "template-content": {\r
-                                                       "description": "Conditional : Dynamic Template used to generate Configuration.",\r
-                                                       "required": false,\r
-                                                       "type": "string"\r
-                                               },\r
-                                               "resource-type": {\r
-                                                       "description": "Conditional : resource-type used to pull the data content from the data base. Either template-data or ( resource-id and resource-type ) should be present",\r
-                                                       "required": false,\r
-                                                       "type": "string"\r
-                                               },\r
-                                               "request-id": {\r
-                                                       "description": "Request Id used to store the generated configuration, in the database along with the template-name",\r
-                                                       "required": true,\r
-                                                       "type": "string"\r
-                                               },\r
-                                               "resource-id": {\r
-                                                       "description": "Conditional : Id used to pull the data content from the data base. Either template-data or ( resource-id and resource-type ) should be present",\r
-                                                       "required": false,\r
-                                                       "type": "string"\r
-                                               },\r
-                                               "action-name": {\r
-                                                       "description": "Conditional : Action Name to get from Database, Either (message & mask-info ) or ( resource-id & resource-type & action-name & template-name ) should be present. Message will be given higest priority",\r
-                                                       "required": false,\r
-                                                       "type": "string"\r
-                                               },\r
-                                               "template-name": {\r
-                                                       "description": "Conditional : Name of the Artifact Node Template, to get the template Content. If template-content is present, then content wont be reterived from the Artifact Node Template.",\r
-                                                       "required": true,\r
-                                                       "type": "string"\r
-                                               }\r
-                                       },\r
-                                       "outputs": {\r
-                                               "generated-config": {\r
-                                                       "description": "Generated Configuration for the Template adn Resource Data",\r
-                                                       "required": true,\r
-                                                       "type": "string"\r
-                                               },\r
-                                               "mask-info": {\r
-                                                       "description": "If template contains mask encription keys, then this mask-info field will be generated, This JSON Content alligns to the bean org.onap.ccsdk.cds.controllerblueprints.core.data.custom.MaskInfo ",\r
-                                                       "required": false,\r
-                                                       "type": "string"\r
-                                               },\r
-                                               "status": {\r
-                                                       "description": "Status of the Component Execution ( success or failure )",\r
-                                                       "required": true,\r
-                                                       "type": "string"\r
-                                               }\r
-                                       }\r
-                               }\r
-                       }\r
-               }\r
-       },\r
-       "derived_from": "tosca.nodes.Component"\r
-}
\ No newline at end of file

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 5a024a7..b78a7c6 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
@@ -41,5 +41,5 @@
       }
     }
   },
-  "derived_from": "tosca.nodes.component.Jython"
+  "derived_from": "tosca.nodes.Component"
 }
\ No newline at end of file

diff --git a/components/model-catalog/definition-type/starter-type/node_type/component-sample-executor.json b/components/model-catalog/definition-type/starter-type/node_type/component-sample-executor.json
deleted file mode 100644 (file)
index 68b3ebd..0000000
--- a/components/model-catalog/definition-type/starter-type/node_type/component-sample-executor.json
+++ /dev/null
@@ -1,45 +0,0 @@
-{
-  "description": "This is Sample Component API",
-  "version": "1.0.0",
-  "interfaces": {
-    "ComponentSampleExecutor": {
-      "operations": {
-        "process": {
-          "inputs": {
-            "sample-property": {
-              "description": "Sample Property.",
-              "required": true,
-              "type": "string"
-            },
-            "sample-list-property": {
-              "required": true,
-              "description": "Dependent Step Components NodeTemplate name.",
-              "type": "list",
-              "entry_schema": {
-                "type": "string"
-              }
-            },
-            "dynamic-properties": {
-              "description": "Dynamic Json Content or DSL Json reference.",
-              "required": false,
-              "type": "json"
-            }
-          },
-          "outputs": {
-            "response-data": {
-              "description": "Execution Response Data in JSON format.",
-              "required": false,
-              "type": "string"
-            },
-            "status": {
-              "description": "Status of the Component Execution ( success or failure )",
-              "required": true,
-              "type": "string"
-            }
-          }
-        }
-      }
-    }
-  },
-  "derived_from": "tosca.nodes.Component"
-}
\ No newline at end of file

diff --git a/components/model-catalog/definition-type/starter-type/node_type/dg-generic.json b/components/model-catalog/definition-type/starter-type/node_type/dg-generic.json
index ec9904b..23aa63e 100644 (file)
--- a/components/model-catalog/definition-type/starter-type/node_type/dg-generic.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/dg-generic.json
@@ -15,5 +15,5 @@
       }
     }
   },
-  "derived_from": "tosca.nodes.DG"
+  "derived_from": "tosca.nodes.Workflow"
 }
\ No newline at end of file

diff --git a/components/model-catalog/definition-type/starter-type/node_type/source-default.json b/components/model-catalog/definition-type/starter-type/node_type/source-default.json
index 13e234e..3e7d14c 100644 (file)
--- a/components/model-catalog/definition-type/starter-type/node_type/source-default.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/source-default.json
@@ -1,18 +1,6 @@
 {
   "description": "This is Default Resource Source Node Type",
   "version": "1.0.0",
-  "properties": {
-    "key": {
-      "required": false,
-      "type": "string"
-    },
-    "key-dependencies": {
-      "required": true,
-      "type": "list",
-      "entry_schema": {
-        "type": "string"
-      }
-    }
-  },
+  "properties": { },
   "derived_from": "tosca.nodes.ResourceSource"
 }
\ No newline at end of file

diff --git a/components/model-catalog/definition-type/starter-type/node_type/source-input.json b/components/model-catalog/definition-type/starter-type/node_type/source-input.json
index 126ea30..bf84481 100644 (file)
--- a/components/model-catalog/definition-type/starter-type/node_type/source-input.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/source-input.json
@@ -1,18 +1,6 @@
 {
   "description": "This is Input Resource Source Node Type",
   "version": "1.0.0",
-  "properties": {
-    "key": {
-      "required": false,
-      "type": "string"
-    },
-    "key-dependencies": {
-      "required": true,
-      "type": "list",
-      "entry_schema": {
-        "type": "string"
-      }
-    }
-  },
+  "properties": { },
   "derived_from": "tosca.nodes.ResourceSource"
 }
\ No newline at end of file

diff --git a/components/model-catalog/definition-type/starter-type/node_type/source-primary-db.json b/components/model-catalog/definition-type/starter-type/node_type/source-primary-db.json
index 702748f..6f03dbf 100644 (file)
--- a/components/model-catalog/definition-type/starter-type/node_type/source-primary-db.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/source-primary-db.json
@@ -4,12 +4,12 @@
   "properties": {
     "type": {
       "required": true,
+      "default": "SQL",
       "type": "string",
       "constraints": [
         {
           "valid_values": [
-            "SQL",
-            "PLSQL"
+            "SQL"
           ]
         }
       ]

diff --git a/components/model-catalog/definition-type/starter-type/node_type/source-rest.json b/components/model-catalog/definition-type/starter-type/node_type/source-rest.json
index b28e934..f9995a8 100644 (file)
--- a/components/model-catalog/definition-type/starter-type/node_type/source-rest.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/source-rest.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "properties": {
     "type": {
-      "required": false,
+      "required": true,
       "type": "string",
       "default": "JSON",
       "constraints": [
@@ -15,7 +15,7 @@
       ]
     },
     "verb": {
-      "required": false,
+      "required": true,
       "type": "string",
       "default": "GET",
       "constraints": [

diff --git a/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.DG.json b/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.Workflow.json
similarity index 95%
rename from components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.DG.json
rename to components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.Workflow.json
index 86728cf..eb8cac0 100644 (file)
--- a/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.DG.json
+++ b/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.Workflow.json
@@ -1,5 +1,5 @@
-{\r
-  "description": "This is Directed Graph Node Type",\r
-  "version": "1.0.0",\r
-  "derived_from": "tosca.nodes.Root"\r
+{
+  "description": "This is Directed Graph Node Type",
+  "version": "1.0.0",
+  "derived_from": "tosca.nodes.Root"
 }
\ No newline at end of file

diff --git a/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Jython.json b/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Jython.json
deleted file mode 100644 (file)
index 8e194f6..0000000
--- a/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Jython.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{\r
-  "description": "This is Jython Component",\r
-  "version": "1.0.0",\r
-  "derived_from": "tosca.nodes.Root"\r
-}
\ No newline at end of file

diff --git a/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Kotlin.json b/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Kotlin.json
deleted file mode 100644 (file)
index 381ed59..0000000
--- a/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Kotlin.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "description": "This is Kotlin Component",
-  "version": "1.0.0",
-  "derived_from": "tosca.nodes.Root"
-}
\ No newline at end of file

diff --git a/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Python.json b/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Python.json
deleted file mode 100644 (file)
index 7b67c8c..0000000
--- a/components/model-catalog/definition-type/starter-type/node_type/tosca.nodes.component.Python.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{\r
-  "description": "This is Python Component",\r
-  "version": "1.0.0",\r
-  "derived_from": "tosca.nodes.Root"\r
-}
\ No newline at end of file

diff --git a/ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/test-cba.zip b/ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/test-cba.zip
index 9074824..785ec6c 100644 (file)
Binary files a/ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/test-cba.zip and b/ms/blueprintsprocessor/modules/commons/db-lib/src/test/resources/test-cba.zip differ

diff --git a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/resources/test-cba.zip b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/resources/test-cba.zip
index 9074824..785ec6c 100644 (file)
Binary files a/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/resources/test-cba.zip and b/ms/blueprintsprocessor/modules/inbounds/selfservice-api/src/test/resources/test-cba.zip differ

diff --git a/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/cds/blueprintsprocessor/services/workflow/BluePrintWorkflowExecutionServiceImpl.kt b/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/cds/blueprintsprocessor/services/workflow/BluePrintWorkflowExecutionServiceImpl.kt
index d8aefe9..b186174 100644 (file)
--- a/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/cds/blueprintsprocessor/services/workflow/BluePrintWorkflowExecutionServiceImpl.kt
+++ b/ms/blueprintsprocessor/modules/services/workflow-service/src/main/kotlin/org/onap/cds/blueprintsprocessor/services/workflow/BluePrintWorkflowExecutionServiceImpl.kt
@@ -59,7 +59,7 @@ open class BluePrintWorkflowExecutionServiceImpl(
                 componentWorkflowExecutionService
                         .executeBluePrintWorkflow(bluePrintRuntimeService, executionServiceInput, properties)
             }
-            derivedFrom.startsWith(BluePrintConstants.MODEL_TYPE_NODE_DG, true) -> {
+            derivedFrom.startsWith(BluePrintConstants.MODEL_TYPE_NODE_WORKFLOW, true) -> {
                 dgWorkflowExecutionService
                         .executeBluePrintWorkflow(bluePrintRuntimeService, executionServiceInput, properties)
             }

diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-activate-netconf.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-activate-netconf.json
index 57667de..c17a36c 100644 (file)
--- a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-activate-netconf.json
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-activate-netconf.json
@@ -48,5 +48,5 @@
                }
        },
        
-       "derived_from": "tosca.nodes.DG"
+       "derived_from": "tosca.nodes.Workflow"
 }
\ No newline at end of file

diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-config-generator.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-config-generator.json
index 679c464..4d5343c 100644 (file)
--- a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-config-generator.json
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-config-generator.json
@@ -47,5 +47,5 @@
                        }
                }
        },
-       "derived_from": "tosca.nodes.DG"
+       "derived_from": "tosca.nodes.Workflow"
 }
\ No newline at end of file

diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assign-activate.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assign-activate.json
index 87b052b..f444864 100644 (file)
--- a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assign-activate.json
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assign-activate.json
@@ -52,5 +52,5 @@
                        }
                }
        },
-       "derived_from": "tosca.nodes.DG"
+       "derived_from": "tosca.nodes.Workflow"
 }
\ No newline at end of file

diff --git a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assignment.json b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assignment.json
index 9de599b..d13668a 100644 (file)
--- a/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assignment.json
+++ b/ms/controllerblueprints/modules/blueprint-core/load/model_type/node_type/dg-resource-assignment.json
@@ -47,5 +47,5 @@
                        }
                }
        },
-       "derived_from": "tosca.nodes.DG"
+       "derived_from": "tosca.nodes.Workflow"
 }
\ No newline at end of file

diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintConstants.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintConstants.kt
index e30c1b4..23c52b4 100644 (file)
--- a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintConstants.kt
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintConstants.kt
@@ -98,7 +98,7 @@ object BluePrintConstants {
     const val MODEL_TYPE_RELATIONSHIPS_ATTACH_TO = "tosca.relationships.AttachesTo"
     const val MODEL_TYPE_RELATIONSHIPS_ROUTES_TO = "tosca.relationships.RoutesTo"
 
-    const val MODEL_TYPE_NODE_DG = "tosca.nodes.DG"
+    const val MODEL_TYPE_NODE_WORKFLOW = "tosca.nodes.Workflow"
     const val MODEL_TYPE_NODE_COMPONENT = "tosca.nodes.Component"
     const val MODEL_TYPE_NODE_VNF = "tosca.nodes.Vnf"
     const val MODEL_TYPE_NODE_RESOURCE_SOURCE = "tosca.nodes.ResourceSource"

diff --git a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintTypes.kt b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintTypes.kt
index 4e89907..30ac68a 100644 (file)
--- a/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintTypes.kt
+++ b/ms/controllerblueprints/modules/blueprint-core/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/core/BluePrintTypes.kt
@@ -29,7 +29,7 @@ object BluePrintTypes {
     @JvmStatic
     val validNodeTypeDerivedFroms: MutableList<String> = arrayListOf(
             BluePrintConstants.MODEL_TYPE_NODES_ROOT,
-            BluePrintConstants.MODEL_TYPE_NODE_DG,
+            BluePrintConstants.MODEL_TYPE_NODE_WORKFLOW,
             BluePrintConstants.MODEL_TYPE_NODE_COMPONENT,
             BluePrintConstants.MODEL_TYPE_NODE_VNF,
             BluePrintConstants.MODEL_TYPE_NODE_RESOURCE_SOURCE,

diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintWorkflowValidatorImpl.kt b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintWorkflowValidatorImpl.kt
index a7dbbf8..13307fd 100644 (file)
--- a/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintWorkflowValidatorImpl.kt
+++ b/ms/controllerblueprints/modules/blueprint-validation/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintWorkflowValidatorImpl.kt
@@ -66,10 +66,10 @@ open class BluePrintWorkflowValidatorImpl(private val bluePrintTypeValidatorServ
 
                     val nodeTypeDerivedFrom = bluePrintRuntimeService.bluePrintContext().nodeTemplateNodeType(it).derivedFrom
 
-                    check(nodeTypeDerivedFrom == BluePrintConstants.MODEL_TYPE_NODE_DG
+                    check(nodeTypeDerivedFrom == BluePrintConstants.MODEL_TYPE_NODE_WORKFLOW
                             || nodeTypeDerivedFrom == BluePrintConstants.MODEL_TYPE_NODE_COMPONENT) {
                         "NodeType(${nodeTemplate.type}) derived from is '$nodeTypeDerivedFrom', Expected " +
-                                "'${BluePrintConstants.MODEL_TYPE_NODE_DG}' or '${BluePrintConstants.MODEL_TYPE_NODE_COMPONENT}'"
+                                "'${BluePrintConstants.MODEL_TYPE_NODE_WORKFLOW}' or '${BluePrintConstants.MODEL_TYPE_NODE_COMPONENT}'"
                     }
                 } catch (e: Exception) {
                     bluePrintRuntimeService.getBluePrintError()

diff --git a/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDesignTimeValidatorServiceTest.kt b/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDesignTimeValidatorServiceTest.kt
index e12236d..9dbd19e 100644 (file)
--- a/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDesignTimeValidatorServiceTest.kt
+++ b/ms/controllerblueprints/modules/blueprint-validation/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/validation/BluePrintDesignTimeValidatorServiceTest.kt
@@ -92,7 +92,7 @@ class BluePrintDesignTimeValidatorServiceTest {
         assertEquals(1, bluePrintRuntime.getBluePrintError().errors.size)
         assertEquals("Failed to validate Workflow(resource-assignment)'s step(test)'s definition : " +
                 "resource-assignment/steps/test : NodeType(TestNodeType) derived from is 'tosca.nodes.TEST', " +
-                "Expected 'tosca.nodes.DG' or 'tosca.nodes.Component'", bluePrintRuntime.getBluePrintError().errors[0])
+                "Expected 'tosca.nodes.Workflow' or 'tosca.nodes.Component'", bluePrintRuntime.getBluePrintError().errors[0])
     }
 
     @Test

diff --git a/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintWorkflowEnhancerImpl.kt b/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintWorkflowEnhancerImpl.kt
index 8379e50..02e1052 100644 (file)
--- a/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintWorkflowEnhancerImpl.kt
+++ b/ms/controllerblueprints/modules/service/src/main/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintWorkflowEnhancerImpl.kt
@@ -103,7 +103,7 @@ open class BluePrintWorkflowEnhancerImpl(private val bluePrintRepoService: BlueP
             derivedFrom.startsWith(BluePrintConstants.MODEL_TYPE_NODE_COMPONENT, true) -> {
                 // DO Nothing
             }
-            derivedFrom.startsWith(BluePrintConstants.MODEL_TYPE_NODE_DG, true) -> {
+            derivedFrom.startsWith(BluePrintConstants.MODEL_TYPE_NODE_WORKFLOW, true) -> {
                 enhanceDGStepTargets(name, workflow, firstNodeTemplateName)
             }
             else -> {

diff --git a/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json b/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json
index 5b5332f..c482b9b 100644 (file)
--- a/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json
+++ b/ms/controllerblueprints/modules/service/src/main/resources/service_template/default_netconf.json
@@ -426,7 +426,7 @@
                                        }\r
                                }\r
                        },\r
-                       "derived_from": "tosca.nodes.DG"\r
+                       "derived_from": "tosca.nodes.Workflow"\r
                },\r
                "dg-activate-netconf": {\r
                        "description": "This is Download Netconf Directed Graph",\r
@@ -477,7 +477,7 @@
                                        }\r
                                }\r
                        },\r
-                       "derived_from": "tosca.nodes.DG"\r
+                       "derived_from": "tosca.nodes.Workflow"\r
                },\r
                "artifact-config-template": {\r
                        "description": "This is Configuration Velocity Template",\r

diff --git a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt
index 677dd45..23c541d 100644 (file)
--- a/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt
+++ b/ms/controllerblueprints/modules/service/src/test/kotlin/org/onap/ccsdk/cds/controllerblueprints/service/enhancer/BluePrintEnhancerServiceImplTest.kt
@@ -68,13 +68,6 @@ class BluePrintEnhancerServiceImplTest {
         testComponentInvokeEnhancementAndValidation(basePath, "base-enhance")
     }
 
-    @Test
-    @Throws(Exception::class)
-    fun testComponentInvokeEnhancementAndValidation() {
-        val basePath = "./../../../../components/model-catalog/blueprint-model/test-blueprint/component_invoke"
-        testComponentInvokeEnhancementAndValidation(basePath, "component-enhance")
-    }
-
     @Test
     @Throws(Exception::class)
     fun testGoldenEnhancementAndValidation() {