From 36bc1a591a888380b171db42f5cc69ffcca97902 Mon Sep 17 00:00:00 2001 From: Pelayo Torres Date: Tue, 14 May 2024 16:36:54 +0200 Subject: [PATCH 01/14] Helper documentation --- doc/.DS_Store | Bin 0 -> 6148 bytes .../PELAYOTOAL22-Helper-1.0.0-resolved.yaml | 1468 +++++++++++++++++ 2 files changed, 1468 insertions(+) create mode 100644 doc/.DS_Store create mode 100644 doc/swagger/PELAYOTOAL22-Helper-1.0.0-resolved.yaml diff --git a/doc/.DS_Store b/doc/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..1de8cf1d3cf077ce6ed011fcc38b84d570da4a85 GIT binary patch literal 6148 zcmZQzU|@7AO)+F(5MW?n;9!8zEL;p&0Z1N%F(jFwBHSSJz-AOM6f>kU=rUw6Btqpz zsnHM^4S~TM0-(Gr%aF>D%#g#7$$*@H%NP8aM}|NKJ%(I{6g0K#(bV!Wq%)*4lrWSq zWHRJ2q%(l*N@OTvC}BuN*UKo2rk9N&lOdNO5o|&+sy&R|_|ztq7Z*U?zcZ;IC$qT3 zz~CAq6Eh1d8#@O(2RBD-a7KQ4a7kiGX|YpcQ8b7blAoWG1Y;*Ag=MCe#|wx!=jW9q zX6B_9fs_Pirlck%7R7{T=B4D9JLQ+=r4)npLM1pjIXL45B&(~9j0|-Y42{i9YIPK< zEsYFx6ikfGYHK+;M3wcegW|Jua`W;*9srfFjNl+;VBm$)Fsg@vfdM4|%7TmXa`N-i zL7KqjJ19U?7*ZK3utfypPqYBy1_wPPnu{4S7*fH}f)=byAk&efnjIWbphyGRmW~<; z44{ND51cOkgPo108gDdk&@dV}sT&Pw-a?BAu+Ik(0ZmXGpfX?(IcwA@qaiRF0)rp~ zK;?r1v=VWE(hU$AB*nnUzyR(7FfuT(z?{nn?gub{ Date: Tue, 14 May 2024 16:48:16 +0200 Subject: [PATCH 02/14] Helper swagger --- ...ELAYOTOAL22-Helper-1.0.0-resolved.yaml => helper_swagger.yaml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename doc/swagger/{PELAYOTOAL22-Helper-1.0.0-resolved.yaml => helper_swagger.yaml} (100%) diff --git a/doc/swagger/PELAYOTOAL22-Helper-1.0.0-resolved.yaml b/doc/swagger/helper_swagger.yaml similarity index 100% rename from doc/swagger/PELAYOTOAL22-Helper-1.0.0-resolved.yaml rename to doc/swagger/helper_swagger.yaml -- GitLab From 4edec00d94e41f7c10dc06522a2e8e1e7f4839c3 Mon Sep 17 00:00:00 2001 From: Pelayo Torres Date: Wed, 15 May 2024 09:08:05 +0200 Subject: [PATCH 03/14] Helper swagger --- doc/swagger/helper_swagger.yaml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/doc/swagger/helper_swagger.yaml b/doc/swagger/helper_swagger.yaml index 90387a39..333664b0 100644 --- a/doc/swagger/helper_swagger.yaml +++ b/doc/swagger/helper_swagger.yaml @@ -1,17 +1,14 @@ --- openapi: 3.0.0 info: + description: New microservice inside CCF, it will simplify integration with third parties like external management portals + version: "1.0.0" title: Helper Service - description: "New microservice inside CCF, it will simplify integration with third parties like external management portals" contact: - email: you@your-company.com + email: SDGsupport@etsi.org license: - name: Apache 2.0 - url: http://www.apache.org/licenses/LICENSE-2.0.html - version: 1.0.0 -servers: -- url: https://virtserver.swaggerhub.com/PELAYOTOAL22/Helper/1.0.0 - description: SwaggerHub API Auto Mocking + name: Apache + url: 'file://./.LICENSE' tags: - name: Helper paths: -- GitLab From 4506f6a4264616928c695ced36cef012a2606a18 Mon Sep 17 00:00:00 2001 From: Pelayo Torres Date: Wed, 15 May 2024 09:11:02 +0200 Subject: [PATCH 04/14] Helper swagger --- doc/swagger/helper_swagger.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/swagger/helper_swagger.yaml b/doc/swagger/helper_swagger.yaml index 333664b0..fa7f0168 100644 --- a/doc/swagger/helper_swagger.yaml +++ b/doc/swagger/helper_swagger.yaml @@ -7,8 +7,8 @@ info: contact: email: SDGsupport@etsi.org license: - name: Apache - url: 'file://./.LICENSE' + name: License + url: '..LICENSE' tags: - name: Helper paths: -- GitLab From b2208c450e489574631ed8f73f77ae63448919ab Mon Sep 17 00:00:00 2001 From: Pelayo Torres Date: Wed, 15 May 2024 09:14:18 +0200 Subject: [PATCH 05/14] Helper swagger --- doc/swagger/helper_swagger.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/swagger/helper_swagger.yaml b/doc/swagger/helper_swagger.yaml index fa7f0168..50878057 100644 --- a/doc/swagger/helper_swagger.yaml +++ b/doc/swagger/helper_swagger.yaml @@ -6,9 +6,9 @@ info: title: Helper Service contact: email: SDGsupport@etsi.org - license: - name: License - url: '..LICENSE' + externalDocs: + description: License + url: 'labs.etsi.org/rep/ocf/documentation/-/blob/OCF-Doc8-documentation-of-the-helper-service/' tags: - name: Helper paths: -- GitLab From 1ce5545bcdeac1653f35db0e856d47d36d03d872 Mon Sep 17 00:00:00 2001 From: Pelayo Torres Date: Wed, 15 May 2024 09:15:55 +0200 Subject: [PATCH 06/14] Helper swagger --- doc/swagger/helper_swagger.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/swagger/helper_swagger.yaml b/doc/swagger/helper_swagger.yaml index 50878057..54b369ae 100644 --- a/doc/swagger/helper_swagger.yaml +++ b/doc/swagger/helper_swagger.yaml @@ -6,9 +6,9 @@ info: title: Helper Service contact: email: SDGsupport@etsi.org - externalDocs: - description: License - url: 'labs.etsi.org/rep/ocf/documentation/-/blob/OCF-Doc8-documentation-of-the-helper-service/' + license: + name: License + url: 'https://creativecommons.org/licenses/by/4.0/' tags: - name: Helper paths: -- GitLab From a7a6465b79023d30ea8a14f72f6cb600ac1f82e5 Mon Sep 17 00:00:00 2001 From: Pelayo Torres Date: Thu, 16 May 2024 15:00:54 +0200 Subject: [PATCH 07/14] Helper documentation --- doc/testing/postman/.gitignore | 3 +++ .../postman/CAPIF.postman_collection.json | 21 +++++++------------ 2 files changed, 11 insertions(+), 13 deletions(-) create mode 100644 doc/testing/postman/.gitignore diff --git a/doc/testing/postman/.gitignore b/doc/testing/postman/.gitignore new file mode 100644 index 00000000..8fbe30b8 --- /dev/null +++ b/doc/testing/postman/.gitignore @@ -0,0 +1,3 @@ +/Responses +/node_modules +package-lock.json \ No newline at end of file diff --git a/doc/testing/postman/CAPIF.postman_collection.json b/doc/testing/postman/CAPIF.postman_collection.json index 4f4ba37f..423ec302 100644 --- a/doc/testing/postman/CAPIF.postman_collection.json +++ b/doc/testing/postman/CAPIF.postman_collection.json @@ -1,10 +1,10 @@ { "info": { - "_postman_id": "b512e528-4b13-4be2-aed2-a61a8381360e", + "_postman_id": "03e5f144-6a4f-4899-a917-14787d59fbef", "name": "CAPIF", "schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json", "_exporter_id": "31608242", - "_collection_link": "https://red-comet-993867.postman.co/workspace/Team-Workspace~bfc7c442-a60c-4bb1-8730-fdabc2df89b9/collection/31608242-b512e528-4b13-4be2-aed2-a61a8381360e?action=share&source=collection_link&creator=31608242" + "_collection_link": "https://red-comet-993867.postman.co/workspace/Team-Workspace~bfc7c442-a60c-4bb1-8730-fdabc2df89b9/collection/31608242-03e5f144-6a4f-4899-a917-14787d59fbef?action=share&source=collection_link&creator=31608242" }, "item": [ { @@ -264,7 +264,6 @@ { "key": "", "value": "", - "type": "text", "disabled": true } ], @@ -340,7 +339,6 @@ { "key": "", "value": "", - "type": "text", "disabled": true } ], @@ -439,7 +437,6 @@ { "key": "", "value": "", - "type": "text", "disabled": true } ], @@ -527,7 +524,6 @@ { "key": "", "value": "", - "type": "text", "disabled": true } ], @@ -603,7 +599,6 @@ { "key": "", "value": "", - "type": "text", "disabled": true } ], @@ -686,7 +681,6 @@ { "key": "", "value": "", - "type": "text", "disabled": true } ], @@ -741,7 +735,8 @@ "exec": [ "" ], - "type": "text/javascript" + "type": "text/javascript", + "packages": {} } }, { @@ -750,7 +745,8 @@ "exec": [ "" ], - "type": "text/javascript" + "type": "text/javascript", + "packages": {} } } ], @@ -773,13 +769,12 @@ { "key": "", "value": "", - "type": "text", "disabled": true } ], "body": { "mode": "raw", - "raw": "{\n\"name\": {{USERNAME_INVOKER}}\n}", + "raw": "{\n\"name\": \"{{USER_NAME}}\"\n}", "options": { "raw": { "language": "json" @@ -961,7 +956,7 @@ } ] }, - "method": "GET", + "method": "POST", "header": [], "url": { "raw": "https://{{REGISTER_HOSTNAME}}:{{REGISTER_PORT}}/refresh", -- GitLab From c4324659858581d4e8b9f4804593557c1a50aa73 Mon Sep 17 00:00:00 2001 From: Pelayo Torres Date: Thu, 16 May 2024 15:02:52 +0200 Subject: [PATCH 08/14] Helper documentation --- doc/gettingstarted/howtorun.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/gettingstarted/howtorun.md b/doc/gettingstarted/howtorun.md index 8858bfd9..7b5d06df 100644 --- a/doc/gettingstarted/howtorun.md +++ b/doc/gettingstarted/howtorun.md @@ -158,4 +158,8 @@ Run using python cd pip3 install -r requirements.txt python3 -m -``` \ No newline at end of file +``` + +#### 4. Start Your Testing with OpenCAPIF + +You can now test OpenCAPIF. Visit the Testing page to see how it works. \ No newline at end of file -- GitLab From f0a5bf9bdd81419f96288c5a357bf338aa1c3a52 Mon Sep 17 00:00:00 2001 From: Pelayo Torres Date: Thu, 16 May 2024 15:06:51 +0200 Subject: [PATCH 09/14] Helper documentation --- doc/gettingstarted/howtorun.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/gettingstarted/howtorun.md b/doc/gettingstarted/howtorun.md index 7b5d06df..0c3d4fe5 100644 --- a/doc/gettingstarted/howtorun.md +++ b/doc/gettingstarted/howtorun.md @@ -6,6 +6,7 @@ - [Run All CAPIF Services locally with Docker images and deploy monitoring stack](#run-all-capif-services-locally-with-docker-images-and-deploy-monitoring-stack) - [Run each service using Docker](#run-each-service-using-docker) - [Run each service using Python](#run-each-service-using-python) +- [Start Your Testing with OpenCAPIF](#start-your-testing-with-opencapif) Capif services are developed under [services folder](https://labs.etsi.org/rep/ocf/capif/-/tree/main/services). @@ -160,6 +161,6 @@ pip3 install -r requirements.txt python3 -m ``` -#### 4. Start Your Testing with OpenCAPIF +#### Start Your Testing with OpenCAPIF You can now test OpenCAPIF. Visit the Testing page to see how it works. \ No newline at end of file -- GitLab From c679afe59431aeaa27a29f00fb4e34ccc0f8bc52 Mon Sep 17 00:00:00 2001 From: Pelayo Torres Date: Thu, 16 May 2024 15:34:32 +0200 Subject: [PATCH 10/14] Helper documentation --- doc/gettingstarted/howtorun.md | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/doc/gettingstarted/howtorun.md b/doc/gettingstarted/howtorun.md index 0c3d4fe5..69150179 100644 --- a/doc/gettingstarted/howtorun.md +++ b/doc/gettingstarted/howtorun.md @@ -163,4 +163,11 @@ python3 -m #### Start Your Testing with OpenCAPIF -You can now test OpenCAPIF. Visit the Testing page to see how it works. \ No newline at end of file +You can now test OpenCAPIF. + +To test it, in the "Testing" tab you have three options: + +- [Test Plan](./testing/testplan/README.md): To see how to test the services and use them. +- [Robot Framework](./testing/robotframework/README.md): To test the operation of all services or one in particular. +- [Postman](./testing/postman/README.md): In order to carry out the complete OpenCAPIF flow, being invoker and provider + -- GitLab From 83544040afe962848422ffd65267314c96806244 Mon Sep 17 00:00:00 2001 From: Pelayo Torres Date: Thu, 16 May 2024 15:49:43 +0200 Subject: [PATCH 11/14] Helper documentation --- doc/gettingstarted/howtorun.md | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/doc/gettingstarted/howtorun.md b/doc/gettingstarted/howtorun.md index 69150179..902e1c1a 100644 --- a/doc/gettingstarted/howtorun.md +++ b/doc/gettingstarted/howtorun.md @@ -167,7 +167,11 @@ You can now test OpenCAPIF. To test it, in the "Testing" tab you have three options: -- [Test Plan](./testing/testplan/README.md): To see how to test the services and use them. -- [Robot Framework](./testing/robotframework/README.md): To test the operation of all services or one in particular. -- [Postman](./testing/postman/README.md): In order to carry out the complete OpenCAPIF flow, being invoker and provider +- [Test Plan Directory]: To see how to test the services and use them. +- [Testing with Robot Framework]: To test the operation of all services or one in particular. +- [Testing with Postman]: In order to carry out the complete OpenCAPIF flow, being invoker and provider + +[Test Plan Directory]: .././testing/testplan/README.md "Test Plan" +[Testing with Robot Framework]: .././testing/robotframework/README.md "Robot Framework" +[Testing with Postman]: .././testing/postman/README.md "Postman" -- GitLab From a1f5ae79e5ac6865848193165b7bf70c1d8f729e Mon Sep 17 00:00:00 2001 From: Pelayo Torres Date: Wed, 22 May 2024 11:16:11 +0200 Subject: [PATCH 12/14] Testing in how to run --- .gitignore | 3 +++ doc/gettingstarted/howtorun.md | 10 ++++------ doc/testing/postman/.gitignore | 3 --- 3 files changed, 7 insertions(+), 9 deletions(-) delete mode 100644 doc/testing/postman/.gitignore diff --git a/.gitignore b/.gitignore index 1320f90e..e44d0eb3 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,4 @@ site +doc/testing/postman/Responses +doc/testing/postman/node_modules +doc/testing/postman/package-lock.json \ No newline at end of file diff --git a/doc/gettingstarted/howtorun.md b/doc/gettingstarted/howtorun.md index 902e1c1a..d300ccab 100644 --- a/doc/gettingstarted/howtorun.md +++ b/doc/gettingstarted/howtorun.md @@ -163,13 +163,11 @@ python3 -m #### Start Your Testing with OpenCAPIF -You can now test OpenCAPIF. +Related with OpenCAPIF Testing, the following sections help you to understand testing implemented and how to run it by yourself: -To test it, in the "Testing" tab you have three options: - -- [Test Plan Directory]: To see how to test the services and use them. -- [Testing with Robot Framework]: To test the operation of all services or one in particular. -- [Testing with Postman]: In order to carry out the complete OpenCAPIF flow, being invoker and provider +- [Test Plan Directory]: Here you can find the complete test plan definition that are accomplish by all versions released of OpenCAPIF. +- [Testing with Robot Framework]: At this section you can find all information about how to run the test suite implemented using Robot Framework. +- [Testing with Postman]: Easy way to understand the complete basic OpenCAPIF flow, acting as invoker and provider. [Test Plan Directory]: .././testing/testplan/README.md "Test Plan" diff --git a/doc/testing/postman/.gitignore b/doc/testing/postman/.gitignore deleted file mode 100644 index 8fbe30b8..00000000 --- a/doc/testing/postman/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/Responses -/node_modules -package-lock.json \ No newline at end of file -- GitLab From 5a06a583e77647b805fb38b614a7474b10dfa2f6 Mon Sep 17 00:00:00 2001 From: Pelayo Torres Date: Wed, 22 May 2024 11:50:44 +0200 Subject: [PATCH 13/14] Ds_Store --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index e44d0eb3..b3daeb9e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ site doc/testing/postman/Responses doc/testing/postman/node_modules -doc/testing/postman/package-lock.json \ No newline at end of file +doc/testing/postman/package-lock.json +.DS_Store \ No newline at end of file -- GitLab From 61fa52d573fd829aa63d925a309b51d4ea16fdf0 Mon Sep 17 00:00:00 2001 From: torrespel Date: Wed, 22 May 2024 09:53:52 +0000 Subject: [PATCH 14/14] Delete .DS_Store --- doc/.DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 doc/.DS_Store diff --git a/doc/.DS_Store b/doc/.DS_Store deleted file mode 100644 index 1de8cf1d3cf077ce6ed011fcc38b84d570da4a85..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmZQzU|@7AO)+F(5MW?n;9!8zEL;p&0Z1N%F(jFwBHSSJz-AOM6f>kU=rUw6Btqpz zsnHM^4S~TM0-(Gr%aF>D%#g#7$$*@H%NP8aM}|NKJ%(I{6g0K#(bV!Wq%)*4lrWSq zWHRJ2q%(l*N@OTvC}BuN*UKo2rk9N&lOdNO5o|&+sy&R|_|ztq7Z*U?zcZ;IC$qT3 zz~CAq6Eh1d8#@O(2RBD-a7KQ4a7kiGX|YpcQ8b7blAoWG1Y;*Ag=MCe#|wx!=jW9q zX6B_9fs_Pirlck%7R7{T=B4D9JLQ+=r4)npLM1pjIXL45B&(~9j0|-Y42{i9YIPK< zEsYFx6ikfGYHK+;M3wcegW|Jua`W;*9srfFjNl+;VBm$)Fsg@vfdM4|%7TmXa`N-i zL7KqjJ19U?7*ZK3utfypPqYBy1_wPPnu{4S7*fH}f)=byAk&efnjIWbphyGRmW~<; z44{ND51cOkgPo108gDdk&@dV}sT&Pw-a?BAu+Ik(0ZmXGpfX?(IcwA@qaiRF0)rp~ zK;?r1v=VWE(hU$AB*nnUzyR(7FfuT(z?{nn?gub{