From 7b666c128d193fdaaa5961c6b88a1a1d27b5925f Mon Sep 17 00:00:00 2001
From: peusterm <manuel.peuster@uni-paderborn.de>
Date: Thu, 29 Nov 2018 15:35:07 +0100
Subject: [PATCH] Fix: Made ping pong example working with upcoming R5.

Change-Id: I415dd3c6ac8163d4ba2a3a3fe85600acc06430b7
Signed-off-by: peusterm <manuel.peuster@uni-paderborn.de>
---
 examples/vnfs/ping.tar.gz             | Bin 1183 -> 1201 bytes
 examples/vnfs/ping_vnf/ping_vnfd.yaml |  16 ++++++++--------
 examples/vnfs/pong.tar.gz             | Bin 1220 -> 1240 bytes
 examples/vnfs/pong_vnf/pong_vnfd.yaml |  18 +++++++++---------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/examples/vnfs/ping.tar.gz b/examples/vnfs/ping.tar.gz
index d8a023cc6759392710b7724df40e035811a5a130..5008542ed444ee5587e4ad54866be3002a5bd520 100644
GIT binary patch
literal 1201
zcmV;i1Wx-OiwFR{`2Sk~1MOB_Z{kK2-DiHq6+CPr#b6VXRP?1ZAzf6KL_pZ?Q#IIQ
z7}cJc&Ws`a``)q5hXZU^RaaHpIZ|Yp`{8@fJ$Hy?eDUjw$E|nY4!-Z--P}O_ye*!7
zyHh+%KyZD1hiJEN1Mu-n`|cgwe8ZY{$h08}OGydOXmZ{U-QxHQdCER^&wmNzcK+KB
zQFBAmFYxdefPCC`I%ntKxw-3X=il)=*Es*%;11{S|E*P=!T)^zp6AsXa4+OWvBlEB
zMR*BqKll#j8+axWRdb;@yl}RnN;9(o!Xx;Ya|O>7$)gJ6FADa4ki|(eqL+Bu8xCPS
z`02xR0^|OqKc4j;nzaTRhAgC9(+Dz-ZveBT(32#@M`^i&nSGt$&~Ey0VIAtFsebuA
zX4r@fQnCRq3}l*O3Z@}u2?hEZQfYv32t_IrMtDeJ&CD`?O_>DCfX`(LF*gLg3HnR?
z79aWnF?qojOJiiW)mpFDO_CSe6l&2*3P;@<4(|J-N#DbQ^N<&wP_04H-!rDLRpgUM
ztS2OMtTG{M5DLgbQM4Ih>s>2ma0#zKi`cA*qL?LO+9)>9Oogm%b=dQv1JXq})O!;c
zOzQAsZ!(x%VUACO>4&G6DSYaU$Gy>X(4WB581A1&4}<C8X@uV%p*Q*rKMzI^S3r>}
zd<}h-%GQrXGD{<kEN2r+D+R=&C`d~hvY3U~7hhy#L17_KFdW+fNma_U9j3P8!7K?&
znIR@WIclm<$fzvC8aPSmb}pwRiSAtNUA6UPM&mqrL5)y4pY)tst>ko59^omq?MWq4
zVJzABDat~O#CKrw2x2r9(%OzBSCYugzGJBvCb6?Kl-ne`cAK@Dy-&T67?OxZw`Nsj
zPl`_-{;{YF_TtSCENlaBj`UI}<DD=>RELU5%VQVn{Z!(1(pQ4hqIvJAYGiOWdaUn4
zR(ap(eTv6Jw|x1!@IGh;?`ymB20SMuEF^#(2_PCIju^$uLOaa}r5+;R#WjI^u2@9(
zL&S;FgJd>E7pdh)P*WashPgQA!4f<v7&qOWWlP+ij#eoBirK<!B${W>PvdFD);Nj{
zs`hii4SVOIu2ahG-GX;qj703r=^{1W?zmcRC=UufNZ2z8CEDQDQkXrw055NX`EH$P
zw4X?nbq`~sh*^3_Vnb2txc3+rDoRXo*VxO<ZXa@g5NF@Bl?|$PP7|@-nYV(><{39x
zrH6vD6Nah=UvdYSD*P4Lpe-g@V&Fl9zo8I!lB`$h5g3E9LA~~76psm6iA-%*fA+Ct
zhjIKZ=7#01Zf_v$tP;LTz1YU9?vXfFq0GGUwZV}!r77yyOXpp<3ED?yjl7`_yan0=
z|82>G)ZTrJhe;Nd>_eO-2}oj=6<=mOvF(D>uE{B@GSeu1LZ+0^{&lCC;I!JR0zcji
zDKsmlb#80=zfAk%QEzz68&f7D$vK@@v&;r#{Bb#QpsyH<vi07sxTk1*W})9K?TL-u
zH+6QMPj=P#inbbm+E?T28w>V=snu%#^#6Vi4h{|u4h{|u4h{|u4h{|u4h{|u4h{|u
P|2_Nx^WOMb04M+eMp#J(

literal 1183
zcmV;Q1Yr9giwFRZEV5ew1MOB_Z{j!<?K8jP3Ld7F8VD5H75lPmOLx$AXa$tnd0Lso
z0c#W6V>?j({az;_kW#AEYDfF!BUK5$AHMh8W2chw<*#cVwa&gBeBZz6^&op*=TE=W
z&7TFJeRb9Ac01kcn=A0~N9XDcdf%|75~(&sVJQjWDUDD2p<5Kalc(sTeEv%yck|!9
zgv~8U-r?a-0QtD?c2CZ~+q>?*n*VkCrgH}VUs}Zp{Lkm_d0wpnw?b|eTdoY82N%%s
z+uy-r3r{4ZY9SPdXU^7CX=b)ScnF^|uHcCxc~oKidCuMsGGA$i^a5804-YUI{q%7*
zg~@O_oXm%J%~}Hu4=kWu(-2aQJAheH7)TP}qp)1U+-@g0becY#TZejKs$YDM8MY#Y
zglvHe1F5E%f@z3YOo6@xR2pC$0+Gm=5gt(3Ftf_GDUx6r@TEv07KWfVL4S$AqC-C*
zCM(!tWsK~%TAR(LNwQ*_LM>Zy?x<T2qub$lI`pvMEaaKTRBKT5YswV1ihL4@^#o*r
zRmNlkLIGJSiZ&x`y&J_09>Pn|A~GAIC}s(nHi|7$Qz2_t9rk?afOHWK^}!TI(>nY(
zn2x5GnB((k_VMv~2A>C$$zVJi4X5xpf!oLN-Doy?9OJKh7>vKb&!h3(B~YXax1ldm
z+4`|aW@)6M<!nl6rGQA}1!+kG7O?>P;>(mQDJ%sFhGRP*sY;l(!_-zhm?dTjGsI*o
zM@{7l85d<(11AaH&E+jgqB|FRS8aWn(Kt_@QzMklCcU6mD;eFChqy{@ds2x+7)v(3
zg=v71xCbT=Awp9wt=&j6C5hDRJC=%J5<5FXxlK~G+pN{>ed-0okXS7HHLD`KlD~QQ
z$HG3?i#J=aunoLg(kr2i_l6;)I#5hn9{W%qCK694eIYn4n)QyVMh55O`+6C&&iY30
zw|G2s%MM>3KD3+d54Cc=0Z%aratUBZ0*D5QBS!JEz)mwnsRzh+eoY{sYZlV|5OJdP
zAel|kM`}3|)RYIEVJ?n&umn#E#!bJp?1<ab(F&wrF<Y3eMDzUVaWZ>9wEc%d8}`OS
zRVS3&n+0#U2x%zI$ucosxm+zakOyTRBpjHS5^eCzQkdU81267@MR}NLxSvOu_77vj
zkXdp_Y(r7#c<M1OP?VVbrm<I<J$uOfL7d%ZCmPi3g2rM~ns;(c7b!PsrH7ocHw;w;
zK4%UvQ}_+oqAen6Y~W4=zo86ELDsAE2#mqlcD+_vZ@_&_)*@BAgFpXNu){chiMe4}
ztGoLLJFA4R6ECvys(&=!bs$r(*!Fn(2~AMFUb5&zuiZH^Yvc`e;4RVK_FtDgO6<+Y
zco3&y!9GN39D^igRq<uk6Wh)??VF6UDl?73Ctykm?O%1P3Eoy)Ro}<wLJH0DX`MPV
z!(V2@$$0Q^%o|fCCGjbpSF_AV6a2IsInWo3McI0<54fjjbmBNyTRNWDzNJ%V`5(|y
xdoPt*t@d~S&*$La;Nalk;Nalk;Nalk;Nalk;Nalk;NbAz#qZncyRQH!000bJKwba<

diff --git a/examples/vnfs/ping_vnf/ping_vnfd.yaml b/examples/vnfs/ping_vnf/ping_vnfd.yaml
index e114f3e..817f1cd 100644
--- a/examples/vnfs/ping_vnf/ping_vnfd.yaml
+++ b/examples/vnfs/ping_vnf/ping_vnfd.yaml
@@ -34,8 +34,8 @@ vnfd-catalog:
         connection-point:
             -   name: ping/cp0
                 type: VPORT
-            -   name: ping/cp1
-                type: VPORT
+            #-   name: ping/cp1
+            #    type: VPORT
         # Management interface
         mgmt-interface:
             cp: ping/cp0
@@ -65,12 +65,12 @@ vnfd-catalog:
                 virtual-interface:
                     type: VIRTIO
                 external-connection-point-ref: ping/cp0
-            -   name: ping1
-                position: 1
-                type: EXTERNAL
-                virtual-interface:
-                    type: VIRTIO
-                external-connection-point-ref: ping/cp1
+            #-   name: ping1
+            #    position: 1
+            #    type: EXTERNAL
+            #    virtual-interface:
+            #        type: VIRTIO
+            #    external-connection-point-ref: ping/cp1
 
         
 
diff --git a/examples/vnfs/pong.tar.gz b/examples/vnfs/pong.tar.gz
index 087c64df51d335f08f98b9e0430b868947819540..4a086b04e8de4d0eabf64d58a6e5f680c98e2643 100644
GIT binary patch
delta 1178
zcmV;L1ZDfg3D^mLABzY8#Q6VP00Zq-U2oz>6y0Zj#T7hkBE?`6LMr-FnvgDPmPA0<
z?o&0`V;I$*na+$M{QKUq&4&YQS5;SS)j3jRnET;-&pmUA6nydPipQ;Y-wwX--`?Cn
z{_GY{zuhUGB_O!IzD2a#-2i<2a((j-ZoXknJ7n4rg{7o_gl9B4?}u)2{DnMaAG_y&
z1adq7?T4tjA?X)*_zOTjx}DD1`FFavo$dTPf#1dXciTbd9r%B16=(22pTFmMwFcY?
zxlwGfG;k4KLfa3%gZT!YNkr9LC=M^2t*Fw>Y=H0xKIUA(Gez>K!uX4Vy&q(8(v0XO
zp7tLfVLbeQ>BDpa<H2Mwo(=AswFVj<SxC925o8?S0A@*{FG+}x(sBhe`#Qm)-SpwY
zI@C*3{qlRvun`%gWCL6n$TY<iOhe2P3iLIk(g5QSic}_y@Q}iqnPvW(G6|LepUV_t
zZU}l4^q2T8KJ)`(@`5dv#>if)wO+5ABrmop)S{Jt6pp&}IJ_H-CIb%(&O=^!LbV1(
zf6ti0R*_F4v7V63vC4$3K`0;#MbT!2t#_@MVSI4~TEu2e6vZqN(?+p*W-4TDtHYiT
z9gr@<q28asa8idK`;+113UhoKPCq=oOyN_1JnoOC!@&fe#&GvEx*tx5Pb2*H0R7Qt
z_<1-@y1xR7RN-srt5mjrERtCoX=FK@P+BP<7DYi?(vZb0#J>0<BMS-(fr8=K4oIp}
zrtL7b6%S@fSjr4B`N>gJg+fMU8P>o_O1E=4C6h)1P=CFeRgpa@K6&`Zq8`}An;%%%
z2HqU$rBKE@VTh;>6_b|79@Gb^#M?<<2~LaVy`!p;!P)4cz6)99eWUj&9uM8}%h!YV
zK{I$?+nqPyIU!*o0qjTs(I9ceC|(xYX+|jZ5cw|F1oF9J5#0|FCrS^J*%UpbmLow;
zdC(c=;(wS2OYo#%-1K&qEpdA~TA}nSW(%{CXr4Vkji(h`<0v+$+Rp_y?9M}7r<B{>
zf;%ooB6j9<ks5DzTrD@02ZbIa?3;uVZSdAonBBhsFE_z_cb#aopGcJT4r8N;S$arf
zLs9B@?=db^l$c`I*kxvKA98;XXWz4x4XSod6MwPZnYV(><{39xrH6vD6Nah=UvdYS
zD*P4Lpe-g@V&Gnczo8I!lB`$h5g3E9LA~~76b}hmiA-&;{_JDP4&(S+%ni$1-EJW4
ztP;LTz1YU9-jO&~q0GGUwZV}!r77yyOXoef3ED?yjl7`_yan0=|82>`)b2jU!z7DJ
z_J1MHk_03%%Ze|vp4fK5Y0u=8Rhem&J|R;|X#cuXO>kOmRe}4qC}KC0ozNBTNib_+
zcY?NiB}*b$k`)Th-cA;m`xCD-O|yhxt4IAyp;<BQbGL5r%XBav^&gLUXUb$GId@O0
zS!TmA{x}^u&{vE_*?VtSgr{hHW+A+}^g}0Z{JyEP>)>Qpjjw2{@uz(?zP_<wFSuH*
s_D}!s=-}Ys;Nalk;Nalk;Nalk;Nalk;Nalk;PCIm9|H=#dH^T@0JMNhkpKVy

delta 1158
zcmV;11bO?|3B(D1ABzY8mMpSc00Zq-U2oz>6wNcg;tC!%kzz0evMcwcG$CEoEQx@y
z-KT1>$1tirGdnYe@b7!aHXjZlT2)=OtIm-k!`u(wd+wP_q~MD`Ry=N<eLwiV|Gw9Q
z{CQnG{Z6-dmVoxvRj=Fabg$oEfsbFV+Go)Fjy3I&X+so$mXZ>l(d4ury2bGudCER^
z&mRPGJOAy6sJS8O8$A3CARpJ=?#cOguX~*r^S|!+-81n2(JD^he?EWD^J)#a5ptv0
zVrk$!ynv41{s8k0Jd%j2xlkOQI9pMrnb`p05q!$If=7zvQHAm61$#fs;-neT3q0-L
z-@|zL>&NMT1jd8OU_2Y#Hfs$u+_R8!O(V!Sz5&dVLSK>)AEo6IX7+W0L#OG(xpk<Q
zruxNCm|-I_NXZ7cFpz1ADVT<sB^2m$NTmVBArz@h7~vs>H8acnHDwYk1HP0g#M}_{
zCg?BmTYTsT#N-8AERB&ttF>OQn<Ou`Db%8s6pp%obw9irj3xsQ3(iBHctW)XMZacD
zVXMd|kyuYi=2&Gy)*uv+g`#LP!q&T1%rL&V1TA8-CW>N~h-stPJTn!tw$)+JhYm;=
z;ZW~SU^uD6Fa61Ia)~)U52qg=o~H1*KOXl-)8SwO4`aA_7~Kx1!-o-myMzAd3;Z@5
z-ChDpMXK;M^jRufKNiU>jWn{HO(?At5R0N9EosPN7Ghs~k&y+3g+Re@YzHJ&DbseC
z+KLCWBrIiynEd3ZsX`&6vJ7kBB&FNAye5-L0#JWJ&8o<r6rVi&V^IKh@#Y5>wt*K%
zdMT9gUNJ;ehl)wdV*rCx;^n--mQl<|+-!8Wb6n-!22g*Ez50P$e&qsq*KW4o)pq9%
zcuYuG3?BOsKr~1kEJ~Jzc7_oOJVcg@<$x@%SVZ@u!#UD}WHv>BgmR>%DG&O=TpaUY
z37&rxjGJI*+0wNqp%qHMVzw|FiRRhk!+833X#1N&8+Om3mQ%{@KEb^fBMm!qx=4+;
zJFXTR%7Zcw6823(i8gpsDa>x4fS0#_zPmy++Rr1(g2UJ-VwN0|*ie)=-gS%%6(y$F
zFLr_18;8sv#M$?3rGiSG(?qOy=B)^`dB%TDR_UQ&>=i>rclD>-0j3H!{|0R_$r1y%
zBK#9o7;g1guhJth24maxTIIX}cL`aEOl`0G>{H1O<M{i_4a-~IZXN8b623~k*v6~i
zXuhjZW?uQ)<LRd~MfG~=Jb+%ib7a=Y8|uJYpuO$CEP0sPeaCp1WKqdJ#95MnBxZkE
z@nzN%+b%c_Oio#qnMUaoGNpv}ue#L)udA)9Z{HS0>^8C!y2RZGW-aVO&~}$(Nd!x>
zLc!U)$>MTn;$^03mJn?9sDCLmE2e$w&JBK_4#uPY{W0%MnT#Z-?nyPvY&garq$3CV
zjIk(t@8yE<6pc@;gDNG*6W_OVY8Nv62U=?HrB<ue{_X!19UL4S92^`R92^`R92^`R
Y92^`R92^`R9DW4+1+hGqg8(Q10DI&!6#xJL

diff --git a/examples/vnfs/pong_vnf/pong_vnfd.yaml b/examples/vnfs/pong_vnf/pong_vnfd.yaml
index 3e80700..dbfd9e2 100644
--- a/examples/vnfs/pong_vnf/pong_vnfd.yaml
+++ b/examples/vnfs/pong_vnf/pong_vnfd.yaml
@@ -25,7 +25,7 @@ vnfd-catalog:
     -   id: pong
         name: pong
         short-name: pong
-        description: Empty Container VNF
+        description: "Empty example container VNF"
         vendor: "Paderborn University"
         version: '1.1'
 
@@ -34,8 +34,8 @@ vnfd-catalog:
         connection-point:
             -   name: pong/cp0
                 type: VPORT
-            -   name: pong/cp1
-                type: VPORT
+            #-   name: pong/cp1
+            #    type: VPORT
         # Management interface
         mgmt-interface:
             cp: pong/cp0
@@ -65,12 +65,12 @@ vnfd-catalog:
                 virtual-interface:
                     type: VIRTIO
                 external-connection-point-ref: pong/cp0
-            -   name: pong1
-                position: 1
-                type: EXTERNAL
-                virtual-interface:
-                    type: VIRTIO
-                external-connection-point-ref: pong/cp1
+            #-   name: pong1
+            #    position: 1
+            #    type: EXTERNAL
+            #    virtual-interface:
+            #        type: VIRTIO
+            #    external-connection-point-ref: pong/cp1
 
         
 
-- 
2.17.1