From fc0c7c85fc3d45055a274dd24fb134a476725678 Mon Sep 17 00:00:00 2001
From: Michal Jagiello <michal.jagiello@t-mobile.pl>
Date: Fri, 28 May 2021 14:16:05 +0000
Subject: [PATCH] [TEST] Use nf-simulator/vesclient

Pnf-simulator created "mongo" service and deployment what causes errors.
With the nf-simulator/vesclinet we could create mogno service with custom name

Issue-ID: TEST-341
Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl>
Change-Id: Iafde4be988d44291a56c649a1902319bbeeb050c
---
 .../steps/simulator/pnf_simulator_cnf/pnf_register.py |   4 ++--
 .../templates/artifacts/pnf-simulator.tar.gz          | Bin 1233 -> 1225 bytes
 2 files changed, 2 insertions(+), 2 deletions(-)
 mode change 100755 => 100644 src/onaptests/templates/artifacts/pnf-simulator.tar.gz

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 f936839..4b09328 100644
--- a/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py
+++ b/src/onaptests/steps/simulator/pnf_simulator_cnf/pnf_register.py
@@ -91,7 +91,7 @@ class PnfSimulatorCnfRegisterStep(BaseStep):
         if not self.is_pnf_pod_running():
             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_ip, ves_port = self.get_ves_ip_and_port()
+        ves_ip, _ = self.get_ves_ip_and_port()  # Use only 8443
         registration_number: int = 0
         registered_successfully: bool = False
         while registration_number < settings.PNF_REGISTRATION_NUMBER_OF_TRIES and not registered_successfully:
@@ -102,7 +102,7 @@ class PnfSimulatorCnfRegisterStep(BaseStep):
                         "simulatorParams": {
                             "repeatCount": 9999,
                             "repeatInterval": 30,
-                            "vesServerUrl": f"https://{ves_ip}:{ves_port}/eventListener/v7"
+                            "vesServerUrl": f"https://sample1:sample1@{ves_ip}:8443/eventListener/v7"
                         },
                         "templateName": "registration.json",
                         "patch": {
diff --git a/src/onaptests/templates/artifacts/pnf-simulator.tar.gz b/src/onaptests/templates/artifacts/pnf-simulator.tar.gz
old mode 100755
new mode 100644
index 58cde899150a9ffbbd82a0f23343668b8d5280a2..a7e6311e3ab2f5c3fc381772302fc877f9a0ba43
GIT binary patch
literal 1225
zcmV;)1UCC0iwFSA`mkUC1MOH%bK*D<<;<_pa@sxMSpL8hZcZRO)J}i`&+OJ-C}9iY
ziY>WhnS|Zi|GtvHVuujOBw=c1{4U^@t!}mSx}P19RX6s-BtV?9v(~#n6|gK*{zA)C
ztG@+WP`7#z_IjG3wN$9<u-5|S`-D?R5_7}=XeG;p@Z_2M4vc@Nh-&+Pd4m{NwkQnV
z(#N6w*G#Pi4b?PY&ro$?ho+`$Eug+-5c}|x?>|8y?t|JXXnQzznICbVl0LA(8WYSA
z#~%2IgAk-=1gt0n9(8Xq>$)_IXpF&%(GbjU{U}<}d+<kQZErA((}`3?RbU%M{+GhC
zf$dwoy`#*F`)vTak0xx#G+{0lV>eU;`K>ecW1`Og+0Y(b50%h+Qy&NGzo_}L{%g>J
zq6i578>Xc<{67Vp8$SkaO6fZ!{xO^~eYq_O{H-Hw@SdpipW`qR|8V@KO7JNCXQ-Od
zgFV&IW&hVzqtSn-z`p&j*}D<-UZDyP?Z0JMx&E_E&9Yjm22JtP)c+IUu^#h@*9TMT
zwL{F2hd7eTEbR*77RL{<NLLv30ZD>Dj09+jgH*i%;8W!`>lsRn*~WKwge3q^$;~*z
zZt8^+j(njtb2aFPXf19g_&$ksg%T7gl&$+v9-lLLc_uD1yH7Y?vouD9tjejCjZm_I
zj|oo$e9F1BN0jk=4c&(*ro!3>rtp@IFkHw{@b7=A1(QwjP&V`RWc>SN@o_SD#`g6v
z9Rgs3f<%mU>Vyg@S<_DK>Cf}w;&M21MpvUt+ZisdCbNb8+4(q`jsCWs(PaE+!W9Z)
zET>>{PZ*!lz<0NOFd<jS4-zKyGe<nh;@!Ld$MHYk&#$ZjhxxA;`cF6Xp5VV`n6Tmh
zDexr!=h=4GY5*dH@|0mYRSK@Vp?D&{kn9mJd>nM$+CAk<AXGG{sNmQ0bIn_sAG{C0
zovggzdyW}Ffy2;h<+}x4E(37_uza{I0|g^HlKh>rL{y3ap&riagRY*RpJ%r)%Bf3(
zK5#ClsYM*DHRiQC65{~7BC6w;6ysQ?&K5BfpNoLUlwe`!+X%~xERcfhGG`Qd7brl)
z#q4?ROYGx+TA;cfjsm(3MFD-yN1+4!*YvXg_Y6(yKhgiyhW{r)mH#M;;<K^{49dO#
z&gwwcT%WE6`B+gCm{_ClBGDt^4mm@_-J4Gp$1iambNR(=z0ID?xH`kx+qEQb&a>Q8
zCA|_mDLyvM$ER9if4U`t+R9(DcCq?Ay{VU)s>=jVshoDz(`Y<$1{aHg?bsLgd|2L9
z>K@^9QI~IfCz(wq&SGlM=YLLSgWZ|_`OE#X979e2<%ns7I-6BgU1b_ZDSyaPrdc0S
zQ5vTrwMEbAbjq>)XSBGZqE53AA1PGL64kUE-j%6os5D4Id`(3Ot4$S3%M|gOJ~+!i
zz6!pxZA68l?#hPaEfue_=Dp!|GZ$*R45O+^?cfe=<9sYXKDO&h@8hi178%K=sRb#x
z!nXsT)mC&&D97mEpB>Nl|JUjM0*CZ}52_FSUlVpMeI;o6{|WE|>Hin>{avY_R?(`~
ne<-U}8DCgmsN)OwUn$ZXG-%MEL4yVj-Vpx-hED_h04M+eYYKE0

literal 1233
zcmV;?1TOm@iwFQ5TvK2G1MOH_bK*7>=9yoi=Ba(a_zD}pk&w1KZGZ`M+qaCc1@Xj|
zJd#X8JN@rH@(mk8U~(b5TYoQLSw1>C()rFO#dOgTL6n48GTv>y3v@ug@2Fp+@95Rv
z0xiSp_Y9-gGi|e_8<u7CTF7}Hcj`!l#2lekGEb;Xp6Pes{WprZw*HrQm`iPqqwp=q
zIJEwzW2NhF8hyjD4OoB2w4D~x-_nVF_@A#o#Sw8)Z5OnCB0L_%GGNq21GFTRa4d<B
zekEaq(mjF}j3b|U_k?#m7R5{uwBRg4)B7Nf=j;*vmbJE5gp1UWuIZZ5#&PhaXjvKU
zd$N9D+!t;eq0W}UwqObO2)w&v;AH!wL-k#vp8q#jgW>g+7Wr>F#zFoE&adac?ewiC
z|4)J0T_BK`rt|}bf1IS5K3|s!{LvmZcu&;xUy>+>e?+{g5<E)(*}7@>jGk^=s{UKL
z-RQqlVBh-J+B-4xU!e*QtiNGeJ+=P2<(Q!SK>x#!-Ea8+6xh~d0rg!pVSYOz68l(U
zrOeW*09|H5L?B#I>>`?kA-oCkoP?=*LnvU{eO5CxLHH{0c7!EDPsvRY6Hi$PXdo{c
zl{f&snJdB|!b|volE*|?8lyPY7+<=E+BRMF*oDWe-S;p7scLFIi9@!I2$e#Uq39^P
zpeb|1uBjQCo;sX4lfH(2Y14{@Nkpz0taUys<wc~PCs^LOsLNv6#W9R4Fka+63RBr=
z3#LN$@`(ggk|j?Au9Z;|8U(Ex$){tf+GEBG=Q|reCeZ342gXa^a8jsi^v}P0re2@8
znzVp1NPEwex!N0CPFNUtYZr~_&o~H^w0~wh4+U_HTn__Yj=W_FtjHwu>!Y*d`^Rzo
zpXc)nYrvuU-?z*2zhy%$&`mi08x8-T0#EY)G+XXk4ZxH#nUYe@4h7eH5qyz9D7t|I
zzeF9c)~CD#Ff<d`7yWpCZu$%7lmF?bla&|pC<&)HoN>HZ1YSW?mm%x`qCPHpvy<C7
zQ*3!wa%zP=Df3B2sFr?yex7yVOfrv!E}C6V(iYfQOCoE;D@aH@@ap&}2_jVJ2H-Ok
zDsXtjsG?N4j){8694Sas#f)M90*9D-gdZl+efb|Tx@4VADSgeQ;DP)%P2DN=zhT-+
z|Jl7p|D6QY{D%rJx+Mt=%eDXdc_7`bW&USRMc#9mN8n))6vj>hMp$}xzgLVuZ(c}s
z54v1ueX|U_A=#aYO36HXa@&=lDeMI9*x(%>K!yE5R0wNxeSWqu-#mn=-I}1y<RPJ}
zjj4h)ug9Zb#<!nGpJ&61+u>j~xEM^Y%3h!aahPO0cU#x3dyU+T$FtkXU^@MCd^6m&
z^!H!hm-z@zkv|+^=8x&s&1i7_ghQM$xrs|A*EgXk8z&IVqIR5}Z5;sW{VPH|b81VB
zn|<KH^7XDFPn~<>K(ejO^J{a+RKAWG93Rpnk3ZM^$}B4mb~2-SyBxTx+XvwTUW@!)
zz9|Ntr^Xv)WwDrbMb(!(Vq4qqAH0$IUjv@6|F6^i1rF(dN8SHa@BdA`-)rvwPl9h-
v|36pvcjbJ_w^cpAA>gW1FIo?4^?bk=O78{@8Z>Co;KT4A&}g&X04M+eVdrj7

-- 
2.16.6