From 97a089e7ca98b5317ee9e355bdadabe41b0fea7d Mon Sep 17 00:00:00 2001 From: Idan Amit Date: Sun, 1 Oct 2017 22:16:56 +0300 Subject: [PATCH] Add PLAN artifact type to configuration Added the PLAN artifact type to the configuration and to the enum Change-Id: I4edd216182b313df0cbba15d1ac45780997f49ba Issue-Id: SDC-420 Signed-off-by: Idan Amit --- catalog-be/src/main/resources/config/configuration.yaml | 2 +- .../templates/default/BE-configuration.yaml.erb | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml index d3f513fd74..eb26c8a34f 100644 --- a/catalog-be/src/main/resources/config/configuration.yaml +++ b/catalog-be/src/main/resources/config/configuration.yaml @@ -133,6 +133,7 @@ artifactTypes: - SNMP_POLL - SNMP_TRAP - GUIDE + - PLAN licenseTypes: - User @@ -327,7 +328,6 @@ serviceDeploymentArtifacts: PLAN: acceptedTypes: - xml - resourceDeploymentArtifacts: HEAT: diff --git a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb index df9e74ad51..36e53fdd64 100644 --- a/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb @@ -126,7 +126,7 @@ artifactTypes: - SNMP_POLL - SNMP_TRAP - GUIDE - + - PLAN licenseTypes: - User @@ -304,6 +304,11 @@ serviceDeploymentArtifacts: - xml OTHER: acceptedTypes: + +#PLAN + PLAN: + acceptedTypes: + - xml resourceDeploymentArtifacts: HEAT: @@ -421,6 +426,11 @@ resourceDeploymentArtifacts: SNMP_TRAP: acceptedTypes: validForResourceTypes: *allResourceTypes + +#PLAN + PLAN: + acceptedTypes: + - xml resourceInstanceDeploymentArtifacts: HEAT_ENV: @@ -458,6 +468,11 @@ resourceInstanceDeploymentArtifacts: SNMP_TRAP: acceptedTypes: validForResourceTypes: *allResourceTypes + +#PLAN + PLAN: + acceptedTypes: + - xml resourceInformationalArtifacts: CHEF: -- 2.16.6