diff options
| author |   Liang Ding <liang.ding@intel.com> | 2019-01-29 00:00:54 -0800 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2019-03-06 16:18:32 +0000 |
| commit | afbcb0f07ac310ffd17fe3ba5b42c6ff670fc3b9 (patch) | |
| tree | bfdc35edc40c4fc41158213ce2af35632a8f2942 | |
| parent | db91542f3b768260cdf535e05a3976271a70de23 (diff) | |
add cloud specific type
Change-Id: I9fed3476405ff8fd13b8980e65eef76bfa48187b
Issue-ID: SDC-2041
Signed-off-by: Liang Ding <liang.ding@intel.com>
5 files changed, 21 insertions, 2 deletions
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 4553c1a8d1..52697f7260 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 @@ -339,6 +339,10 @@ resourceDeploymentArtifacts: HEAT_ARTIFACT: acceptedTypes: validForResourceTypes: *allResourceTypes + CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT: + acceptedTypes: + - zip + validForResourceTypes: *allResourceTypes YANG_XML: acceptedTypes: - xml diff --git a/asdctool/src/main/resources/config/configuration.yaml b/asdctool/src/main/resources/config/configuration.yaml index bf7ae524e0..3b58372f37 100644 --- a/asdctool/src/main/resources/config/configuration.yaml +++ b/asdctool/src/main/resources/config/configuration.yaml @@ -366,6 +366,10 @@ resourceDeploymentArtifacts: HEAT_ARTIFACT: acceptedTypes: validForResourceTypes: *allResourceTypes + CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT: + acceptedTypes: + - zip + validForResourceTypes: *allResourceTypes YANG_XML: acceptedTypes: - xml @@ -636,4 +640,4 @@ genericAssetNodeTypes: CVFC: org.openecomp.resource.abstract.nodes.VFC VF : org.openecomp.resource.abstract.nodes.VF PNF: org.openecomp.resource.abstract.nodes.PNF - Service: org.openecomp.resource.abstract.nodes.service
\ No newline at end of file + Service: org.openecomp.resource.abstract.nodes.service diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb index 4c0207c2c6..0204673160 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb @@ -347,6 +347,10 @@ resourceDeploymentArtifacts: HEAT_ARTIFACT: acceptedTypes: validForResourceTypes: *allResourceTypes + CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT: + acceptedTypes: + - zip + validForResourceTypes: *allResourceTypes YANG_XML: acceptedTypes: - xml diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml index f51cc8be83..610fd72eb3 100644 --- a/catalog-be/src/main/resources/config/configuration.yaml +++ b/catalog-be/src/main/resources/config/configuration.yaml @@ -342,6 +342,9 @@ serviceDeploymentArtifacts: AAI_VF_INSTANCE_MODEL: acceptedTypes: - xml + CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT: + acceptedTypes: + - zip OTHER: acceptedTypes: @@ -369,6 +372,10 @@ resourceDeploymentArtifacts: HEAT_ARTIFACT: acceptedTypes: validForResourceTypes: *allResourceTypes + CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT: + acceptedTypes: + - zip + validForResourceTypes: *allResourceTypes YANG_XML: acceptedTypes: - xml diff --git a/common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java b/common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java index 408c36eeb6..47babeee9b 100644 --- a/common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java +++ b/common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java @@ -30,7 +30,7 @@ import java.util.List; public enum ArtifactTypeEnum { CHEF("CHEF"), PUPPET("PUPPET"), YANG("YANG"), SHELL_SCRIPT("SHELL_SCRIPT"), SHELL("SHELL"), ICON("ICON"), UNKNOWN("UNKNOWN"), HEAT("HEAT"), DG_XML("DG_XML"), MURANO_PKG("MURANO_PKG"), HEAT_ENV("HEAT_ENV"), YANG_XML("YANG_XML"), HEAT_VOL("HEAT_VOL"), HEAT_NET("HEAT_NET"), OTHER("OTHER"), WORKFLOW("WORKFLOW"), NETWORK_CALL_FLOW("NETWORK_CALL_FLOW"), TOSCA_TEMPLATE("TOSCA_TEMPLATE"), TOSCA_CSAR("TOSCA_CSAR"), VNF_CATALOG("VNF_CATALOG"), VF_LICENSE("VF_LICENSE"), BPEL("BPEL"), - VENDOR_LICENSE("VENDOR_LICENSE"), MODEL_INVENTORY_PROFILE("MODEL_INVENTORY_PROFILE"), MODEL_QUERY_SPEC("MODEL_QUERY_SPEC"), APPC_CONFIG("APPC_CONFIG"), HEAT_NESTED("HEAT_NESTED"), HEAT_ARTIFACT("HEAT_ARTIFACT"), + VENDOR_LICENSE("VENDOR_LICENSE"), MODEL_INVENTORY_PROFILE("MODEL_INVENTORY_PROFILE"), MODEL_QUERY_SPEC("MODEL_QUERY_SPEC"), APPC_CONFIG("APPC_CONFIG"), HEAT_NESTED("HEAT_NESTED"), HEAT_ARTIFACT("HEAT_ARTIFACT"), CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT("CLOUD_TECHNOLOGY_SPECIFIC_ARTIFACT"), VF_MODULES_METADATA("VF_MODULES_METADATA"), LIFECYCLE_OPERATIONS("LIFECYCLE_OPERATIONS"), VES_EVENTS("VES_EVENTS"), PERFORMANCE_COUNTER("PERFORMANCE_COUNTER"),UCPE_LAYER_2_CONFIGURATION("UCPE_LAYER_2_CONFIGURATION"), // DCAE Artifacts DCAE_TOSCA("DCAE_TOSCA"), DCAE_JSON("DCAE_JSON"), DCAE_POLICY("DCAE_POLICY"), DCAE_DOC("DCAE_DOC"), DCAE_EVENT("DCAE_EVENT"), DCAE_INVENTORY_TOSCA("DCAE_INVENTORY_TOSCA"), DCAE_INVENTORY_JSON("DCAE_INVENTORY_JSON"), |