From a50ae412e492b5bc60c1c27f7d2e17dfebe37c38 Mon Sep 17 00:00:00 2001 From: Andreas Geissler Date: Mon, 6 Sep 2021 09:48:48 +0000 Subject: [PATCH] Update HEAT-file for ubuntu20 used for basic_vm_macro test Issue-ID: TEST-361 Signed-off-by: Andreas Geissler Change-Id: I662945ec980bd100c7b3279a2fa97a1e8889f92c --- .../templates/heat-files/ubuntu20/ubuntu20agent.zip | Bin 2719 -> 2716 bytes .../templates/vnf-services/basic_vm-service.yaml | 4 ++-- .../vnf-services/basic_vm_macro-service.yaml | 4 ++-- .../basic_vm_macro_stability-service.yaml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip b/src/onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip index bd15d47cd4043b096dcff4a9b63c69120ff3de5b..bb6558779da2eb756cc03ce6757e03cd25707dbb 100644 GIT binary patch delta 2122 zcmZvd3pCXG7RUc%X5`Tvit!dh<24L1ZdZAvF#{^GA&Iz;x5ThrO@wW2kTb!}DUnRZQJS0*zyUyc2= z5^HnZk{nin&fi#{rBOi_<>btX|#}c+7Q60f#Ij(>pvfNY|9i`(6)^ zjIaDxbZw!a4yc8Do-{+ShU|5rn!E9%qBMUnf@J#@uK+1JGVXiuHc}U9moH#z`tx#- zqoED`(45@O35(}9W{Ii2-Et;*#_3_HV`7E&S1pO#2Me}Uimeng_hWn|{h#nnr|~!U zpb*x1FW|Ba4JI^}MM=jgIr61+;k}i~%wfY&JIyW(?`6*K1jtnpFM>BmADme#QHCYq zTWWp*{4KL1jvqZpKC7G2aoS)t$?C-D-a)Rb*)6NU*3a>&urd>^9B@^w;dCDl4(6g!5%sy%ahp-{nc4#DX}89@S5w%y z8y8!=kLMJO8Q;g^ z(Zr$ZB-`~oMUum9-gA#ftkawr=C{3%VVr(r4(f!{Owy)^Um_Qw&8^2nY%AaY z&WXk6?=x3zE*kN=1II+mcuki;j%EdUH|lJudL4Fr2U0*ZOg>8Zpm^9x)!t5`pZVK^!7RRsezo2cPZG{KCWe4e?GkNG4IB~+fO)a8arc<8 zmHq^uXZ8F2Ds30;n$;b?{Gih_<)NH0SJGff?;OFq`cz^=eUY91AZdE8?W)%5t(lhKk~||vzbx-NzfF1VE*D?#xj0PLjOQsS z*^k2?WnF51zE>9`cR%EX?<9=>u;3QIwx_hSb_QjbJ`ObNjERk!db)3e(eZyHPv*N07vM$g1( zA5;C;se$O=m=&qhVFmP(Q6qE)D-@DQ=H>gk`IBdGW$%z?a;llB1;%yXRf=#n&R&jhS2|jn-_Bk z3cyhjCHm>31?=`jTup91tn>L=mlG9o%4x2$TO+Bs-e2v`0I`{tE+yjTc8D2(6TwO z82dayfl-GRWEnWob|=JWD|#*Yq-QT{T1;vnrlKdQp*4TfhJCkU<669fP-KtY%RfG`D`b{_#J>r+@elC3)q z9T;&X)B^_vzz%Nq=YL$SLbLpl`KP&x000640Q-JmRwQtR%nSGk|9?bXhzgC2GB!f{ zhem(H{vQwij=i*N?0@cfC;&W=0f7B~;m!!V_$!x)4+;JT{$DHj)-P0acRH}}hzN&G I6yLr50nqfP9smFU delta 2067 zcmaKtc`)1g8^^y%goIMJREv^zHGZW?Tdh*+sB00bs4Fyyd#mcIXs9NR9*#I#tfFz> zZ74k)QPH@{*18hwK8luYSvSk?kL_>!$8SFKeCBy(o_WoC=9ziFv&5c?iCCFIxI_T} zfB~#1Jq#nWU#d5WElX;bM7VYAS5PP)0OFd10Kk90hskEtyvw5GwN;dQUV3f&rCv>U zIY~jY4&mIeSpNrH$!i)Ww(G0WBWMk@#@jj0wAO5PxP&Vi)_$s$=J1vX;xSK3Py%xe z_?cH7<_H|SVjT_|v*Q{VbOm+z@eSYX9JD)QsZ}>)ls}4J*PX#{+w4A8q5NkrTS_-S z9a|j5;uo>niC|q-vkws3osVyntO$6dzirLl6>K}EfyF=7(4+XvZ@{J(X)Nos2mxv% z2&cT%7m17brbPTOO05}g-7H8&w{lD>M;@&84ht+14fJ&)1867H|62J>wE(+|hol_+ z)k((Hu%_;zK`N@W<}QY>V}wm@1v^UpVFiRE1ly=%_*)wd6=a|kX&m#WfjHOG<+$!h z)rK4=p+2UC$hzebdlO1lRAhDmEpKjvMhDIA32tjnarAO z=Hofxiqo+!uX^F;);95OM>{n_Eb`|0CYN;NXGIj$8=8=Eo6K<{C-Q6mEPLQz87S8TU#aS6_4btoT|P zUmP2C!vli%dchrpNO&d+*11=nwUooFqkBwR&MWO+BVppBsjDP>d^#_>+kB~^{ z?6rkHFXLsnxNWKnid3SgtxZpSb7AY`n+WF8$WY4=;hIE1 zf%L8~6~rS78lZ~vD3H)D?};ZV1-M1B(Dp~(7S@?@^C{U@zoBzy4CSIwM-xY_l!h;| zkxlE+(n6JOxAOi){NHcy;mA-~fqJb75E*9r&jky$Wx8 zZTU-UoAXd}+7};t<~g>2$9d5F@!;FF9xdUdruY{6qAySP4HO-EBeyr=eyL+o59fld znuO+u*A~k&ZOz;}bkC7+9p{o?;ZYiM%fy4{P94b=r3tTk*S7~dtypcYw!Q3a zx?}pOu~;dD`5zFz3g?oJn7 z(dq;=)F8Yw+j2c3f9D%AbYyKVNa$&gJy#@5s9YJz1rA9YGV_p~sB;Tf|u@f(fc_-j+&P06RChl<*#%(fSp zFK{@{3H`GX(wIU@n4TXo1BP6x4bVOk`cd-eZ*#8SeR9P)>5!7(kKUMMKp}y^(vTnW z5exvbTmT>hAog<;06_aii#q7sv4J?(Aon2uTS4k-CvpD4S8SmG&2Skr*gi)*D(lY-f Uxs@4|`#>{f|AF_nW8eqV-&v}gz5oCK diff --git a/src/onaptests/templates/vnf-services/basic_vm-service.yaml b/src/onaptests/templates/vnf-services/basic_vm-service.yaml index 4609bae..227ec48 100644 --- a/src/onaptests/templates/vnf-services/basic_vm-service.yaml +++ b/src/onaptests/templates/vnf-services/basic_vm-service.yaml @@ -5,7 +5,7 @@ basic_vm: heat_files_to_upload: onaptests/templates/heat-files/ubuntu20/ubuntu20agent.zip vnf_parameters: [ {"name": "ubuntu20_image_name", - "value": "ubuntu-agent" + "value": "ubuntu-20.04" }, {"name": "ubuntu20_key_name", "value": "cleouverte" @@ -19,7 +19,7 @@ h+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBh\ t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key" }, {"name": "ubuntu20_flavor_name", - "value": "m1.smaller" + "value": "m1.small" }, {"name": "VM_name", "value": "ubuntu20agent-VM-01" diff --git a/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml b/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml index a129d41..00f66d5 100644 --- a/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml +++ b/src/onaptests/templates/vnf-services/basic_vm_macro-service.yaml @@ -18,7 +18,7 @@ basic_vm_macro: - vf_module_name: base_ubuntu20 parameters: [ {"name": "ubuntu20_image_name", - "value": "Ubuntu_2004" + "value": "ubuntu-20.04" }, {"name": "ubuntu20_key_name", "value": "cleouverte" @@ -32,7 +32,7 @@ basic_vm_macro: t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key" }, {"name": "ubuntu20_flavor_name", - "value": "m1.smaller" + "value": "m1.small" }, {"name": "VM_name", "value": "ubuntu20agent-VM-01" diff --git a/src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml b/src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml index fd56a37..62170bd 100644 --- a/src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml +++ b/src/onaptests/templates/vnf-services/basic_vm_macro_stability-service.yaml @@ -18,7 +18,7 @@ basic_vm_macro: - vf_module_name: base_ubuntu20 parameters: [ {"name": "ubuntu20_image_name", - "value": "Ubuntu_2004" + "value": "ubuntu-20.04" }, {"name": "ubuntu20_key_name", "value": "cleouverte" @@ -32,7 +32,7 @@ basic_vm_macro: t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key" }, {"name": "ubuntu20_flavor_name", - "value": "m1.smaller" + "value": "m1.small" }, {"name": "VM_name", "value": "ubuntu20agent-VM-01" -- 2.16.6