From ad7c463c5b4caa8665569a4b124828e7bbb616ce Mon Sep 17 00:00:00 2001
From: Adam Wudzinski <adam.wudzinski@nokia.com>
Date: Mon, 4 Jan 2021 15:48:17 +0100
Subject: [PATCH] Add PM_Dictionary artifact type for VNF/CNF packages

Issue-ID: SDC-3390
Signed-off-by: Adam Wudzinski <adam.wudzinski@nokia.com>
Change-Id: I4726a786c1fd466b71c4fd1f55cec6ab0598bab3
---
 .../VNFs/validation/pmdictionary/invalidPmDict.zip    | Bin 3234 -> 3244 bytes
 .../VNFs/validation/pmdictionary/validPmDict.zip      | Bin 3233 -> 3243 bytes
 .../sdc/heat/datatypes/manifest/FileData.java         |   3 ++-
 3 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/integration-tests/src/test/resources/Files/VNFs/validation/pmdictionary/invalidPmDict.zip b/integration-tests/src/test/resources/Files/VNFs/validation/pmdictionary/invalidPmDict.zip
index 2c8c3691ec94b53aa504b3f83bce67f3aa8ad0cd..cbc5facb6f753830ab15f9811963fc24abd00d3d 100644
GIT binary patch
delta 297
zcmZ1^xkhqBGBa;$jY<&f`^Col85kHIO)g-TtiPrHIUa;dE4UdLSza(RFo22HfZJS6
z4g$6J*GGJd{L^r6O;61UC6^8X$-BPOOGNK73I4a$-}ta~&hnX->E|qcdJCdm98R5J
zo2=aIa_q)deivzhQ>QjO*!g6pgm8gc6A#xZ*Op?A`2vQqvW+d%YTqwkmv!~)k7o6~
z(Xn?{|74tUMqDzriZ%0-Xkbd@Q)jcw1<NG#x4+G8KlSM7vKKnXispQc@Y$n&tNUfm
z<+77K*Luw6&63J}Yg_46sqx?LY0;<e*UoJ`x2<sR-#zU9{H7eW3<2KEER!91BsLea
kG_#|5n~_JI8R+H7wcIk3-Ff5~<0q%_n6cS%1H*&?0Mx2~wEzGB

delta 278
zcmZ1@xkz$DGBa;WU4NkFaUGVe3=9mnCKoVE)=xisBOZiHE4UdLSza(RFo22HfYV&f
z1_FDYYdf8L#Qx=4)6vPTL3>0dUd=HLnY<v=@ksspV@V$!?_Pd)?#-DEx(jO!IaN0?
zr`kCs7D=(CKkMN*Znd_>%;}_Mqt;A~6+0$KUY%g4=v;2a#BBRJZ~4MoD>wge7P+Rk
z-8ZX{$@ExIVTrUx_xckqX1#KoE05n668^e!zidG8-h$3`Njb-F_P2i8d*Pmsc(vn+
zuq}DpI+v|1{&sJ%w_eca@0!zRzmKh-w>aFz%E@kXJj;A`G*5E#s54DJJNY5E?BqZm
SImXb*1w3YK#@xUFU;qG3uy<Af

diff --git a/integration-tests/src/test/resources/Files/VNFs/validation/pmdictionary/validPmDict.zip b/integration-tests/src/test/resources/Files/VNFs/validation/pmdictionary/validPmDict.zip
index b1a49feea876f8963c99ee3bcf8be4ae5c9de78c..3289155f9ac3e7d2a1acf240f1b9bb90879479cd 100644
GIT binary patch
delta 317
zcmZ1|xmt2VDsz2ljY<&f`^Col85kHIF)}dlGRQFaI{JCKxdw;mWfkY=g@$l4Fz-|U
z91p^!72FJrEH9WD7{Ekpz-_K32Z7rA>m$BJ{%N?krl;nFl1qnx<XzwCC8Bqk1pnLW
zZ+zG~XZcLa^mCRzy#>)O4yR7AO;&DpId)?!zl*d${i#zM9_)NFQ$n~vt%-;0lxs^d
z$9w_9SlPywX|?Z{ugkjn^+&V%-q<^<e=<%vBQBX*#hUp^G%zLdsk7PTf@Ko=+u!E4
zpL%q3*$bUxMRUGJ`0P=?)%~*Oa@onAYdvQ3W=Z9~wXO83)c9}rwCL0KYv(qe+g7;u
z?;du4ep8NGh5&CSW|qkgJQACWSsK`RQNm&pk2=WPlWVwTCcE*-F(yt<<uPNk;Rc2i
F0|1lDgHr$i

delta 310
zcmZ22xlnRLDs%nZy8b}T<2o!`85kIDF)}dlGRQFaI{JCKxdw;mWfkY=g@$l4FrPYm
zBOZiHE4UdLSza(RFo22HfYV&f1_FDYYdf8L#Qx=4)6vPTL3>0dUd=HLnY<v=@kssp
zV@V$!?_Pd)?#-DEx(jO!IaN0?r`kCs7D=(CKkMN*UT?Lw#mwoXWuw+ijTJj4NM4;_
zr|4X6#l&p;J8${ITPrvJa2C0yw>_(n$@ExIVTrUx_xckqX1#KoE05n668^e!zidG8
z-h$3`Njb-F_P2i8d*Pmsc(vn+uq}DpI+v|1{&sJ%w_eca@0!zRzmKh-w>aFz%E>Ok
zo0&xf=v@v5@y5-$EECvyQ37Ey7mqsAsk4(GaLY~(;E`htpPbKQ#%9C~)WHA%AHsc?

diff --git a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/manifest/FileData.java b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/manifest/FileData.java
index 8b4eebde0e..27b035b2ac 100644
--- a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/manifest/FileData.java
+++ b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/datatypes/manifest/FileData.java
@@ -97,7 +97,8 @@ public class FileData {
         CONTROLLER_BLUEPRINT_ARCHIVE("CONTROLLER_BLUEPRINT_ARCHIVE"),
         HELM("HELM"),
         OTHER("OTHER"),
-        PNF_SW_INFORMATION("PNF_SW_INFORMATION");
+        PNF_SW_INFORMATION("PNF_SW_INFORMATION"),
+        PM_DICTIONARY("PM_DICTIONARY");
 
         private String displayName;
 
-- 
2.16.6