X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=heat%2FvFW_CNF_CDS%2Ftemplates%2Fcba%2FDefinitions%2FvFW_CNF_CDS.json;h=9053c9b206d957ce4159ffd434656f239b3ec381;hb=1ff5827ffde7af1d8aed23890a571455300ade6d;hp=914405b370a7e13663a3457c3f090ed79e1f2c44;hpb=89da408dd79bcc7cfb4d89033da435c974c13e70;p=demo.git diff --git a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json index 914405b3..9053c9b2 100644 --- a/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json +++ b/heat/vFW_CNF_CDS/templates/cba/Definitions/vFW_CNF_CDS.json @@ -2,11 +2,11 @@ "tosca_definitions_version": "controller_blueprint_1_0_0", "metadata": { "template_author": "Samuli Silvius ", - "author-email": "abdelmuhaimen.seaudi@orange.com", + "author-email": "lukasz.rajewski@orange.com", "user-groups": "ADMIN, OPERATION", "template_name": "vFW_CNF_CDS", - "template_version": "1.0.44", - "template_tags": "Samuli Silvius, vFW_CNF_CDS", + "template_version": "7.0.0", + "template_tags": "Samuli Silvius, Lukasz Rajewski, vFW_CNF_CDS", "template_type": "DEFAULT" }, "imports": [ @@ -33,40 +33,10 @@ "username": "admin", "password": "admin" }, - "multicloud-k8s-api": { - "type": "basic-auth", - "username": "admin", - "password": "admin", - "url": "http://multicloud-k8s:9015" - }, - "profile-upload-properties": { - "assignment-params": { - "get_attribute": [ - "resource-assignment", - "assignment-params" - ] - }, - "profile-modification-decision-data": { - "get_input": "vpg-management-port" - }, - "profile-artifacts": { - "get_attribute": [ - "profile-modification", - "assignment-params" - ] - }, - "api-access": "*multicloud-k8s-api" - }, "config-deploy-properties": { "resolution-key": { "get_input": "resolution-key" } - }, - "dynamic-db-source": { - "type": "maria-db", - "url": "jdbc:mysql://mariadb-galera:3306/sdnctl", - "username": "root", - "password": "secretpassword" } }, "topology_template": { @@ -81,25 +51,13 @@ "call_operation": "ResourceResolutionComponent.process" } ], - "on_success": [ - "profile-modification" - ] - }, - "profile-modification": { - "description": "Profile Modification Resources", - "target": "profile-modification", - "activities": [ - { - "call_operation": "ResourceResolutionComponent.process" - } - ], "on_success": [ "profile-upload" ] }, "profile-upload": { - "description": "Upload K8s Profile", - "target": "profile-upload", + "description": "Generate and upload K8s Profile", + "target": "k8s-profile-upload", "activities": [ { "call_operation": "ComponentScriptExecutor.process" @@ -140,30 +98,51 @@ } } }, + "config-assign": { + "steps": { + "config-assign": { + "description": "Create a message", + "target": "config-assign-process", + "activities": [ + { + "call_operation": "" + } + ] + } + }, + "inputs": { + "resolution-key": { + "required": true, + "type": "string" + }, + "store-result": { + "required": true, + "type": "boolean" + }, + "config-assign-properties": { + "description": "Dynamic PropertyDefinition for workflow(config-assign).", + "required": true, + "type": "dt-config-assign-properties" + } + } + }, "config-deploy": { "steps": { "config-deploy": { - "description": "Config Deploy Workflow", + "description": "Run kotlin script", "target": "config-deploy-process" } }, "inputs": { + "resolution-key": { + "required": true, + "type": "string" + }, "config-deploy-properties": { "description": "Dynamic PropertyDefinition for workflow(config-deploy).", "required": true, "type": "dt-config-deploy-properties" } - }, - "outputs": { - "dry-run": { - "type": "json", - "value": { - "get_attribute": [ - "config-deploy-process", - "assignment-params" - ] - } - } } } }, @@ -184,27 +163,27 @@ } }, "artifacts": { - "base_template-template": { + "helm_base_template-template": { "type": "artifact-template-velocity", "file": "Templates/base_template-template.vtl" }, - "base_template-mapping": { + "helm_base_template-mapping": { "type": "artifact-mapping-resource", "file": "Templates/base_template-mapping.json" }, - "vpkg-template": { + "helm_vpkg-template": { "type": "artifact-template-velocity", "file": "Templates/vpkg-template.vtl" }, - "vpkg-mapping": { + "helm_vpkg-mapping": { "type": "artifact-mapping-resource", "file": "Templates/vpkg-mapping.json" }, - "vfw-template": { + "helm_vfw-template": { "type": "artifact-template-velocity", "file": "Templates/vfw-template.vtl" }, - "vfw-mapping": { + "helm_vfw-mapping": { "type": "artifact-mapping-resource", "file": "Templates/vfw-mapping.json" }, @@ -216,82 +195,105 @@ "type": "artifact-mapping-resource", "file": "Templates/vnf-mapping.json" }, - "vsn-template": { + "helm_vsn-template": { "type": "artifact-template-velocity", "file": "Templates/vsn-template.vtl" }, - "vsn-mapping": { + "helm_vsn-mapping": { "type": "artifact-mapping-resource", "file": "Templates/vsn-mapping.json" } } }, - "profile-modification": { - "type": "component-resource-resolution", + "k8s-profile-upload": { + "type": "component-k8s-profile-upload", "interfaces": { - "ResourceResolutionComponent": { + "K8sProfileUploadComponent": { "operations": { "process": { "inputs": { - "artifact-prefix-names": [ - "ssh-service" - ] + "artifact-prefix-names": { + "get_input": "template-prefix" + }, + "resource-assignment-map": { + "get_attribute": [ + "resource-assignment", + "assignment-map" + ] + } } } } } }, "artifacts": { - "ssh-service-template": { - "type": "artifact-template-velocity", - "file": "Templates/k8s-profiles/ssh-service-template.vtl" + "vfw-cnf-cds-base-profile": { + "type": "artifact-k8sprofile-content", + "file": "Templates/k8s-profiles/vfw-cnf-cds-base-profile.tar.gz" }, - "ssh-service-mapping": { + "vfw-cnf-cds-vpkg-profile": { + "type": "artifact-k8sprofile-content", + "file": "Templates/k8s-profiles/vfw-cnf-cds-vpkg-profile" + }, + "vfw-cnf-cds-vpkg-profile-mapping": { "type": "artifact-mapping-resource", - "file": "Templates/k8s-profiles/ssh-service-mapping.json" + "file": "Templates/k8s-profiles/vfw-cnf-cds-vpkg-profile/ssh-service-mapping.json" } } }, - "profile-upload": { - "type": "component-script-executor", + "config-assign-process": { + "type": "component-resource-resolution", "interfaces": { - "ComponentScriptExecutor": { + "ResourceResolutionComponent": { "operations": { "process": { "inputs": { - "script-type": "kotlin", - "script-class-reference": "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.K8sProfileUpload", - "dynamic-properties": "*profile-upload-properties" + "resolution-key": { + "get_input": "resolution-key" + }, + "store-result": true, + "artifact-prefix-names": [ + "cnf" + ] + }, + "outputs": { + "resource-assignment-params": { + "get_attribute": [ + "SELF", + "assignment-params" + ] + }, + "status": "success" } } } } + }, + "artifacts": { + "cnf-template": { + "type": "artifact-template-velocity", + "file": "Templates/cnf-template.vtl" + }, + "cnf-mapping": { + "type": "artifact-mapping-resource", + "file": "Templates/cnf-mapping.json" + } } }, "config-deploy-process": { - "type": "component-resource-resolution", + "type": "component-script-executor", "interfaces": { - "ResourceResolutionComponent": { + "ComponentScriptExecutor": { "operations": { "process": { "inputs": { - "artifact-prefix-names": [ - "nf-params" - ] + "script-type": "kotlin", + "script-class-reference": "org.onap.ccsdk.cds.blueprintsprocessor.services.execution.scripts.ConfigDeploy", + "dynamic-properties": "*config-deploy-properties" } } } } - }, - "artifacts": { - "nf-params-template": { - "type": "artifact-template-velocity", - "file": "Templates/nf-params-template.vtl" - }, - "nf-params-mapping": { - "type": "artifact-mapping-resource", - "file": "Templates/nf-params-mapping.json" - } } } }