From 608be265c8491686f269ed12d5d48654ddb090b5 Mon Sep 17 00:00:00 2001
From: aribeiro <anderson.ribeiro@est.tech>
Date: Thu, 3 Oct 2019 15:44:48 +0100
Subject: Create new non-mano Artifact Type entry for pnf software information

Issue-ID: SDC-2615
Change-Id: I4dd879d50b1dec58aceeaf0c265901c62d038071
Signed-off-by: aribeiro <anderson.ribeiro@est.tech>
---
 .../ci/tests/datatypes/enums/ArtifactTypeEnum.java | 36 +++++-----------------
 .../config/test-apis-ci/configuration.yaml         |  7 +++++
 2 files changed, 15 insertions(+), 28 deletions(-)

(limited to 'test-apis-ci/src')

diff --git a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ArtifactTypeEnum.java b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ArtifactTypeEnum.java
index 4e4c87f112..17be9334fa 100644
--- a/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ArtifactTypeEnum.java
+++ b/test-apis-ci/src/main/java/org/openecomp/sdc/ci/tests/datatypes/enums/ArtifactTypeEnum.java
@@ -20,19 +20,21 @@
 
 package org.openecomp.sdc.ci.tests.datatypes.enums;
 
-import java.util.ArrayList;
-import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
 
 /**
  * Enum That Represents possible Artifacts Types.
  *
  */
+@Getter
+@AllArgsConstructor
 public enum ArtifactTypeEnum {
 	CHEF("CHEF"), PUPPET("PUPPET"), YANG("YANG"), SHELL_SCRIPT("SHELL_SCRIPT"), 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"), 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"), VF_MODULES_METADATA("VF_MODULES_METADATA"),
+	HEAT_ARTIFACT("HEAT_ARTIFACT"), VF_MODULES_METADATA("VF_MODULES_METADATA"), PNF_SW_INFORMATION("PNF_SW_INFORMATION"),
 	// 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"), DCAE_INVENTORY_POLICY("DCAE_INVENTORY_POLICY"), DCAE_INVENTORY_DOC("DCAE_INVENTORY_DOC"), 
@@ -40,38 +42,16 @@ public enum ArtifactTypeEnum {
 	// 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")
-	;
+	SNMP_POLL ("SNMP_POLL"), SNMP_TRAP("SNMP_TRAP"), GUIDE("GUIDE");
 
-	ArtifactTypeEnum(String type) {
-		this.type = type;
-	}
-
-	private String type;
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
+	private final String type;
 
 	public static ArtifactTypeEnum findType(final String type) {
-		for (ArtifactTypeEnum ate : ArtifactTypeEnum.values()) {
-			// According to Pavel/Ella
+		for (final ArtifactTypeEnum ate : ArtifactTypeEnum.values()) {
 			if (ate.getType().equalsIgnoreCase(type)) {
 				return ate;
 			}
 		}
 		return null;
 	}
-
-	public static List<String> getAllTypes() {
-		List<String> types = new ArrayList<String>();
-		for (ArtifactTypeEnum ate : ArtifactTypeEnum.values()) {
-			types.add(ate.getType());
-		}
-		return types;
-	}
 }
diff --git a/test-apis-ci/src/test/resources/config/test-apis-ci/configuration.yaml b/test-apis-ci/src/test/resources/config/test-apis-ci/configuration.yaml
index ba1526dd90..dc43134bbb 100644
--- a/test-apis-ci/src/test/resources/config/test-apis-ci/configuration.yaml
+++ b/test-apis-ci/src/test/resources/config/test-apis-ci/configuration.yaml
@@ -133,6 +133,7 @@ artifactTypes:
    - SNMP_POLL
    - SNMP_TRAP
    - GUIDE
+   - PNF_SW_INFORMATION
 
 licenseTypes:
    - User
@@ -516,6 +517,12 @@ resourceInformationalArtifacts:
             - VFCMT
             - Abstract
             - PNF
+    PNF_SW_INFORMATION:
+        acceptedTypes:
+            - yml
+            - yaml
+        validForResourceTypes:
+            - PNF
     SNMP_POLL:
         acceptedTypes:
         validForResourceTypes: *allResourceTypes
-- 
cgit 1.2.3-korg