From 0e935eede33969dc963fcc063713d3f4866bdf85 Mon Sep 17 00:00:00 2001
From: Michal Jagiello <michal.jagiello@t-mobile.pl>
Date: Wed, 18 Oct 2023 15:44:19 +0200
Subject: [PATCH] Make pnf-simulator helm chart configurable

PNF simulator couldn't be configured on demand (e.g. image couldn't be changed)
That version allows override values and run customized version of pnf-simulator

Issue-ID: TEST-404
Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl>
Change-Id: Ic18bdaeaa782b61478579056d5ba1a893087d85c
---
 .../configuration/cds_resource_resolution_settings.py |   1 +
 src/onaptests/configuration/pnf_macro_settings.py     |   1 +
 src/onaptests/steps/instantiate/msb_k8s.py            |   3 ++-
 .../templates/artifacts/pnf-simulator.tar.gz          | Bin 1223 -> 1366 bytes
 4 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/onaptests/configuration/cds_resource_resolution_settings.py b/src/onaptests/configuration/cds_resource_resolution_settings.py
index 0ab6ebc..b972d0c 100644
--- a/src/onaptests/configuration/cds_resource_resolution_settings.py
+++ b/src/onaptests/configuration/cds_resource_resolution_settings.py
@@ -21,6 +21,7 @@ MSB_K8S_RB_VERSION = "v1"
 MSB_K8S_PROFILE_ARTIFACT_FILE_PATH = Path(get_resource_location(
                                           "templates/artifacts/profile.tar.gz"))
 MSB_K8S_PROFILE_NAME = f"cds-ms-prof-{str(uuid4())}"
+MSB_K8S_OVERRIDE_VALUES = None
 K8S_VERSION = "1.0"
 K8S_CONFIG = get_resource_location("templates/artifacts/config")
 K8S_ADDITIONAL_RESOURCES_NAMESPACE = "onap-tests"
diff --git a/src/onaptests/configuration/pnf_macro_settings.py b/src/onaptests/configuration/pnf_macro_settings.py
index d332763..379eaf7 100644
--- a/src/onaptests/configuration/pnf_macro_settings.py
+++ b/src/onaptests/configuration/pnf_macro_settings.py
@@ -38,6 +38,7 @@ MSB_K8S_RB_VERSION = "v1"
 MSB_K8S_PROFILE_ARTIFACT_FILE_PATH = Path(get_resource_location(
     "templates/artifacts/profile.tar.gz"))
 MSB_K8S_PROFILE_NAME = f"pnf-cnf-profile-{str(uuid4())}"
+MSB_K8S_OVERRIDE_VALUES = None
 K8S_VERSION = "1.0"
 K8S_CONFIG = get_resource_location("templates/artifacts/config")
 K8S_ADDITIONAL_RESOURCES_NAMESPACE = "onap-tests"
diff --git a/src/onaptests/steps/instantiate/msb_k8s.py b/src/onaptests/steps/instantiate/msb_k8s.py
index 9189282..29bc84a 100644
--- a/src/onaptests/steps/instantiate/msb_k8s.py
+++ b/src/onaptests/steps/instantiate/msb_k8s.py
@@ -36,7 +36,8 @@ class CreateInstanceStep(BaseStep):
         self.instance = Instance.create(cloud_region_id=settings.CLOUD_REGION_ID,
                                         profile_name=settings.MSB_K8S_PROFILE_NAME,
                                         rb_name=settings.MSB_K8S_RB_NAME,
-                                        rb_version=settings.MSB_K8S_RB_VERSION)
+                                        rb_version=settings.MSB_K8S_RB_VERSION,
+                                        override_values=settings.MSB_K8S_OVERRIDE_VALUES)
 
     @BaseStep.store_state(cleanup=True)
     def cleanup(self) -> None:
diff --git a/src/onaptests/templates/artifacts/pnf-simulator.tar.gz b/src/onaptests/templates/artifacts/pnf-simulator.tar.gz
index b715b1c26d1b1f6db5670d28ad01554b82309d89..024f73290211a72b0785f10a6ff95ce942632d18 100644
GIT binary patch
literal 1366
zcmV-c1*!TUiwFoG&@W{G18{C;EpusYb!=gDZ*nelVR8WNnOkq$HWbJ6tWUxD-Hvs$
zP`#<SticxBu-$Ihi@`{=BUBOvl5*=6{q8%GEk$yCZBu96&JO`%QWOs_hyNpzX)<fe
zFwP>XxVXIdA#?%9w)6kGV|VNSOD=TF)=kIi^&H68P1DdXi2Y-l(<GCM3PLWjhb&Rq
zo^l7C|D>di`ByAX;TMxH>Iuiqzh#=bZtIo-^KYAwh4X&~cFljxlR0k(ERFawW{K)7
zX&il{jRW&<=sjz_{%uJ1E+EHpj0@6z(Vp($e?I>-4L>j;L!P*Vrm4JK=-S6H30!hr
z&Ak>gMFXm+s}T~>2Nucv7a`z0<I;Cr^5qNZe4tUrWT)_+PC{cwzJ7(G`L8_%WXk-!
zMgb;6pGueLkdiE7eqM87E2heS{Jm!U1oKh}aO(MT^`cs)(3lbP1%q73D!qPfsMgt>
zsA2O2t6+ECuN<EziiQb{b(zy9ELl9&+g^{-{h<HrV0zcTn_R!0UV9Votv9}@N)fWi
zt!*)!xA}oe)~_{SXT77rU@{$g<MAJZ(e(+Hk2qIDD&;3Gg5!+5AK#4n-u)>($c?<0
zOe7mU31d3n_Fj?ytl%(<q9F%=TDqjws-7Ki#cGzhP_jNb)%*?N$(9Nl&+9b_CV3`&
z244N;DR;r6EN1r{M5SRS&U1!TJ-XyF;QmJ@+OPt}GUZ{S+F=r^;Gq-L26IP$R`oZ1
z0a^lDr^-R`qEB=w*Uw<M7opEQ-_IM+FDk7@ZB<#Lov>uo@;VfaP952r*Va7biCyu(
zk>5^v@Esoj2jagDf9v>fI)+ume;bNp{67Qr_+N$oArDTE`Sl0;LjTrsWu$CI$@Uh>
zZ@k`6{^Kldi2FWaZ@j-%-=AxH71Em#@!eoNsYStc1Z?dJL#;*?5JIO{H>1hj?cJ3(
zxtZP$MpN(o<lSI&_m?-h8}v77ozY0LmiA2W2gxlBqf9UjvQ@Tf^lLjH@~RxC|Ld=V
zZ;Sy4^}qL||EA@D{u`EMqW+(Qt@=M+O?M*(&?MoY8c<N4HzcsnD&Go36G3OQ&@aX8
zDuS6~LaV8Hsh6!|HM~_tgA;W>;Q`wpF3J*B$Prv|pGPj4Tn$&-P%7q3og8$UyW&%a
zUNV`_wFe^!TL~D(K2M4*aIq)uuNz&)hkTwn4c^j-CO#7wFaCS%KmYqa-7h(G{%hMt
zrT^VR|GQ2P_5Um!t^Ysr+;6XfZ$DnyA>Dh<Vs_~5&Nq$}+KnFlY{J=G|Dzl4`u?U9
z2QO;l;QddpTdjY~gmRE@dbs}2!LWZzD#s@8SQHcg5%!EElPn-%k~@AoroP|=!h-sj
zdNJ~?G}r%PrD@+6?w?UCam(7d{(DAs|L<6NzHVENgX{kswA*d12w{25TA#KRX-L*@
zl-yhhrj@7Ep4M+`Tp}Q~@vyuva>?I+`X3(px?%oOeH&Er($3|jcH~etV&izuaKLx8
z@=BtAL>*nN5xWmsej0~_ea@uW;R#JUT+CfPcihW7c?ro?ewZjW7sbA~lgz40ItwQK
zC}fFp^-i~=KkrC>)veWcl4keKn>T0I*XH`a%BBCMm;b@|Z}e<f{~!aV(JjvZb=xp8
z{-1>dYaswP7GbK2{eeg34Ez`Nhr#Mgp>P*6gAa%GRi)44luJftg2!b1F-+43{+ax?
z%GDO-Mx$FSiOsDCTjnaU-Ul=*)XHOa?U6%!UwhCH1VIo4K@bE%5ClOG1VIo4K@bE%
Y5ClOG1VIo4L0*x60Mgw($^cLR0N-=8#Q*>R

literal 1223
zcmV;&1UUO2iwFP!000001MOH#bLut}X3eiqS+xs0ma*Z6ofAmIv;hWuZ#&&E!WP66
zTk^;<3GMX1_xORqc>qlaX><K;z<L}VpCf(WkwZ3DA}@%2BDpxLy$duzyKN@FxNU0N
zziZTRv)#hD)zS^Urr~B2w`$0IA9u=#BS{28wRjdY8Sfakr~iM7u$2FC&+6Xv)WALJ
z8hi5(IZyJh<2E)84EZ<AcC&`Gqk8cIzVrOsw_b#tTOuU7C-6^DBB_gJEA$HwLLSlj
zM|)V|JyAaYm&ry@S0wO{xyHWpueZz^Hnf)B)HU5`!TC3JL#xjJDZofTJ1E%&0dWLZ
zB#q=|L)2XwIl>F2$5{tiXh9hjDM4IQKS1erL31vU%bhza6er^hG#5NTlRGaAXZ)dH
zk|h;UYDiNx71v4VeOtFIas7_2?zwQIP8}iTk->VzW8qNfyXD~TM+fZ_p?v-&4MO-w
zqoY=W2i1Ru0Yx7+aa#YGO---rzf<6){0E#ZxZ={#=c|CSH;KZY`~&418~#tm>DXwu
zEB-$Pwn><TVRV)-vB%sF>K3`L2UHT5NRm)9VT?<X2tvx#2;F5AtvUfr${&!!8L+)X
zic=a>C;(P<tZL}T^K;#un_t{7Kf$=P_=IlT3qXZP5OxrYeII&!GNXRJp2yX-xrmCT
z=j_lgCEdm_ZMV$j!=jKn$r=LQ+;d0-Zo*SUed@rVZ1sRh=l0hvcV6jGBoiH7tTH2V
z6~d%3&B||RS|7xG(XIF=c#?xd^Kf`B61<#`1b!(9uM7hOA`g1HAZL<zP+}Bj6-3!`
zvxbr<@@6>rc{uG4`gZqX+O=%!!kYAoQ3x%GA7{%?H?_=8Bje%Fo{p@^<hS9t`_$5(
zzdPS%1FScHIKa%;NpC!`Zk};Sa4t6i3&;Z6HlZjQM-b%^hdsFJphlzUJ7^QH2Zvn9
zXghL6a7WP7L3$fVxabyiU16cW{w`XV+>Zl#!-4rqrh=qpMC5G;o#llZ(1cip++$Ml
zm?zzt>TbRMA)YJQYFfSU2#8s(!(jRMWEJIo`TnvTCvjwu8ZY9MnJM`The@uwo+!QC
zzw`>ck#QEDkLK)S;wAkrwJRZa-%tST(SNKpak>7}v1u5U{+|MmFJY<lkGNaX{NoGr
zUP&&*xU31vnl%}Hh@+;;83|P`79E^yq_gDl3?8#~AS1dEspl%27p6h^BFFcDu{t=t
zi0<ct`Xfet!louHUw@uR3jr$&#`SPwZ;3=M5RKhz)F>GOota+t#&-Xze`(ph>D6#N
zwZ7Wd!*Tx)%kB>ck8ID0AJInr3AYZ}74iI7(9cS86<);d`(J*J-}psv-~GR3;^O`X
z8UXySwLu0d{yzbp<^M^R_V4Z9R}lP~U>j+X+$h+8yK07Av!JqEOP8;TuW&f$-{j3X
zaW9BZm_x;T^6_Ey-`jX#Z~dojzW+3v$@d@K(5v%*5`50{e|ULGA0!ow__iSPx#z4)
zqDvq41r^VdLQ?B(b3#%3G49fg5SrTg`FS=(aLFC+caVKKdO{re)YtPyIyp*WYk~W4
l@dn=qoTZ<T(r-$G+@}wqmI@UrRH*PD#y_S;4Tu0J004t9We)%V

-- 
2.16.6