Merged PLAN type changes into master

Merged changes regarding the PLAN artifact type from master branch into release-.1.1.0 branch

Change-Id: If53f06d734ca7ba791e4c578504c890c16755ddf
Issue-Id: SDC-420
Signed-off-by: Idan Amit <ia096e@intl.att.com>

diff --git a/catalog-be/src/main/resources/config/configuration.yaml b/catalog-be/src/main/resources/config/configuration.yaml
index 5242652..2ae2ccc 100644 (file)
--- 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 f13984b..6beec9d 100644 (file)
--- 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 df9e74a..a4be8b1 100644 (file)
--- 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: