summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--catalog-be/src/main/resources/config/configuration.yaml19
-rw-r--r--common-app-api/src/main/java/org/openecomp/sdc/common/api/ArtifactTypeEnum.java6
-rw-r--r--sdc-os-chef/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb20
3 files changed, 42 insertions, 3 deletions
diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml
index 5242652188..2ae2cccb77 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
@@ -322,6 +323,14 @@ serviceDeploymentArtifacts:
- xml
OTHER:
acceptedTypes:
+
+#PLAN
+ PLAN:
+ acceptedTypes:
+ - xml
+ validForResourceTypes:
+ - VF
+ - VFC
resourceDeploymentArtifacts:
HEAT:
@@ -439,6 +448,11 @@ resourceDeploymentArtifacts:
SNMP_TRAP:
acceptedTypes:
validForResourceTypes: *allResourceTypes
+
+#PLAN
+ PLAN:
+ acceptedTypes:
+ - xml
resourceInstanceDeploymentArtifacts:
HEAT_ENV:
@@ -476,6 +490,11 @@ resourceInstanceDeploymentArtifacts:
SNMP_TRAP:
acceptedTypes:
validForResourceTypes: *allResourceTypes
+
+#PLAN
+ PLAN:
+ acceptedTypes:
+ - xml
resourceInformationalArtifacts:
CHEF:
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 f13984bc67..6beec9de54 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
@@ -37,8 +37,10 @@ public enum ArtifactTypeEnum {
DCAE_INVENTORY_POLICY("DCAE_INVENTORY_POLICY"), DCAE_INVENTORY_DOC("DCAE_INVENTORY_DOC"), DCAE_INVENTORY_BLUEPRINT("DCAE_INVENTORY_BLUEPRINT"), DCAE_INVENTORY_EVENT("DCAE_INVENTORY_EVENT"),
// AAI Artifacts
AAI_SERVICE_MODEL("AAI_SERVICE_MODEL"), AAI_VF_MODEL("AAI_VF_MODEL"), AAI_VF_MODULE_MODEL("AAI_VF_MODULE_MODEL"), AAI_VF_INSTANCE_MODEL("AAI_VF_INSTANCE_MODEL"),
- // MIB artifacts
- SNMP_POLL ("SNMP_POLL"), SNMP_TRAP("SNMP_TRAP"), GUIDE("GUIDE");
+ // MIB Artifacts
+ SNMP_POLL ("SNMP_POLL"), SNMP_TRAP("SNMP_TRAP"), GUIDE("GUIDE"),
+ // PLAN Artifacts
+ PLAN("PLAN");
ArtifactTypeEnum(String type) {
this.type = type;
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..a4be8b10d0 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
@@ -305,6 +305,11 @@ serviceDeploymentArtifacts:
OTHER:
acceptedTypes:
+#PLAN
+ PLAN:
+ acceptedTypes:
+ - xml
+
resourceDeploymentArtifacts:
HEAT:
acceptedTypes:
@@ -422,6 +427,14 @@ resourceDeploymentArtifacts:
acceptedTypes:
validForResourceTypes: *allResourceTypes
+#PLAN
+ PLAN:
+ acceptedTypes:
+ - xml
+ validForResourceTypes:
+ - VF
+ - VFC
+
resourceInstanceDeploymentArtifacts:
HEAT_ENV:
acceptedTypes:
@@ -459,6 +472,11 @@ resourceInstanceDeploymentArtifacts:
acceptedTypes:
validForResourceTypes: *allResourceTypes
+#PLAN
+ PLAN:
+ acceptedTypes:
+ - xml
+
resourceInformationalArtifacts:
CHEF:
acceptedTypes: