From 821ddb419fb27d73bd00ef802a9c0fd1bf824bd6 Mon Sep 17 00:00:00 2001 From: agileone Date: Mon, 15 Apr 2019 13:06:45 -0700 Subject: Adds a new artifact for controller blueprint Defines CONTROLLER_BLUEPRINT_ARCHIVE artifact type for PNF and VF. Issue-ID: SDC-2139 Change-Id: Ib28bb25a6751b053ffe50323bb7c16576bc181f4 Signed-off-by: agileone --- .../templates/default/configuration.yaml.erb | 16 +++++++++++++++- asdctool/src/main/resources/config/configuration.yaml | 15 +++++++++++++++ 2 files changed, 30 insertions(+), 1 deletion(-) (limited to 'asdctool') diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb index 78e5eaaef4..aabdacc3af 100644 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb +++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb @@ -136,6 +136,7 @@ artifactTypes: - SNMP_TRAP - GUIDE - PLAN + - CONTROLLER_BLUEPRINT_ARCHIVE licenseTypes: - User @@ -154,7 +155,11 @@ resourceTypes: &allResourceTypes deploymentResourceArtifacts: - + cdsBlueprint: + displayName: "CDS Blueprint" + type: CONTROLLER_BLUEPRINT_ARCHIVE + description: "CDS deployment artifact" + fileExtension: "zip" deploymentResourceInstanceArtifacts: heatEnv: @@ -282,6 +287,9 @@ systemMonitoring: defaultHeatArtifactTimeoutMinutes: 60 serviceDeploymentArtifacts: + CONTROLLER_BLUEPRINT_ARCHIVE: + acceptedTypes: + - zip YANG_XML: acceptedTypes: - xml @@ -480,6 +488,12 @@ resourceDeploymentArtifacts: validForResourceTypes: - VF - PNF + CONTROLLER_BLUEPRINT_ARCHIVE: + acceptedTypes: + - zip + validForResourceTypes: + - VF + - PNF #PLAN PLAN: diff --git a/asdctool/src/main/resources/config/configuration.yaml b/asdctool/src/main/resources/config/configuration.yaml index c570344475..bdc6a43e12 100644 --- a/asdctool/src/main/resources/config/configuration.yaml +++ b/asdctool/src/main/resources/config/configuration.yaml @@ -153,6 +153,7 @@ artifactTypes: - SNMP_POLL - SNMP_TRAP - GUIDE + - CONTROLLER_BLUEPRINT_ARCHIVE licenseTypes: - User @@ -174,6 +175,11 @@ resourceTypes: &allResourceTypes # - VF # - VL deploymentResourceArtifacts: + cdsBlueprint: + displayName: "CDS Blueprint" + type: CONTROLLER_BLUEPRINT_ARCHIVE + description: "CDS deployment artifact" + fileExtension: "zip" # heat: # displayName: "Base HEAT Template" # type: HEAT @@ -314,6 +320,9 @@ systemMonitoring: defaultHeatArtifactTimeoutMinutes: 60 serviceDeploymentArtifacts: + CONTROLLER_BLUEPRINT_ARCHIVE: + acceptedTypes: + - zip YANG_XML: acceptedTypes: - xml @@ -499,6 +508,12 @@ resourceDeploymentArtifacts: validForResourceTypes: - VF - PNF + CONTROLLER_BLUEPRINT_ARCHIVE: + acceptedTypes: + - zip + validForResourceTypes: + - VF + - PNF resourceInstanceDeploymentArtifacts: HEAT_ENV: -- cgit 1.2.3-korg