From b766e7663a66ad93f3495bcec0769fe0a5e910c6 Mon Sep 17 00:00:00 2001
From: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl>
Date: Tue, 23 May 2023 11:56:25 +0000
Subject: [PATCH] Fix VES client simulator image and pod verification method

Issue-ID: TEST-397
Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl>
Change-Id: Iaabd13e0eed2f7a0714e8baf6f5eaf01da599ebd
---
 .../steps/simulator/pnf_simulator_cnf/pnf_register.py |  11 +++++++----
 .../templates/artifacts/pnf-simulator.tar.gz          | Bin 1237 -> 1223 bytes
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py b/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py
index 3180733..0e6e001 100644
--- a/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py
+++ b/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py
@@ -49,6 +49,7 @@ class PnfSimulatorCnfRegisterStep(BaseStep):
         config.load_kube_config(settings.K8S_CONFIG)
         k8s_client: "CoreV1API" = client.CoreV1Api()
         k8s_watch: "Watch" =  watch.Watch()
+        status = False
         try:
             for event in k8s_watch.stream(k8s_client.list_namespaced_pod,
                                         namespace=settings.K8S_ADDITIONAL_RESOURCES_NAMESPACE,
@@ -57,8 +58,9 @@ class PnfSimulatorCnfRegisterStep(BaseStep):
                     if not event["object"].status.phase in ["Pending", "Running"]:
                         # Invalid pod state
                         return False
-                    return event["object"].status.phase == "Running"
-            return False
+                    if event["object"].status.phase == "Running":
+                        return True
+            return status
         except urllib3.exceptions.HTTPError:
             self._logger.error("Can't connect with k8s")
             raise OnapTestException
@@ -91,8 +93,9 @@ class PnfSimulatorCnfRegisterStep(BaseStep):
     def execute(self) -> None:
         """Send PNF registration event."""
         super().execute()
-        if not self.is_pnf_pod_running():
-            EnvironmentPreparationException("PNF simulator is not running")
+        status = self.is_pnf_pod_running()
+        if not status:
+            raise EnvironmentPreparationException("PNF simulator is not running")
         time.sleep(settings.PNF_WAIT_TIME)  # Let's still wait for PNF simulator to make sure it's initialized
         ves_proto, ves_ip, ves_port = self.get_ves_protocol_ip_and_port()
         registration_number: int = 0
diff --git a/src/onaptests/templates/artifacts/pnf-simulator.tar.gz b/src/onaptests/templates/artifacts/pnf-simulator.tar.gz
index 605490f855fd8721a46f6f058d86c6d5ba0039e0..b715b1c26d1b1f6db5670d28ad01554b82309d89 100644
GIT binary patch
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

literal 1237
zcmV;`1S<O<iwFP$p~+wX1MOK|bK*7><(Xfh^3*=ySpI+wZ%!axrW;_uyY2La5w;+n
z*pf$<Noc44y^_DMLkW~5WH#&bVl2s5*SgZV_n43@+mRQ<KH`*JG~NWNK(}kkE9{zT
z`I@5v^==2kPDeAeh6;5Zb{fEZ8+WRRBaRpVjd&3g9zQegK>v4&uoD04JH)uML4p68
za~z7l)-fB<P&=BgshZId@i#R?Z2<K(o!EyTJpKd)xCi7e2#~{Qo8yRYH$>CLk;A-@
zdzAEm1y-0~hB$V?XY2<c*)Cv78E~m{k6GKHK}aJEmW&2qcJGDZf<A)Z($?l0vnVm7
zDyjmTDD=MNEo<1k$D0Sr+^E+Cp#8*PGomqbu;{y^!r%8^v=4;p`JWD~{_Q{s+*h6B
zApZ-_m;A56E;J1&&c9)H_4@pu1NNO40Vg@f4@mrCI62;nO>t`9+rt`fiR$_1I0(fr
z9KC8KcvSso$kY!zs-esLud7B~|D6N-;$LZRhtz#RRd^u&P}TIJ{?j#4|7ju(m^J^O
z15b-EkGMTBp>8w49Jz=iS&k)HK@73IK$M3l2z!9UzAt)ww7`B+vH{>x<vz_BN`%?k
zbDk?K0XR^3Mj>{Rxhdhu6J=*s7<vI(iRTD@j3Zs41ceG^s~(ga=|bLKh}*Q?BOI?-
z;<-YWg=u9iidx^pgePtv@Iwv>DdX8owzm#VL~9S2V&bHS;k-x%fB%!TV6x61N+-D;
zkA5A`KaXej$hsXQT>z|+AB(=$J`dUfB`eyh82UOJ%&!Midw4Uvw(P<DW;~r+U+vH1
z>F`g>9*##(Y%h@?VQGTN_%S}AzUORuU`%e1=f_MG*c|aVb^X1!WQ{Z8IR4Mh^NBg&
zApeVGU+}*!#%Y?NX*K_!1OLhYvoze59DoR+JmJ!e33IM@0`Ww4Bgs*yd=A=9WlW*`
zp`t-W1wUV2YVOkf<bL|)ozn|`<d_lU+YBw2o|6;fwJ-JsmUas6&$+iH8NXHJg;E9}
z)WvC1(ACS!%XA2%oI2F+0sDHAw21At!n~3^BJ5*Fcy-c?MmUmdYYF#>$A#}BO0a0>
zn-I&J)Tf-_<)TvLULhY52eX>+e{k&M|D@<>yEydeCJ?34OFjx8;D4d}w*0TjaT+wb
z-J1W;finN2FpMsWB+xHn|NZ8Hw01t24YFZ*PGI8AJqL+u819gBfVgw_rR2_u4n<sk
zM_+AHBPmx;ar*g9l6Q6xvq?+qFR>GYW8-jqEF|{FL&C2t!imcu79v~pWWtKpO9f9M
zqIQMUa5S|0SM$DQTUXX>P>d>ckC=X5RdRccOvht;KCx!A-^bJbuBE^JaK0@@P}6@p
z!i-R7(~`g|nPHUj?SiFBcDocs<3y}-UWv3?Mc+}II3HZntf{w8bgR}CBwTdwir2(z
z>c;`TrGoh?rUKbALHw=<F0wyr1Wm9_NQLBX%QD1WC~oQXkMX>n&ZagCkIG8b@*mJ9
z%KEbXWjT&?WR#X=`8uU$D*lSY#5aA9RbK9Ydi6mC^7HxsWx6lNq3^#P6K?e%gd+c|
zU8B~2XTitRf2ZaBU8$FlWLfKNS+gwT^48OJT<%FN(rVPGaW?!5hcIgX04M+e0=ao%

-- 
2.16.6