From f57decd2238eb03047e9865cccb6092d82822b92 Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Fri, 19 Apr 2024 17:29:42 +0100 Subject: [PATCH] rApp all package restructured Existing helm artifacts removed and new artifacts added Test cases fixed Issue-ID: NONRTRIC-981 Change-Id: I2ebfcd0e95dd2bba1aad53f8a777e509370b1d8f Signed-off-by: aravind.est --- .../csar/RappCsarConfigurationHandlerTest.java | 8 ++-- .../csar/validator/RappValidationHandlerTest.java | 2 +- .../Deployment/HELM/hello-world-chart-0.1.0.tgz | Bin 0 -> 1413 bytes .../HELM/hello-world-sme-invoker-0.1.0.tgz | Bin 0 -> 1558 bytes .../Deployment/HELM/orufhrecovery-1.0.0.tgz | Bin 3672 -> 0 bytes .../Deployment/HELM/ransliceassurance-1.0.0.tgz | Bin 3280 -> 0 bytes .../rapp-all/Definitions/asd.yaml | 8 ++-- .../rapp-all/Files/Acm/instances/all-instance.json | 45 ++++++++++++++++----- .../rapp-all/Files/Acm/instances/k8s-instance.json | 45 ++++++++++++++++----- .../Files/Sme/providers/provider-function-1.json | 2 +- .../Files/Sme/providers/provider-function-2.json | 2 +- .../Files/Sme/providers/provider-function-3.json | 2 +- .../rapp-all/Files/Sme/serviceapis/api-set-1.json | 27 ++++--------- .../rapp-all/Files/Sme/serviceapis/api-set-2.json | 27 ++++--------- .../rapp-all/Files/Sme/serviceapis/api-set-3.json | 32 +++++++++++++++ .../generatetestrapppackages.go | 2 +- 16 files changed, 131 insertions(+), 71 deletions(-) create mode 100644 sample-rapp-generator/rapp-all/Artifacts/Deployment/HELM/hello-world-chart-0.1.0.tgz create mode 100644 sample-rapp-generator/rapp-all/Artifacts/Deployment/HELM/hello-world-sme-invoker-0.1.0.tgz delete mode 100755 sample-rapp-generator/rapp-all/Artifacts/Deployment/HELM/orufhrecovery-1.0.0.tgz delete mode 100755 sample-rapp-generator/rapp-all/Artifacts/Deployment/HELM/ransliceassurance-1.0.0.tgz create mode 100644 sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-3.json diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java b/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java index f1d3044..7565859 100755 --- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java +++ b/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandlerTest.java @@ -97,8 +97,8 @@ class RappCsarConfigurationHandlerTest { assertEquals(jsonNode.get("compositionId").asText(), String.valueOf(compositionId)); JsonNode overrideParamsNode = jsonNode.at("/elements").elements().next().at("/properties/chart/overrideParams"); System.out.println(overrideParamsNode); - assertEquals(overrideParamsNode.get("appId").asText(), rappInstance.getRappInstanceId().toString()); - assertEquals(overrideParamsNode.get("smeDiscoveryEndpoint").asText(), + assertEquals(overrideParamsNode.get("environment.appId").asText(), rappInstance.getRappInstanceId().toString()); + assertEquals(overrideParamsNode.get("environment.smeDiscoveryEndpoint").asText(), rappsEnvironmentConfiguration.getSmeDiscoveryEndpoint()); } @@ -106,7 +106,7 @@ class RappCsarConfigurationHandlerTest { void testFileListing() { File file = new File(validCsarFileLocation + validRappFile); Set fileListFromCsar = rappCsarConfigurationHandler.getFileListFromCsar(file, "Files/Sme/serviceapis/"); - assertThat(fileListFromCsar).hasSize(2); + assertThat(fileListFromCsar).hasSize(3); } @Test @@ -142,7 +142,7 @@ class RappCsarConfigurationHandlerTest { assertNotNull(rappResources.getAcm().getCompositionDefinitions()); assertThat(rappResources.getAcm().getCompositionInstances()).hasSize(4); assertThat(rappResources.getSme().getProviderFunctions()).hasSize(3); - assertThat(rappResources.getSme().getServiceApis()).hasSize(2); + assertThat(rappResources.getSme().getServiceApis()).hasSize(3); assertThat(rappResources.getSme().getInvokers()).hasSize(2); assertThat(rappResources.getDme().getProducerInfoTypes()).hasSize(2); assertThat(rappResources.getDme().getConsumerInfoTypes()).hasSize(2); diff --git a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/RappValidationHandlerTest.java b/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/RappValidationHandlerTest.java index ac61c3e..9487739 100755 --- a/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/RappValidationHandlerTest.java +++ b/rapp-manager-models/src/test/java/com/oransc/rappmanager/models/csar/validator/RappValidationHandlerTest.java @@ -103,7 +103,7 @@ class RappValidationHandlerTest { Arguments.of(multipartFileNoTosca, "rApp package missing a file TOSCA-Metadata/TOSCA.meta"), Arguments.of(multipartFileNoAsdYaml, "rApp package missing a file Definitions/asd.yaml"), Arguments.of(multipartFileMissingArtifact, - "rApp package missing a file Artifacts/Deployment/HELM/orufhrecovery-1.0.0.tgz"), + "rApp package missing a file Artifacts/Deployment/HELM/hello-world-chart-0.1.0.tgz"), Arguments.of(multipartFileNoComposition, errorMsgMissingAcmComposition)); } diff --git a/sample-rapp-generator/rapp-all/Artifacts/Deployment/HELM/hello-world-chart-0.1.0.tgz b/sample-rapp-generator/rapp-all/Artifacts/Deployment/HELM/hello-world-chart-0.1.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..8ab744180155985b888011424ce0abf55a0be6f1 GIT binary patch literal 1413 zcmV;01$z1)iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PLAjZ`(Eyfb+~>aZ6Aj31Ufh+@$cZ2hT}SV}%{WZi+q?v~-r) zP$WlEcD%y-?E@(}mE*Pv&>-zv-GgM2)bWlw-FK8{$hmARq~=K@o>6VXo;wChn(>`S zk|>IzlXlymqbRz2j#|yE zVF$J%i`b>Y4p5~yi>Xsc=9_bU@5T59W&8b~Q=X%F%mi@H``?OAqr30_Y5TN(|DQtk zph5Nk;EylJ>wfQiFgkxf8h0H@bu48L8C`;q7IK4NXUxEqaRj`HQCVODVwowft6HA!@ z3b9m6kkjf&pqA|U(OzcOs!kX#7K?y-n**uSkQZZ3ST1g(6-4D-Zv;nUK;z#z)0n_y zxz3jpj=<>xqz0O5#00E#W-m0eOr%F(~=@c zAML`Q-BEvZT#yoBCxaMmC9hl3FeUqW~A4*u#7&W-?? zouLN2QQG++H88iLm=w!5LfkOI;lo`Ug)y757&sMaPE&+b&QS{{Qc$QfX56ziKt=1xGA2$>H}a? zkisu9om0l$b31ZtQQXdDOnGQ5O`Us%4j)Si&XG%%p|F5r&a@QncR&C%DruONdf5Si zH@P_uWJ6QYFtH1#PBV(4cDQZ|g%sLq7B>vd6vu|o@IJv4087&~Y>7cVXR-Hgi`Z_c zr*)6##-i?D5b%C>;6?NzA~mXi64~az#Y}N((S!*qE|)$Gzo{CykN@rV-TMFZjHQQ+&k)#|4%cD}~{^*Vg(r+|C+|0nIc z{BJg!HUFPNYW~;!ulfIQ{@nP}0VOgWxcz=aZMW9)# zQ?v!nD!@}(S{X~;fpPDmY}=sXW^r*Z_`{&KR-|6qnZW2ulDA8C&J{{MS^y!HRz zX{%N9|0!e-E~vGrh4Coyj~x~>6fnsdPkjER@ik4+xU@QU%rv?3=?RRB9!R;I6k8IH zAdQ?_Hb+p@&MNIi>K2$5jNexpr|brk0<^y!1TYkQ=|7&T!X%gZfir;t3C>3EM^<{U z^<svehEEG8m zCiI#d1~zlQrDiEP{Fm&(71d1U2Kr~`h6GB>4;Wh#umovX4A=4l3Fao235Io|tfiJ( Teq{MC00960F|!c@03-kaA-=BB literal 0 HcmV?d00001 diff --git a/sample-rapp-generator/rapp-all/Artifacts/Deployment/HELM/hello-world-sme-invoker-0.1.0.tgz b/sample-rapp-generator/rapp-all/Artifacts/Deployment/HELM/hello-world-sme-invoker-0.1.0.tgz new file mode 100644 index 0000000000000000000000000000000000000000..228894699593fd2206752b877e0bacce2107ff7b GIT binary patch literal 1558 zcmV+x2I=`9iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI;&bKAHP_A`FP)}EV5G8Re6j-9g82UXI|ahj7nqRyE-c_4B{ z;S2&O07_AB+~3{-NZFDTosvr@ZSS}bqzHh!*u`SMkI)i1mz}lLJnxtiJ4~$PJ?e0< zq}m1>TJn>xmMDs%tIJD&kD}=LJ?dRtpL8#;y3yrzuiL#kiMp?^u6idBeZA@9QW;D2 zN%YmWo;&w{B2=+k)P_kB!>UK9Qjd>O&1>(| zTsxQW&gBuLKaL=&^N0vqVhjhejM$CB7^qU5Wz?A&lG?o z`@eT_5k1@gSKaPqyZ^t1oI!`20l;4m$lGKv8mFVXbk?8F4h?z~uWHhn_Q#!c;2*yG z&ff-7Z8R&E7G4ZqLNDrF#xPMR60y(}zL%BA{r-nhrKQ5%SKqP>g~1#uk)sB?MCdD; zEpgj(4o%5|UJ$_xH{i7CI(_*UuVW)CDCq`-v``rYyJQ9yj3eNO43z~YAd{uyjEW3l z&Fs<}YSaW?$@@l$oLkBSP{^d(fL!d31Zv5dAMIsnt%}2Ny!(S2?zOy2W+q$Bdy{bR;hv4cj4fCOoQk5N1wtWL zs09-RDAXl0Zfy-vk$XLymCX8NF(11Yd{#1##>1nj?2?%fR?-4v0&wQ@hJr?p)McaZ zffrQdprp1Ss&bC{C9nlZ;X_PUlySFi=PnlY>s)4(hsM&vxmWA(xs>Ayxl|z$;@>CpQGV`!T$U-b94#Ox-D?N+o%`B?EU;s?=SQ697}< zkeSRa^kyV-C7G}>WK^+5CN&0IF9Ng5f~+oILjIsOmJq zaemgvOJiDM?cP>uz6GZ{vG7g76AOZehxnszOAB~-INi~NVioT^KAG>|+}tI@y)FR% zxw~(7hsp$=$2>Feq%r+*bT>@W!Q^%{eeaU%W|E9&UuNM`gy@+;$Ft0*eR6f?nZ3sq zxbgIC$85u$0#92X9$K#SN0#IKZ<{W^{V3?z`A>9x@tptlUSGHT?^{UA|62an^1sjG ze~;9!IcfL;-q+O7N77dxqI?3AT}RD`cF?}l9I^ZghS%w4sV>mgfWJctl$KUzlE*L` z+%#=_ykVbQekSE>X~XY94&i^WL|(E&NR3}@*$YK8gzmC^G%FE4DVo#lzEYkJ81gDGYeilKb9zr+1-5j*rDg?r z^)GS;w^TD(8AygBLjtAc&zM;fupDVv57+W%60A%na}3)G*-9&|{4dMD0{{U3|IZfb I#Q-J%0MFJ0i2wiq literal 0 HcmV?d00001 diff --git a/sample-rapp-generator/rapp-all/Artifacts/Deployment/HELM/orufhrecovery-1.0.0.tgz b/sample-rapp-generator/rapp-all/Artifacts/Deployment/HELM/orufhrecovery-1.0.0.tgz deleted file mode 100755 index 4dc0b274cdb01134c0e83fa2ee6e477800147289..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3672 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 diff --git a/sample-rapp-generator/rapp-all/Artifacts/Deployment/HELM/ransliceassurance-1.0.0.tgz b/sample-rapp-generator/rapp-all/Artifacts/Deployment/HELM/ransliceassurance-1.0.0.tgz deleted file mode 100755 index 348e1a6991b39db6127462c4a46fd6a8dc7fe7c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3280 zcmZWsc|6oz`yM1DTk5f!2vLME#ya+Wmn{#YkjGw;$~Lk^VUWs_M#`2@MuxFWMD`IO z``DFzFw8W|_f^jy@9*>e&h_`X@9R3}zV7=R@MHGVpx+CS16{mk=Ah(lW(~2ruc3Bb z#aYS6QO*CVqXxv**%@N(5)^PP#OMAM`%oP--=JX7hDUJN6l8ZWFy@h1Nnza{@}KO; zS`w;21GNbW5S#MWuntqivt(r^a&wcToN#mve3X=@vE zFI!4`C)d!Nw_j?Wdqyjtw<68`GRZSXs?*xB=j3p*t>Y%9k)w=BDbl3-D`BkveUVoT!9lcwj5@xb`%U1S+Qk$0|U;L zLTI3VbgP)|BB5ycY|;`0J;kWh-)*ic%PynoA$GP9jBIE%lD>^Pd|2@d0 z|Fs@WW5neX6ncFv%1T6NT1kz=(&LBfsS_~y(~n+Brm--Yk}+pZ)*Iu>&j%SQ@R!hL zXJ-cn()HU9R1!tE@7t5&TfQ-ddM4)HyqenK2q0%fsj}-0<8D|v2qa_lq6yyILXoGn zZ?hOM3t3ut*csd%O80q0BnGl~n9cB-tDnKj+hue41$ZyXM%o zE6nsIOS*>v^S5)4uwN|Z=6Pd*e>U=M!sj$ zYiM#aL|W&aP=J`l-qt_Y>f&0Dsc1>`)|6DS)lYPHd)HCkl6W!ri9CoI%uRR+F)^@7 z9o8w?9AS6Tc)7Kwk!8h`rH6bZ!HPOI>7rDf2npwSWD|pw6&Cz>m03SZ4Fr+)j#S=j z=A2hvt!JYT<=F{jAJ3^=jwU`w4oRqLow$`7Yp z>Fch4->i@d6V4{bp6kJcTNr=I4^`trALq5x@WU6o1~>Y>dMToL62&{nuO3>bpOB4~ z#VNj7Yiq?@Q?z?Eo_^=&D;FOT7*m82MYeKyajjOo%a!Up{m%RHHyfK}sw>&HVr=Mj zn9xo4z|y=U0e4X`@pz}7YoB9M!5l0hAd2FlbWzyG>RbxzbwlQd4TmbK{nj{srJn`C0Q%b^;z(D zTxfCr5~A`$%c=u`ALG~y7UEvn!P%hwLv~^APYjk2PG&#Fg(%=%*b<@}7}hEY3U#D* zH%uigo^co*J71Tw%@!3_2`PEhV8k~7m)r`!%a*1!+h1aLwC~0McfxU|$s?SS7mT9;{WW2p8g(P|oomV_s+dZDg2BW> z&+vCTSN1RQTe2fS4L521m&3z1;?ny2n_qnQyButd&R6(YgiWTOPDr_BlFGh%T{*kB z2EHf&_A|VoF`Aa2s$;$?zt-k5R+%r3)l8@s4m0Cb^VZW@la&y7kt6GO8#`8e=3{V3 zpZvr~aeg3+{bP*%V(;4DMX=}T;s;giBh@$fx%JxAlIwNmgt}6o5G5MZJ#m2zmE8E#_Vl3)V_rDUJ>3Ivv$W=Gxn;8KspuD+<@$MPA#!( z=kw&L&bZ_}=t7*l@dVe>92=(F@U}{8MJaqsKPE6(4khyVD~~Rsx~#GliktTM$oO$` zG+`0lxBhu?vF}NnmpXl&=|{c6ESJqCuzh@nC#C`i6+JnNf{Vk7Q+%af*!TaW)O;^H zk9hH7%emu%Gu{qyD>gE66cJThaNyft_=>hcBQIfb-iz|_hjyexvAXB7Qwu<6^w8_) z@w;OPY?X5my=^QMA6p|&a6KR0=Fim)xdk+gNboT=Yi zgnc6S_*=HN#PLm=(D7IJ2Tgd@u@J4 zFR76bk?j(*=wdE&8uH$>=Q}2Fn7k}NL!OxeeAR-d0jJcC8&(h->We~@ho{E@a!yv1 z`LM~;u;!FWm4v}%Zpm<~$Gm4}n7yyHIU=AIvPqi&UswDt88@@pv5A{8X24T(GP)~h z1S1BLhWjNf2>^Hs;21R+3O}(3(Cae;uWQ6#l+#997*ZOe&+-6G5gW9cnYB3@Ld~Jx zSdww>5B$O{CT2?`?tTY7&k#f^plZCY#C*uoD;g^mh)<;| zNLhP!M%W=@QcNoYIFjy`o)eOl0{n}gg%0(YiFn{*n#Dt4d|i7VJfIy~un;{B@2lsa z!rmPmU!#$z^aniwfZ()aylhv(guX<`-d9_z&_c!bkel=6S0<7G1W=bwrxd>i<&=UG~X{8h$gK3vb{HY@m6Y0`QPGsGbSvzi8!$);Pcja1ArEm zn~@~a1QuXN_}5gIi7?jJ!~f{rsBI5ATk}TSATz%O`}9d65nU1CAa% z>U_UVsc?!2{sUNxWA6cEiU>=#&pUQjZH7hY)3e$W_Hjmx0O+SnWZ0|Oa0{rAfEFVQ z2{>yrLO;3-0xpsz?oxk}|2I8?>-De~jEIF!`u&4vp`-`F2l3q=J1F9hvc3IWStUB$ zivi;U+&%b-xD!Y8Z_)p6{yZ|Oqg+)u^XXft$hfDCxSUy^hl2VzEAYJLi_wtC?E)>f z%mlz1Ed~Q7Lhfj#07uj0uT!9al?XHV!bzdPa-)p}_M$zU+Hp4)TWH3O# z+ceX;hZ_B@jg0&Q)U2FuRDl)EmO|N(in}3oA%o&>*<(l@fs?Bvb-mPShcORj7gC97 z4!T1V(+W>Oja1miIAgHXf1Zx~|A7?9sC4_ESI#QZ4PEs=)b4S#Lv(C$5plbleXl75 z0W9$P@gd@hWJ#3I?pv*c& zSNN-Yp}K#qWcLL7@KtR%^$N diff --git a/sample-rapp-generator/rapp-all/Definitions/asd.yaml b/sample-rapp-generator/rapp-all/Definitions/asd.yaml index b53c6c7..486b038 100755 --- a/sample-rapp-generator/rapp-all/Definitions/asd.yaml +++ b/sample-rapp-generator/rapp-all/Definitions/asd.yaml @@ -20,17 +20,17 @@ topology_template: application_name: rapp-all application_version: 1.0 artifacts: - ransliceassurance: + helloworld: type: tosca.artifacts.asd.deploymentItem - file: "Artifacts/Deployment/HELM/ransliceassurance-1.0.0.tgz" + file: "Artifacts/Deployment/HELM/hello-world-chart-0.1.0.tgz" properties: artifact_type: "helm_chart" target_server: "chartmuseum" target_server_uri: "UPDATE_THIS_CHART_MUSEUM_POST_CHARTS_URI" item_id: 1 - oru-app: + helloworld-sme-invoker: type: tosca.artifacts.asd.deploymentItem - file: "Artifacts/Deployment/HELM/orufhrecovery-1.0.0.tgz" + file: "Artifacts/Deployment/HELM/hello-world-sme-invoker-0.1.0.tgz" properties: artifact_type: "helm_chart" target_server: "chartmuseum" diff --git a/sample-rapp-generator/rapp-all/Files/Acm/instances/all-instance.json b/sample-rapp-generator/rapp-all/Files/Acm/instances/all-instance.json index 2e5a18a..a654bff 100755 --- a/sample-rapp-generator/rapp-all/Files/Acm/instances/all-instance.json +++ b/sample-rapp-generator/rapp-all/Files/Acm/instances/all-instance.json @@ -24,29 +24,56 @@ ] } }, - "709c62b3-8918-41b9-a747-d21eb79c6c21": { - "id": "709c62b3-8918-41b9-a747-d21eb79c6c21", + "d7be552e-bcc5-4478-b64d-797dbaec8f55": { + "id": "d7be552e-bcc5-4478-b64d-797dbaec8f55", "definition": { "name": "onap.policy.clamp.ac.element.K8S_StarterAutomationCompositionElement", "version": "1.2.3" }, - "description": "Starter Automation Composition Element for the Demo", + "description": "Starter Automation Composition Element for the Hello World", + "properties": { + "chart": { + "chartId": { + "name": "hello-world-chart", + "version": "0.1.0" + }, + "namespace": "nonrtric", + "releaseName": "hello-world-chart", + "podName": "hello-world-chart", + "repository": { + "repoName": "local", + "address": "UPDATE_THIS_CHART_MUSEUM_GET_CHARTS_URI" + }, + "overrideParams": { + "environment.appId": "DO_NOT_CHANGE_THIS_RAPP_INSTANCE_ID", + "environment.smeDiscoveryEndpoint": "DO_NOT_CHANGE_THIS_SME_DISCOVERY_ENDPOINT" + } + } + } + }, + "d7be552e-bdd5-2233-b64d-797dbaec8f55": { + "id": "d7be552e-bdd5-2233-b64d-797dbaec8f55", + "definition": { + "name": "onap.policy.clamp.ac.element.K8S_StarterAutomationCompositionElement", + "version": "1.2.3" + }, + "description": "Starter Automation Composition Element for the Hello World", "properties": { "chart": { "chartId": { - "name": "ransliceassurance", - "version": "1.0.0" + "name": "hello-world-sme-invoker", + "version": "0.1.0" }, "namespace": "nonrtric", - "releaseName": "ransliceassurance", - "podName": "ransliceassurance", + "releaseName": "hello-world-sme-invoker", + "podName": "hello-world-sme-invoker", "repository": { "repoName": "local", "address": "UPDATE_THIS_CHART_MUSEUM_GET_CHARTS_URI" }, "overrideParams": { - "appId": "DO_NOT_CHANGE_THIS_RAPP_INSTANCE_ID", - "smeDiscoveryEndpoint": "DO_NOT_CHANGE_THIS_SME_DISCOVERY_ENDPOINT" + "environment.appId": "DO_NOT_CHANGE_THIS_RAPP_INSTANCE_ID", + "environment.smeDiscoveryEndpoint": "DO_NOT_CHANGE_THIS_SME_DISCOVERY_ENDPOINT" } } } diff --git a/sample-rapp-generator/rapp-all/Files/Acm/instances/k8s-instance.json b/sample-rapp-generator/rapp-all/Files/Acm/instances/k8s-instance.json index a77ac5b..b42cc29 100755 --- a/sample-rapp-generator/rapp-all/Files/Acm/instances/k8s-instance.json +++ b/sample-rapp-generator/rapp-all/Files/Acm/instances/k8s-instance.json @@ -4,29 +4,56 @@ "compositionId": "DO_NOT_CHANGE_THIS_COMPOSITION_ID", "description": "Demo automation composition instance 0", "elements": { - "709c62b3-8918-41b9-a747-d21eb79c6c21": { - "id": "709c62b3-8918-41b9-a747-d21eb79c6c21", + "d7be552e-bcc5-4478-b64d-797dbaec8f55": { + "id": "d7be552e-bcc5-4478-b64d-797dbaec8f55", "definition": { "name": "onap.policy.clamp.ac.element.K8S_StarterAutomationCompositionElement", "version": "1.2.3" }, - "description": "Starter Automation Composition Element for the Demo", + "description": "Starter Automation Composition Element for the Hello World", "properties": { "chart": { "chartId": { - "name": "ransliceassurance", - "version": "1.0.0" + "name": "hello-world-chart", + "version": "0.1.0" }, "namespace": "nonrtric", - "releaseName": "ransliceassurance", - "podName": "ransliceassurance", + "releaseName": "hello-world-chart", + "podName": "hello-world-chart", "repository": { "repoName": "local", "address": "UPDATE_THIS_CHART_MUSEUM_GET_CHARTS_URI" }, "overrideParams": { - "appId": "DO_NOT_CHANGE_THIS_RAPP_INSTANCE_ID", - "smeDiscoveryEndpoint": "DO_NOT_CHANGE_THIS_SME_DISCOVERY_ENDPOINT" + "environment.appId": "DO_NOT_CHANGE_THIS_RAPP_INSTANCE_ID", + "environment.smeDiscoveryEndpoint": "DO_NOT_CHANGE_THIS_SME_DISCOVERY_ENDPOINT" + } + } + } + }, + "d7be552e-bdd5-2233-b64d-797dbaec8f55": { + "id": "d7be552e-bdd5-2233-b64d-797dbaec8f55", + "definition": { + "name": "onap.policy.clamp.ac.element.K8S_StarterAutomationCompositionElement", + "version": "1.2.3" + }, + "description": "Starter Automation Composition Element for the Hello World", + "properties": { + "chart": { + "chartId": { + "name": "hello-world-sme-invoker", + "version": "0.1.0" + }, + "namespace": "nonrtric", + "releaseName": "hello-world-sme-invoker", + "podName": "hello-world-sme-invoker", + "repository": { + "repoName": "local", + "address": "UPDATE_THIS_CHART_MUSEUM_GET_CHARTS_URI" + }, + "overrideParams": { + "environment.appId": "DO_NOT_CHANGE_THIS_RAPP_INSTANCE_ID", + "environment.smeDiscoveryEndpoint": "DO_NOT_CHANGE_THIS_SME_DISCOVERY_ENDPOINT" } } } diff --git a/sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-1.json b/sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-1.json index a2ea1c8..16396d6 100755 --- a/sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-1.json +++ b/sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-1.json @@ -16,5 +16,5 @@ } } ], - "regSec": "PSK" + "regSec": "plain" } \ No newline at end of file diff --git a/sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-2.json b/sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-2.json index 8a9383a..7722104 100755 --- a/sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-2.json +++ b/sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-2.json @@ -9,5 +9,5 @@ } } ], - "regSec": "PSK" + "regSec": "plain" } \ No newline at end of file diff --git a/sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-3.json b/sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-3.json index 7bb2984..7a9f04a 100755 --- a/sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-3.json +++ b/sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-3.json @@ -9,5 +9,5 @@ } } ], - "regSec": "PSK" + "regSec": "plain } \ No newline at end of file diff --git a/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-1.json b/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-1.json index 21afb1c..cdcf111 100755 --- a/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-1.json +++ b/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-1.json @@ -3,16 +3,16 @@ "description": "Example A API of rApp", "aefProfiles": [ { - "aefId": "rApp as AEF", - "description": "Example A rApp as AEF", + "aefId": "Hello World as AEF", + "description": "Simple Hello World API", "versions": [ { - "apiVersion": "v1", + "apiVersion": "", "resources": [ { - "resourceName": "exampleA", + "resourceName": "helloworld", "commType": "REQUEST_RESPONSE", - "uri": "/exampleA/subscription/subscription_id_1", + "uri": "/helloworld/v1", "operations": [ "GET" ] @@ -21,23 +21,10 @@ } ], "protocol": "HTTP_1_1", - "securityMethods": [ - "PSK" - ], "interfaceDescriptions": [ { - "ipv4Addr": "string", - "port": 65535, - "securityMethods": [ - "PKI" - ] - }, - { - "ipv4Addr": "string", - "port": 65535, - "securityMethods": [ - "PKI" - ] + "ipv4Addr": "hello-world-chart-service.nonrtric.svc.cluster.local", + "port": 8080 } ] } diff --git a/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-2.json b/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-2.json index 8b377fe..34b00d3 100755 --- a/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-2.json +++ b/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-2.json @@ -3,41 +3,28 @@ "description": "Example B API of rApp", "aefProfiles": [ { - "aefId": "rApp as AEF", - "description": "Example B rApp as AEF", + "aefId": "sklearn-iris as AEF", + "description": "sklearn-iris API", "versions": [ { "apiVersion": "v1", "resources": [ { - "resourceName": "exampleA", + "resourceName": "sklearn", "commType": "REQUEST_RESPONSE", - "uri": "/exampleA/subscription/subscription_id_1", + "uri": "/models/sklearn-iris:predict", "operations": [ - "GET" + "POST" ] } ] } ], "protocol": "HTTP_1_1", - "securityMethods": [ - "PSK" - ], "interfaceDescriptions": [ { - "ipv4Addr": "string", - "port": 65535, - "securityMethods": [ - "PKI" - ] - }, - { - "ipv4Addr": "string", - "port": 65535, - "securityMethods": [ - "PKI" - ] + "ipv4Addr": "sklearn-iris-predictor-default.kserve-test.svc.cluster.local", + "port": 80 } ] } diff --git a/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-3.json b/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-3.json new file mode 100644 index 0000000..dab491f --- /dev/null +++ b/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-3.json @@ -0,0 +1,32 @@ +{ + "apiName": "Rapp API Set 3", + "description": "Example C API of rApp", + "aefProfiles": [ + { + "aefId": "Hello World subpath as AEF", + "description": "Simple Hello World API for Subpath", + "versions": [ + { + "apiVersion": "", + "resources": [ + { + "resourceName": "helloworld", + "commType": "REQUEST_RESPONSE", + "uri": "/helloworld/v1/subpath1", + "operations": [ + "GET" + ] + } + ] + } + ], + "protocol": "HTTP_1_1", + "interfaceDescriptions": [ + { + "ipv4Addr": "hello-world-chart-service.nonrtric.svc.cluster.local", + "port": 8080 + } + ] + } + ] +} \ No newline at end of file diff --git a/scripts/init/generate-test-rapp-packages/generatetestrapppackages.go b/scripts/init/generate-test-rapp-packages/generatetestrapppackages.go index 462a4c2..f5bdd66 100755 --- a/scripts/init/generate-test-rapp-packages/generatetestrapppackages.go +++ b/scripts/init/generate-test-rapp-packages/generatetestrapppackages.go @@ -223,7 +223,7 @@ func main() { fmt.Println("Generating invalid rApp package without Artifacts...") INVALID_RAPP_PACKAGE_MISSING_ARTIFACT_FOLDER_NAME := "invalid-rapp-package-missing-artifact" cp.Copy(RAPP_BASE_PACKAGE, INVALID_RAPP_PACKAGE_MISSING_ARTIFACT_FOLDER_NAME) - os.Remove(INVALID_RAPP_PACKAGE_MISSING_ARTIFACT_FOLDER_NAME + "/Artifacts/Deployment/HELM/orufhrecovery-1.0.0.tgz") + os.Remove(INVALID_RAPP_PACKAGE_MISSING_ARTIFACT_FOLDER_NAME + "/Artifacts/Deployment/HELM/hello-world-chart-0.1.0.tgz") createCsarAndCopy(INVALID_RAPP_PACKAGE_MISSING_ARTIFACT_FOLDER_NAME, MODELS_TEST_RESOURCES, APPLICATION_TEST_RESOURCES) fmt.Println("Generating invalid rApp package with empty asd yaml...") -- 2.16.6