From f2136a47fd53fcbdc117899c6e134d7ceea46d85 Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Wed, 24 Apr 2019 10:05:02 -0400 Subject: Multiples fixes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I83782006dc47a224e546b6877070d5e7e56dd2e6 Issue-ID: CCSDK-1215 Signed-off-by: Alexis de Talhouët Delete the deployed blueprint if overriten Change-Id: I7e4f3a5c98388a965ef756467497ed31d23bc047 Issue-ID: CCSDK-1215 Signed-off-by: Alexis de Talhouët Fix enhancement of workflow step for component Change-Id: I62c7904265495edb2b0a5bec0d64cfecd7573f97 Issue-ID: CCSDK-1168 Signed-off-by: Alexis de Talhouët Update golden package Change-Id: I969fe9cf9b563911ebe4500fe8f3211aedb84593 Issue-ID: CCSDK-1231 Signed-off-by: Alexis de Talhouët Do not fail to get execution property When prepareEnv fail, we should not fail by saying to property is not set. So set it as N/A until is get sets further done in the processing Change-Id: I06b9fcb9b1cf9e1605cef77864da9dbd18243800 Issue-ID: CCSDK-1215 Signed-off-by: Alexis de Talhouët --- .../golden/Definitions/golden-blueprint.json | 29 ++++++++-------------- 1 file changed, 11 insertions(+), 18 deletions(-) (limited to 'components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json') diff --git a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json index 6a9df9b58..7e1bd8b30 100644 --- a/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json +++ b/components/model-catalog/blueprint-model/test-blueprint/golden/Definitions/golden-blueprint.json @@ -3,7 +3,7 @@ "template_author": "Alexis de Talhouët", "author-email": "adetalhouet89@gmail.com", "user-groups": "ADMIN, OPERATION", - "template_name": "test", + "template_name": "golden", "template_version": "1.0.0", "template_tags": "test" }, @@ -27,7 +27,7 @@ "dsl_definitions": { "ipam-1": { "type": "token-auth", - "url": "http://localhost:32768", + "url": "http://netbox-nginx:8080", "token": "Token 0123456789abcdef0123456789abcdef01234567" }, "config-deploy-properties": { @@ -132,11 +132,6 @@ "ip": { "required": true, "type": "string" - }, - "config-deploy-properties": { - "description": "Dynamic PropertyDefinition for workflow(config-deploy).", - "required": true, - "type": "dt-config-deploy-properties" } } }, @@ -216,7 +211,7 @@ }, "store-result": true, "artifact-prefix-names": [ - "hostname" + "hostname", "vfw-interface" ] } } @@ -231,6 +226,14 @@ "hostname-mapping": { "type": "artifact-mapping-resource", "file": "Templates/hostname-mapping.json" + }, + "vfw-interface-template": { + "type": "artifact-template-velocity", + "file": "Templates/vfw-interface-template.vtl" + }, + "vfw-interface-mapping": { + "type": "artifact-mapping-resource", + "file": "Templates/vfw-interface-mapping.json" } } }, @@ -256,16 +259,6 @@ } } } - }, - "artifacts": { - "vfw-interface-template": { - "type": "artifact-template-velocity", - "file": "Templates/vfw-interface-template.vtl" - }, - "vfw-interface-mapping": { - "type": "artifact-mapping-resource", - "file": "Templates/vfw-interface-mapping.json" - } } }, "rollback": { -- cgit 1.2.3-korg