From f801ec5b09a2b50e518771316d955d7c965e7d8a Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Mon, 8 Jan 2024 15:33:50 +0000 Subject: [PATCH] Update rApp generator to generate rApp from different folders csar-generator renamed to sample-rapp-generator generator script modified to support the folder name as an argument. Issue-ID: NONRTRIC-964 Signed-off-by: aravind.est Change-Id: I86adc2746da63a1252ca64893aca31b7396155af --- .../generate.bat | 30 ++++++++++++++++----- .../generate.sh | 22 ++++++++++++--- .../rapp-all}/Definitions/asd.yaml | 0 .../rapp-all}/Definitions/asd_types.yaml | 0 .../Files/Acm/definition/compositions.json | 0 .../Files/Acm/instances/a1pms-instance.json | 0 .../Files/Acm/instances/all-instance.json | 0 .../Files/Acm/instances/k8s-instance.json | 0 .../Files/Acm/instances/kserve-instance.json | 0 .../rapp-all}/Files/ChangeLog.txt | 0 .../json-file-data-from-filestore.json | 0 .../xml-file-data-from-filestore.json | 0 .../Dme/infoconsumers/json-file-consumer.json | 0 .../Files/Dme/infoconsumers/xml-file-consumer.json | 0 .../Dme/infoproducers/json-file-data-producer.json | 0 .../Dme/infoproducers/xml-file-data-producer.json | 0 .../json-file-data-from-filestore.json | 0 .../xml-file-data-from-filestore.json | 0 .../rapp-all}/Files/Events/MyASD_v1.yaml | 0 .../rapp-all}/Files/Guides/user_guide.txt | 0 .../Files/Measurements/PM_Dictionary.yaml | 0 .../rapp-all}/Files/Scripts/my_script.sh | 0 .../rapp-all}/Files/Sme/invokers/invoker-app1.json | 0 .../rapp-all}/Files/Sme/invokers/invoker-app2.json | 0 .../Files/Sme/providers/provider-function-1.json | 0 .../Files/Sme/providers/provider-function-2.json | 0 .../Files/Sme/providers/provider-function-3.json | 0 .../rapp-all}/Files/Sme/serviceapis/api-set-1.json | 0 .../rapp-all}/Files/Sme/serviceapis/api-set-2.json | 0 .../rapp-all}/Files/Yang_module/mynetconf.yang | 0 .../rapp-all}/Files/rapp1/rapp.zip | Bin .../rapp-all}/HELM/free5gc-1.1.3.tgz | Bin .../rapp-all}/HELM/ueransim-2.0.14.tgz | Bin .../rapp-all}/TOSCA-Metadata/TOSCA.meta | 0 .../rapp-all}/asd.mf | 0 35 files changed, 41 insertions(+), 11 deletions(-) rename {csar-generator => sample-rapp-generator}/generate.bat (61%) rename {csar-generator => sample-rapp-generator}/generate.sh (67%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Definitions/asd.yaml (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Definitions/asd_types.yaml (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Acm/definition/compositions.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Acm/instances/a1pms-instance.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Acm/instances/all-instance.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Acm/instances/k8s-instance.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Acm/instances/kserve-instance.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/ChangeLog.txt (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Dme/consumerinfotypes/json-file-data-from-filestore.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Dme/consumerinfotypes/xml-file-data-from-filestore.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Dme/infoconsumers/json-file-consumer.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Dme/infoconsumers/xml-file-consumer.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Dme/infoproducers/json-file-data-producer.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Dme/infoproducers/xml-file-data-producer.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Dme/producerinfotypes/json-file-data-from-filestore.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Dme/producerinfotypes/xml-file-data-from-filestore.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Events/MyASD_v1.yaml (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Guides/user_guide.txt (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Measurements/PM_Dictionary.yaml (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Scripts/my_script.sh (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Sme/invokers/invoker-app1.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Sme/invokers/invoker-app2.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Sme/providers/provider-function-1.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Sme/providers/provider-function-2.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Sme/providers/provider-function-3.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Sme/serviceapis/api-set-1.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Sme/serviceapis/api-set-2.json (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/Yang_module/mynetconf.yang (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/Files/rapp1/rapp.zip (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/HELM/free5gc-1.1.3.tgz (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/HELM/ueransim-2.0.14.tgz (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/TOSCA-Metadata/TOSCA.meta (100%) rename {csar-generator/resources => sample-rapp-generator/rapp-all}/asd.mf (100%) diff --git a/csar-generator/generate.bat b/sample-rapp-generator/generate.bat similarity index 61% rename from csar-generator/generate.bat rename to sample-rapp-generator/generate.bat index 1e34698..ccf3049 100755 --- a/csar-generator/generate.bat +++ b/sample-rapp-generator/generate.bat @@ -1,5 +1,6 @@ :: ============LICENSE_START=============================================== :: Copyright (C) 2023 Nordix Foundation. All rights reserved. +:: Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved. :: ======================================================================== :: Licensed under the Apache License, Version 2.0 (the "License"); :: you may not use this file except in compliance with the License. @@ -16,10 +17,25 @@ :: @echo off -SET CSARFILE=rapp.csar -SET ZIPFILE=rapp.zip -del %CSARFILE% 2>nul -pushd resources -tar -a -cf ..\%ZIPFILE% * -popd -rename %ZIPFILE% %CSARFILE% + +if [%1]==[] goto usage +SET DIRECTORY=%1 +if %DIRECTORY:~-1%==\ ( + SET DIRECTORY=%DIRECTORY:~0,-1% +) +if exist %DIRECTORY% ( + SET CSARFILE=%DIRECTORY%.csar + SET ZIPFILE=%DIRECTORY%.zip + del %CSARFILE% 2>nul + pushd %DIRECTORY% + tar -a -cf ..\%ZIPFILE% * + popd + rename %ZIPFILE% %CSARFILE% + @echo rApp package %CSARFILE% generated. +) else ( + @echo Directory %DIRECTORY% doesn't exists. +) +goto :eof + +:usage +@echo USAGE: %0% ^ diff --git a/csar-generator/generate.sh b/sample-rapp-generator/generate.sh similarity index 67% rename from csar-generator/generate.sh rename to sample-rapp-generator/generate.sh index 3bb223a..a4eeba4 100755 --- a/csar-generator/generate.sh +++ b/sample-rapp-generator/generate.sh @@ -2,6 +2,7 @@ # ============LICENSE_START=============================================== # Copyright (C) 2023 Nordix Foundation. All rights reserved. +# Copyright (C) 2024 OpenInfra Foundation Europe. All rights reserved. # ======================================================================== # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -17,7 +18,20 @@ # ============LICENSE_END================================================= # -rm rapp.csar -pushd resources -zip -r ../rapp.csar * -popd +if [[ $# -ne 1 ]]; then + echo "USAGE: $0 " + exit 1 +fi + +DIRECTORY=${1%/} +PACKAGENAME="$DIRECTORY.csar" + +if [ -d "$DIRECTORY" ]; then + rm $PACKAGENAME 2> /dev/null + pushd $DIRECTORY + zip -r ../$PACKAGENAME * + popd + echo -e "rApp package $PACKAGENAME generated." +else + echo "Directory $DIRECTORY doesn't exists." +fi diff --git a/csar-generator/resources/Definitions/asd.yaml b/sample-rapp-generator/rapp-all/Definitions/asd.yaml similarity index 100% rename from csar-generator/resources/Definitions/asd.yaml rename to sample-rapp-generator/rapp-all/Definitions/asd.yaml diff --git a/csar-generator/resources/Definitions/asd_types.yaml b/sample-rapp-generator/rapp-all/Definitions/asd_types.yaml similarity index 100% rename from csar-generator/resources/Definitions/asd_types.yaml rename to sample-rapp-generator/rapp-all/Definitions/asd_types.yaml diff --git a/csar-generator/resources/Files/Acm/definition/compositions.json b/sample-rapp-generator/rapp-all/Files/Acm/definition/compositions.json similarity index 100% rename from csar-generator/resources/Files/Acm/definition/compositions.json rename to sample-rapp-generator/rapp-all/Files/Acm/definition/compositions.json diff --git a/csar-generator/resources/Files/Acm/instances/a1pms-instance.json b/sample-rapp-generator/rapp-all/Files/Acm/instances/a1pms-instance.json similarity index 100% rename from csar-generator/resources/Files/Acm/instances/a1pms-instance.json rename to sample-rapp-generator/rapp-all/Files/Acm/instances/a1pms-instance.json diff --git a/csar-generator/resources/Files/Acm/instances/all-instance.json b/sample-rapp-generator/rapp-all/Files/Acm/instances/all-instance.json similarity index 100% rename from csar-generator/resources/Files/Acm/instances/all-instance.json rename to sample-rapp-generator/rapp-all/Files/Acm/instances/all-instance.json diff --git a/csar-generator/resources/Files/Acm/instances/k8s-instance.json b/sample-rapp-generator/rapp-all/Files/Acm/instances/k8s-instance.json similarity index 100% rename from csar-generator/resources/Files/Acm/instances/k8s-instance.json rename to sample-rapp-generator/rapp-all/Files/Acm/instances/k8s-instance.json diff --git a/csar-generator/resources/Files/Acm/instances/kserve-instance.json b/sample-rapp-generator/rapp-all/Files/Acm/instances/kserve-instance.json similarity index 100% rename from csar-generator/resources/Files/Acm/instances/kserve-instance.json rename to sample-rapp-generator/rapp-all/Files/Acm/instances/kserve-instance.json diff --git a/csar-generator/resources/Files/ChangeLog.txt b/sample-rapp-generator/rapp-all/Files/ChangeLog.txt similarity index 100% rename from csar-generator/resources/Files/ChangeLog.txt rename to sample-rapp-generator/rapp-all/Files/ChangeLog.txt diff --git a/csar-generator/resources/Files/Dme/consumerinfotypes/json-file-data-from-filestore.json b/sample-rapp-generator/rapp-all/Files/Dme/consumerinfotypes/json-file-data-from-filestore.json similarity index 100% rename from csar-generator/resources/Files/Dme/consumerinfotypes/json-file-data-from-filestore.json rename to sample-rapp-generator/rapp-all/Files/Dme/consumerinfotypes/json-file-data-from-filestore.json diff --git a/csar-generator/resources/Files/Dme/consumerinfotypes/xml-file-data-from-filestore.json b/sample-rapp-generator/rapp-all/Files/Dme/consumerinfotypes/xml-file-data-from-filestore.json similarity index 100% rename from csar-generator/resources/Files/Dme/consumerinfotypes/xml-file-data-from-filestore.json rename to sample-rapp-generator/rapp-all/Files/Dme/consumerinfotypes/xml-file-data-from-filestore.json diff --git a/csar-generator/resources/Files/Dme/infoconsumers/json-file-consumer.json b/sample-rapp-generator/rapp-all/Files/Dme/infoconsumers/json-file-consumer.json similarity index 100% rename from csar-generator/resources/Files/Dme/infoconsumers/json-file-consumer.json rename to sample-rapp-generator/rapp-all/Files/Dme/infoconsumers/json-file-consumer.json diff --git a/csar-generator/resources/Files/Dme/infoconsumers/xml-file-consumer.json b/sample-rapp-generator/rapp-all/Files/Dme/infoconsumers/xml-file-consumer.json similarity index 100% rename from csar-generator/resources/Files/Dme/infoconsumers/xml-file-consumer.json rename to sample-rapp-generator/rapp-all/Files/Dme/infoconsumers/xml-file-consumer.json diff --git a/csar-generator/resources/Files/Dme/infoproducers/json-file-data-producer.json b/sample-rapp-generator/rapp-all/Files/Dme/infoproducers/json-file-data-producer.json similarity index 100% rename from csar-generator/resources/Files/Dme/infoproducers/json-file-data-producer.json rename to sample-rapp-generator/rapp-all/Files/Dme/infoproducers/json-file-data-producer.json diff --git a/csar-generator/resources/Files/Dme/infoproducers/xml-file-data-producer.json b/sample-rapp-generator/rapp-all/Files/Dme/infoproducers/xml-file-data-producer.json similarity index 100% rename from csar-generator/resources/Files/Dme/infoproducers/xml-file-data-producer.json rename to sample-rapp-generator/rapp-all/Files/Dme/infoproducers/xml-file-data-producer.json diff --git a/csar-generator/resources/Files/Dme/producerinfotypes/json-file-data-from-filestore.json b/sample-rapp-generator/rapp-all/Files/Dme/producerinfotypes/json-file-data-from-filestore.json similarity index 100% rename from csar-generator/resources/Files/Dme/producerinfotypes/json-file-data-from-filestore.json rename to sample-rapp-generator/rapp-all/Files/Dme/producerinfotypes/json-file-data-from-filestore.json diff --git a/csar-generator/resources/Files/Dme/producerinfotypes/xml-file-data-from-filestore.json b/sample-rapp-generator/rapp-all/Files/Dme/producerinfotypes/xml-file-data-from-filestore.json similarity index 100% rename from csar-generator/resources/Files/Dme/producerinfotypes/xml-file-data-from-filestore.json rename to sample-rapp-generator/rapp-all/Files/Dme/producerinfotypes/xml-file-data-from-filestore.json diff --git a/csar-generator/resources/Files/Events/MyASD_v1.yaml b/sample-rapp-generator/rapp-all/Files/Events/MyASD_v1.yaml similarity index 100% rename from csar-generator/resources/Files/Events/MyASD_v1.yaml rename to sample-rapp-generator/rapp-all/Files/Events/MyASD_v1.yaml diff --git a/csar-generator/resources/Files/Guides/user_guide.txt b/sample-rapp-generator/rapp-all/Files/Guides/user_guide.txt similarity index 100% rename from csar-generator/resources/Files/Guides/user_guide.txt rename to sample-rapp-generator/rapp-all/Files/Guides/user_guide.txt diff --git a/csar-generator/resources/Files/Measurements/PM_Dictionary.yaml b/sample-rapp-generator/rapp-all/Files/Measurements/PM_Dictionary.yaml similarity index 100% rename from csar-generator/resources/Files/Measurements/PM_Dictionary.yaml rename to sample-rapp-generator/rapp-all/Files/Measurements/PM_Dictionary.yaml diff --git a/csar-generator/resources/Files/Scripts/my_script.sh b/sample-rapp-generator/rapp-all/Files/Scripts/my_script.sh similarity index 100% rename from csar-generator/resources/Files/Scripts/my_script.sh rename to sample-rapp-generator/rapp-all/Files/Scripts/my_script.sh diff --git a/csar-generator/resources/Files/Sme/invokers/invoker-app1.json b/sample-rapp-generator/rapp-all/Files/Sme/invokers/invoker-app1.json similarity index 100% rename from csar-generator/resources/Files/Sme/invokers/invoker-app1.json rename to sample-rapp-generator/rapp-all/Files/Sme/invokers/invoker-app1.json diff --git a/csar-generator/resources/Files/Sme/invokers/invoker-app2.json b/sample-rapp-generator/rapp-all/Files/Sme/invokers/invoker-app2.json similarity index 100% rename from csar-generator/resources/Files/Sme/invokers/invoker-app2.json rename to sample-rapp-generator/rapp-all/Files/Sme/invokers/invoker-app2.json diff --git a/csar-generator/resources/Files/Sme/providers/provider-function-1.json b/sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-1.json similarity index 100% rename from csar-generator/resources/Files/Sme/providers/provider-function-1.json rename to sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-1.json diff --git a/csar-generator/resources/Files/Sme/providers/provider-function-2.json b/sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-2.json similarity index 100% rename from csar-generator/resources/Files/Sme/providers/provider-function-2.json rename to sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-2.json diff --git a/csar-generator/resources/Files/Sme/providers/provider-function-3.json b/sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-3.json similarity index 100% rename from csar-generator/resources/Files/Sme/providers/provider-function-3.json rename to sample-rapp-generator/rapp-all/Files/Sme/providers/provider-function-3.json diff --git a/csar-generator/resources/Files/Sme/serviceapis/api-set-1.json b/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-1.json similarity index 100% rename from csar-generator/resources/Files/Sme/serviceapis/api-set-1.json rename to sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-1.json diff --git a/csar-generator/resources/Files/Sme/serviceapis/api-set-2.json b/sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-2.json similarity index 100% rename from csar-generator/resources/Files/Sme/serviceapis/api-set-2.json rename to sample-rapp-generator/rapp-all/Files/Sme/serviceapis/api-set-2.json diff --git a/csar-generator/resources/Files/Yang_module/mynetconf.yang b/sample-rapp-generator/rapp-all/Files/Yang_module/mynetconf.yang similarity index 100% rename from csar-generator/resources/Files/Yang_module/mynetconf.yang rename to sample-rapp-generator/rapp-all/Files/Yang_module/mynetconf.yang diff --git a/csar-generator/resources/Files/rapp1/rapp.zip b/sample-rapp-generator/rapp-all/Files/rapp1/rapp.zip similarity index 100% rename from csar-generator/resources/Files/rapp1/rapp.zip rename to sample-rapp-generator/rapp-all/Files/rapp1/rapp.zip diff --git a/csar-generator/resources/HELM/free5gc-1.1.3.tgz b/sample-rapp-generator/rapp-all/HELM/free5gc-1.1.3.tgz similarity index 100% rename from csar-generator/resources/HELM/free5gc-1.1.3.tgz rename to sample-rapp-generator/rapp-all/HELM/free5gc-1.1.3.tgz diff --git a/csar-generator/resources/HELM/ueransim-2.0.14.tgz b/sample-rapp-generator/rapp-all/HELM/ueransim-2.0.14.tgz similarity index 100% rename from csar-generator/resources/HELM/ueransim-2.0.14.tgz rename to sample-rapp-generator/rapp-all/HELM/ueransim-2.0.14.tgz diff --git a/csar-generator/resources/TOSCA-Metadata/TOSCA.meta b/sample-rapp-generator/rapp-all/TOSCA-Metadata/TOSCA.meta similarity index 100% rename from csar-generator/resources/TOSCA-Metadata/TOSCA.meta rename to sample-rapp-generator/rapp-all/TOSCA-Metadata/TOSCA.meta diff --git a/csar-generator/resources/asd.mf b/sample-rapp-generator/rapp-all/asd.mf similarity index 100% rename from csar-generator/resources/asd.mf rename to sample-rapp-generator/rapp-all/asd.mf -- 2.16.6