aboutsummaryrefslogtreecommitdiffstats
path: root/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration
diff options
context:
space:
mode:
authorMuthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>2018-12-13 11:34:49 -0500
committerMuthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>2018-12-13 11:34:49 -0500
commit28c81bf300978b23260ea853afd056da9041ca41 (patch)
treea5e4157d5ee0b4e132035801df98dfd2d76546ab /components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration
parentb8f16f15fa937db113dbe2e3b3438469fa284a71 (diff)
Implement Blueprint Workflow Enhancement
Change-Id: I64d6e949e9a4bc2100b49fedb3781b04c1c03f43 Issue-ID: CCSDK-722 Signed-off-by: Muthuramalingam, Brinda Santh(bs2796) <bs2796@att.com>
Diffstat (limited to 'components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration')
-rw-r--r--components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/activation-blueprint.json41
-rw-r--r--components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/data_types.json27
-rw-r--r--components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json8
-rw-r--r--components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/policy_types.json4
4 files changed, 47 insertions, 33 deletions
diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/activation-blueprint.json
index f756ef7e..ec229df2 100644
--- a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/activation-blueprint.json
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/activation-blueprint.json
@@ -12,10 +12,13 @@
"file": "Definitions/data_types.json"
},
{
+ "file": "Definitions/artifact_types.json"
+ },
+ {
"file": "Definitions/node_types.json"
},
{
- "file": "Definitions/artifact_types.json"
+ "file": "Definitions/policy_types.json"
}
],
"topology_template": {
@@ -46,7 +49,10 @@
"SELF",
"dg-resource-assignment-process"
]
- }
+ },
+ "dependency-node-templates": [
+ "resource-assignment"
+ ]
},
"artifacts": {
"dg-resource-assignment-process": {
@@ -63,7 +69,10 @@
"SELF",
"dg-activate-process"
]
- }
+ },
+ "dependency-node-templates": [
+ "activate-jython"
+ ]
},
"artifacts": {
"dg-activate-process": {
@@ -80,7 +89,11 @@
"SELF",
"dg-assign-activate-process"
]
- }
+ },
+ "dependency-node-templates": [
+ "resource-assignment",
+ "activate-jython"
+ ]
},
"artifacts": {
"dg-assign-activate-process": {
@@ -217,7 +230,7 @@
"inputs": {
"resource-assignment-properties": {
"required": true,
- "type": "resource-assignment-properties"
+ "type": "dt-resource-assignment-properties"
}
},
"steps": {
@@ -234,9 +247,21 @@
},
"activate": {
"inputs": {
- "activate-properties": {
+ "request-id": {
+ "required": true,
+ "type": "string"
+ },
+ "action-name": {
+ "required": true,
+ "type": "string"
+ },
+ "scope-type": {
+ "required": true,
+ "type": "string"
+ },
+ "hostname": {
"required": true,
- "type": "activate-properties"
+ "type": "string"
}
},
"steps": {
@@ -255,7 +280,7 @@
"inputs": {
"assign-activate-properties": {
"required": true,
- "type": "assign-activate-properties"
+ "type": "dt-assign-activate-properties"
}
},
"steps": {
diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/data_types.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/data_types.json
index 3ea494ac..7d850f20 100644
--- a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/data_types.json
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/data_types.json
@@ -20,7 +20,7 @@
},
"derived_from": "tosca.datatypes.Root"
},
- "activate-properties": {
+ "dt-resource-assignment-properties": {
"description": "This is Dynamically generated data type for workflow activate",
"version": "1.0.0",
"properties": {
@@ -43,30 +43,7 @@
},
"derived_from": "tosca.datatypes.Dynamic"
},
- "resource-assignment-properties": {
- "description": "This is Dynamically generated data type for workflow activate",
- "version": "1.0.0",
- "properties": {
- "request-id": {
- "required": true,
- "type": "string"
- },
- "action-name": {
- "required": true,
- "type": "string"
- },
- "scope-type": {
- "required": true,
- "type": "string"
- },
- "hostname": {
- "required": true,
- "type": "string"
- }
- },
- "derived_from": "tosca.datatypes.Dynamic"
- },
- "assign-activate-properties": {
+ "dt-assign-activate-properties": {
"description": "This is Dynamically generated data type for workflow assign-activate",
"version": "1.0.0",
"properties": {
diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json
index 8227b82f..8f242efb 100644
--- a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/node_types.json
@@ -7,6 +7,14 @@
"content": {
"required": true,
"type": "string"
+ },
+ "dependency-node-templates": {
+ "required": true,
+ "description": "Dependent Step Components",
+ "type": "list",
+ "entry_schema": {
+ "type": "string"
+ }
}
},
"derived_from": "tosca.nodes.DG"
diff --git a/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/policy_types.json b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/policy_types.json
new file mode 100644
index 00000000..0c9b9925
--- /dev/null
+++ b/components/model-catalog/blueprint-model/starter-blueprint/baseconfiguration/Definitions/policy_types.json
@@ -0,0 +1,4 @@
+{
+ "policy_types": {
+ }
+} \ No newline at end of file