From 82aeca18c66dc4c312a57f24ed3c4c33a2063070 Mon Sep 17 00:00:00 2001 From: Moshe Date: Sun, 8 Apr 2018 21:37:43 +0300 Subject: Refactor api definition yamls to support jinja2 Issue-ID: VNFSDK-181 Change-Id: Ibff00e985f95b400f08d4de4021dc3a8ab235ad7 Signed-off-by: Moshe Support creation of multiple vf-modules per vnf Issue-ID: VNFSDK-264 Change-Id: I45054bc4bb721d7df89653e99fafe61297939504 Signed-off-by: Moshe fix tests Issue-ID: VNFSDK-264 Change-Id: I077289bfcd4c68b0191fd74c4e02e07a67f5104f Signed-off-by: Moshe --- vnftest/onap/onboard/accept_resource_test.yaml | 20 ++-- vnftest/onap/onboard/accept_service_test.yaml | 18 +-- vnftest/onap/onboard/add_resource_instance.yaml | 35 +++--- vnftest/onap/onboard/add_service.yaml | 111 +++++++----------- vnftest/onap/onboard/approve_distribution.yaml | 18 +-- vnftest/onap/onboard/checkin_vlm.yaml | 18 +-- vnftest/onap/onboard/checkin_vsp.yaml | 19 ++-- vnftest/onap/onboard/create_package_vsp.yaml | 21 ++-- vnftest/onap/onboard/create_vlm.yaml | 25 ++--- vnftest/onap/onboard/create_vsp.yaml | 38 +++---- vnftest/onap/onboard/distribute.yaml | 18 +-- vnftest/onap/onboard/import_vsp.yaml | 125 ++++++++------------- vnftest/onap/onboard/monitor_distribution.yaml | 18 +-- vnftest/onap/onboard/process_package.yaml | 15 ++- vnftest/onap/onboard/start_resource_test.yaml | 16 +-- vnftest/onap/onboard/start_service_test.yaml | 15 ++- .../onap/onboard/submit_resource_for_testing.yaml | 19 ++-- .../onap/onboard/submit_service_for_testing.yaml | 19 ++-- vnftest/onap/onboard/submit_vlm.yaml | 19 ++-- vnftest/onap/onboard/submit_vsp.yaml | 19 ++-- vnftest/onap/onboard/upload_package.yaml | 17 ++- 21 files changed, 286 insertions(+), 337 deletions(-) (limited to 'vnftest/onap/onboard') diff --git a/vnftest/onap/onboard/accept_resource_test.yaml b/vnftest/onap/onboard/accept_resource_test.yaml index 60a079e..2479f52 100644 --- a/vnftest/onap/onboard/accept_resource_test.yaml +++ b/vnftest/onap/onboard/accept_resource_test.yaml @@ -13,12 +13,14 @@ ############################################################################## --- -method: "POST" -url: "http://{sdc_ip}:{sdc_catalog_port}/sdc1/feProxy/rest/v1/catalog/resources/{resource_id}/lifecycleState/certify" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic YmVlcDpib29w", - "USER_ID": "{sdc_tester_user}", - "Accept": "application/json" - } -body: {"userRemarks":"certified"} +method: POST +url: http://{{sdc_ip}}:{{sdc_catalog_port}}/sdc1/feProxy/rest/v1/catalog/resources/{{resource_id}}/lifecycleState/certify +headers: + Content-Type: application/json + Authorization: Basic YmVlcDpib29w + USER_ID: {{sdc_tester_user}} + Accept: application/json + +body: + userRemarks: certified + diff --git a/vnftest/onap/onboard/accept_service_test.yaml b/vnftest/onap/onboard/accept_service_test.yaml index d942084..6d38244 100644 --- a/vnftest/onap/onboard/accept_service_test.yaml +++ b/vnftest/onap/onboard/accept_service_test.yaml @@ -13,12 +13,12 @@ ############################################################################## --- -method: "POST" -url: "http://{sdc_ip}:{sdc_catalog_port}/sdc1/feProxy/rest/v1/catalog/services/{sdc_service_id}/lifecycleState/certify" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic YmVlcDpib29w", - "USER_ID": "{sdc_tester_user}", - "Accept": "application/json" - } -body: {"userRemarks":"certified"} +method: POST +url: http://{{sdc_ip}}:{{sdc_catalog_port}}/sdc1/feProxy/rest/v1/catalog/services/{{sdc_service_id}}/lifecycleState/certify +headers: + Content-Type: application/json + Authorization: Basic YmVlcDpib29w + USER_ID: {{sdc_tester_user}} + Accept: application/json +body: + userRemarks: certified diff --git a/vnftest/onap/onboard/add_resource_instance.yaml b/vnftest/onap/onboard/add_resource_instance.yaml index a1af66c..e217bd7 100644 --- a/vnftest/onap/onboard/add_resource_instance.yaml +++ b/vnftest/onap/onboard/add_resource_instance.yaml @@ -13,21 +13,20 @@ ############################################################################## --- -method: "POST" -url: "http://{sdc_ip}:{sdc_catalog_port}/sdc1/feProxy/rest/v1/catalog/services/{sdc_service_id}/resourceInstance" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic YmVlcDpib29w", - "USER_ID": "{sdc_designer_user}", - "Accept": "application/json" - } -body: { - "uniqueId": "{resource_instance_unique_id}", - "posX": "500", - "posY": "100", - "name": "{resource_instance_name}", - "componentVersion": "1.0", - "originType": "VF", - "icon": "defaulticon", - "componentUid": "{resource_version_id}" - } \ No newline at end of file +method: POST +url: http://{{sdc_ip}}:{{sdc_catalog_port}}/sdc1/feProxy/rest/v1/catalog/services/{{sdc_service_id}}/resourceInstance +headers: + Content-Type: application/json + Authorization: Basic YmVlcDpib29w + USER_ID: {{sdc_designer_user}} + Accept: application/json + +body: + uniqueId: {{resource_instance_unique_id}} + posX: 500 + posY: 100 + name: {{resource_instance_name}} + componentVersion: 1.0 + originType: VF + icon: defaulticon + componentUid: {{resource_version_id}} diff --git a/vnftest/onap/onboard/add_service.yaml b/vnftest/onap/onboard/add_service.yaml index 9602a6b..91a6eff 100644 --- a/vnftest/onap/onboard/add_service.yaml +++ b/vnftest/onap/onboard/add_service.yaml @@ -12,71 +12,46 @@ # the License ############################################################################## --- -method: "POST" -url: "http://{sdc_ip}:{sdc_catalog_port}/sdc1/feProxy/rest/v1/catalog/services" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic YmVlcDpib29w", - "USER_ID": "{sdc_designer_user}", - "Accept": "application/json" - } -body: { - "artifacts": { - - }, - "toscaArtifacts": { - - }, - "contactId": "{sdc_designer_user}", - "categories": [ - { - "name": "Network L4+", - "normalizedName": "network l4+", - "uniqueId": "serviceNewCategory.network l4+", - "icons": [ - "network_l_4" - ], - "subcategories": null, - "ownerId": null - } - ], - "description": "service test", - "icon": "defaulticon", - "componentInstancesProperties": { - - }, - "componentInstancesAttributes": { - - }, - "name": "{service_name}", - "tags": [ - "{service_name}" - ], - "capabilities": { - - }, - "requirements": { - - }, - "deploymentArtifacts": { - - }, - "componentType": "SERVICE", - "projectCode": "100100", - "componentInstances": [ - - ], - "properties": [ - - ], - "attributes": [ - - ], - "groups": [ - - ], - "ecompGeneratedNaming": "true", - "serviceApiArtifacts": { - - } - } +method: POST +url: http://{{sdc_ip}}:{{sdc_catalog_port}}/sdc1/feProxy/rest/v1/catalog/services +headers: + Content-Type: application/json + Authorization: Basic YmVlcDpib29w + USER_ID: {{sdc_designer_user}} + Accept: application/json + +body: + artifacts: + toscaArtifacts: + contactId: {{sdc_designer_user}} + categories: + - + name: Network L4+ + normalizedName: network l4+ + uniqueId: serviceNewCategory.network l4+ + icons: + - + network_l_4 + + subcategories: null + ownerId: null + description: service test + icon: defaulticon + componentInstancesProperties: + componentInstancesAttributes: + name: {{service_name}} + tags: + - + {{service_name}} + + capabilities: + requirements: + deploymentArtifacts: + componentType: SERVICE + projectCode: 100100 + componentInstances: [] + properties: [] + attributes: [] + groups: [] + ecompGeneratedNaming: true + serviceApiArtifacts: diff --git a/vnftest/onap/onboard/approve_distribution.yaml b/vnftest/onap/onboard/approve_distribution.yaml index b1efc48..a0f6a0d 100644 --- a/vnftest/onap/onboard/approve_distribution.yaml +++ b/vnftest/onap/onboard/approve_distribution.yaml @@ -12,12 +12,12 @@ # the License ############################################################################## --- -method: "POST" -url: "http://{sdc_ip}:{sdc_catalog_port}/sdc1/feProxy/rest/v1/catalog/services/{service_version_id}/distribution-state/approve" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic YmVlcDpib29w", - "USER_ID": "{sdc_governance_user}", - "Accept": "application/json" - } -body: {"userRemarks":"approved"} +method: POST +url: http://{{sdc_ip}}:{{sdc_catalog_port}}/sdc1/feProxy/rest/v1/catalog/services/{{service_version_id}}/distribution-state/approve +headers: + Content-Type: application/json + Authorization: Basic YmVlcDpib29w + USER_ID: {{sdc_governance_user}} + Accept: application/json +body: + userRemarks: approved diff --git a/vnftest/onap/onboard/checkin_vlm.yaml b/vnftest/onap/onboard/checkin_vlm.yaml index 93fdd07..be77446 100644 --- a/vnftest/onap/onboard/checkin_vlm.yaml +++ b/vnftest/onap/onboard/checkin_vlm.yaml @@ -13,12 +13,12 @@ ############################################################################## --- -method: "PUT" -url: "http://{sdc_ip}:{sdc_port}/onboarding-api/v1.0/vendor-license-models/{vendor_id}/versions/0.1/actions" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", - "USER_ID": "{sdc_designer_user}", - "Accept": "application/json" - } -body: {"action":"Checkin"} +method: PUT +url: http://{{sdc_ip}}:{{sdc_port}}/onboarding-api/v1.0/vendor-license-models/{{vendor_id}}/versions/0.1/actions +headers: + Content-Type: application/json + Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== + USER_ID: {{sdc_designer_user}} + Accept: application/json +body: + action: Checkin diff --git a/vnftest/onap/onboard/checkin_vsp.yaml b/vnftest/onap/onboard/checkin_vsp.yaml index 399aa47..d0b9067 100644 --- a/vnftest/onap/onboard/checkin_vsp.yaml +++ b/vnftest/onap/onboard/checkin_vsp.yaml @@ -12,12 +12,13 @@ # the License ############################################################################## --- -method: "PUT" -url: "http://{sdc_ip}:{sdc_port}/onboarding-api/v1.0/vendor-software-products/{vsp_id}/versions/0.1/actions" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", - "USER_ID": "{sdc_designer_user}", - "Accept": "application/json" - } -body: {"action":"Checkin"} +method: PUT +url: http://{{sdc_ip}}:{{sdc_port}}/onboarding-api/v1.0/vendor-software-products/{{vsp_id}}/versions/0.1/actions +headers: + Content-Type: application/json + Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== + USER_ID: {{sdc_designer_user}} + Accept: application/json + +body: + action: Checkin diff --git a/vnftest/onap/onboard/create_package_vsp.yaml b/vnftest/onap/onboard/create_package_vsp.yaml index a961b86..85a7bc5 100644 --- a/vnftest/onap/onboard/create_package_vsp.yaml +++ b/vnftest/onap/onboard/create_package_vsp.yaml @@ -1,7 +1,7 @@ ############################################################################## # Copyright 2018 EuropeanSoftwareMarketingLtd. # =================================================================== -# Licensed under the ApacheLicense, Version2.0 (the"License"); +# Licensed under the ApacheLicense Version2.0 (the"License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at # http://www.apache.org/licenses/LICENSE-2.0 @@ -12,12 +12,13 @@ # the License ############################################################################## --- -method: "PUT" -url: "http://{sdc_ip}:{sdc_port}/onboarding-api/v1.0/vendor-software-products/{vsp_id}/versions/0.1/actions" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", - "USER_ID": "{sdc_designer_user}", - "Accept": "application/json" - } -body: {"action":"Create_Package"} +method: PUT +url: http://{{sdc_ip}}:{{sdc_port}}/onboarding-api/v1.0/vendor-software-products/{{vsp_id}}/versions/0.1/actions +headers: + Content-Type: application/json + Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== + USER_ID: {{sdc_designer_user}} + Accept: application/json + +body: + action: Create_Package diff --git a/vnftest/onap/onboard/create_vlm.yaml b/vnftest/onap/onboard/create_vlm.yaml index dce110a..25418a9 100644 --- a/vnftest/onap/onboard/create_vlm.yaml +++ b/vnftest/onap/onboard/create_vlm.yaml @@ -13,16 +13,15 @@ ############################################################################## --- -method: "POST" -url: "http://{sdc_ip}:{sdc_port}/onboarding-api/v1.0/vendor-license-models" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", - "USER_ID": "{sdc_designer_user}", - "Accept": "application/json" - } -body: { - "vendorName": "{vendor_name}", - "description": "vlm via dovetail", - "iconRef": "icon" - } \ No newline at end of file +method: POST +url: http://{{sdc_ip}}:{{sdc_port}}/onboarding-api/v1.0/vendor-license-models +headers: + Content-Type: application/json + Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== + USER_ID: {{sdc_designer_user}} + Accept: application/json + +body: + vendorName: {{vendor_name}} + description: vlm via dovetail + iconRef: icon \ No newline at end of file diff --git a/vnftest/onap/onboard/create_vsp.yaml b/vnftest/onap/onboard/create_vsp.yaml index d9721a2..01d5d64 100644 --- a/vnftest/onap/onboard/create_vsp.yaml +++ b/vnftest/onap/onboard/create_vsp.yaml @@ -12,23 +12,21 @@ # the License ############################################################################## --- -method: "POST" -url: "http://{sdc_ip}:{sdc_port}/onboarding-api/v1.0/vendor-software-products" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", - "USER_ID": "{sdc_designer_user}", - "Accept": "application/json" - } -body: { - "vendorId": "{vendor_id}", - "name": "{vsp_name}", - "category": "resourceNewCategory.application l4+", - "subCategory": "resourceNewCategory.application l4+.firewall", - "description": "vlm via dovetail", - "onboardingMethod": "NetworkPackage", - "vendorName": "dovetailVendor", - "icon": "icon", - "licensingData": { - } - } \ No newline at end of file +method: POST +url: http://{{sdc_ip}}:{{sdc_port}}/onboarding-api/v1.0/vendor-software-products +headers: + Content-Type: application/json + Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== + USER_ID: {{sdc_designer_user}} + Accept: application/json + +body: + vendorId: {{vendor_id}} + name: {{vsp_name}} + category: resourceNewCategory.application l4+ + subCategory: resourceNewCategory.application l4+.firewall + description: vlm via dovetail + onboardingMethod: NetworkPackage + vendorName: dovetailVendor + icon: icon + licensingData: \ No newline at end of file diff --git a/vnftest/onap/onboard/distribute.yaml b/vnftest/onap/onboard/distribute.yaml index 7deb9a1..70415bf 100644 --- a/vnftest/onap/onboard/distribute.yaml +++ b/vnftest/onap/onboard/distribute.yaml @@ -12,12 +12,12 @@ # the License ############################################################################## --- -method: "POST" -url: "http://{sdc_ip}:{sdc_catalog_port}/sdc1/feProxy/rest/v1/catalog/services/{service_version_id}/distribution/PROD/activate" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic YmVlcDpib29w", - "USER_ID": "{sdc_operations_user}", - "Accept": "application/json" - } -body: {} +method: POST +url: http://{{sdc_ip}}:{{sdc_catalog_port}}/sdc1/feProxy/rest/v1/catalog/services/{{service_version_id}}/distribution/PROD/activate +headers: + Content-Type: application/json + Authorization: Basic YmVlcDpib29w + USER_ID: {{sdc_operations_user}} + Accept: application/json + +body: diff --git a/vnftest/onap/onboard/import_vsp.yaml b/vnftest/onap/onboard/import_vsp.yaml index d3a3100..539b427 100644 --- a/vnftest/onap/onboard/import_vsp.yaml +++ b/vnftest/onap/onboard/import_vsp.yaml @@ -12,80 +12,53 @@ # the License ############################################################################## --- -method: "POST" -url: "http://{sdc_ip}:{sdc_catalog_port}/sdc1/feProxy/rest/v1/catalog/resources" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic YmVlcDpib29w", - "USER_ID": "{sdc_designer_user}", - "Accept": "application/json" - } -body: { - "artifacts": { +method: POST +url: http://{{sdc_ip}}:{{sdc_catalog_port}}/sdc1/feProxy/rest/v1/catalog/resources +headers: + Content-Type: application/json + Authorization: Basic YmVlcDpib29w + USER_ID: {{sdc_designer_user}} + Accept: application/json - }, - "toscaArtifacts": { - - }, - "contactId": "{sdc_designer_user}", - "categories": [ - { - "name": "Application L4+", - "normalizedName": "application l4+", - "uniqueId": "resourceNewCategory.application l4+", - "icons": null, - "subcategories": [ - { - "name": "Firewall", - "normalizedName": "firewall", - "uniqueId": "resourceNewCategory.application l4+.firewall", - "icons": [ - "firewall" - ], - "groupings": null, - "ownerId": null - } - ], - "ownerId": null - } - ], - "description": "dovetail initiated", - "icon": "defaulticon", - "componentInstancesProperties": { - - }, - "componentInstancesAttributes": { - - }, - "name": "{vsp_name}", - "tags": [ - "{vsp_name}" - ], - "capabilities": { - - }, - "requirements": { - - }, - "deploymentArtifacts": { - - }, - "componentType": "RESOURCE", - "vendorName": "dovetailVendor", - "vendorRelease": "1.0", - "componentInstances": [ - - ], - "properties": [ - - ], - "attributes": [ - - ], - "groups": [ - - ], - "resourceType": "VF", - "csarUUID": "{vsp_id}", - "csarVersion": "1.0" - } +body: + artifacts: + toscaArtifacts: + contactId: {{sdc_designer_user}} + categories: + - + name: Application L4+ + normalizedName: application l4+ + uniqueId: resourceNewCategory.application l4+ + icons: null + subcategories: + - + name: Firewall + normalizedName: firewall + uniqueId: resourceNewCategory.application l4+.firewall + icons: + - + firewall + groupings: null + ownerId: null + ownerId: null + description: dovetail initiated + icon: defaulticon + componentInstancesProperties: + componentInstancesAttributes: + name: {{vsp_name}} + tags: + - + {{vsp_name}} + capabilities: + requirements: + deploymentArtifacts: + componentType: RESOURCE + vendorName: dovetailVendor + vendorRelease: 1.0 + componentInstances: [] + properties: [] + attributes: [] + groups: [] + resourceType: VF + csarUUID: {{vsp_id}} + csarVersion: 1.0 diff --git a/vnftest/onap/onboard/monitor_distribution.yaml b/vnftest/onap/onboard/monitor_distribution.yaml index 07216d0..40ad7ad 100644 --- a/vnftest/onap/onboard/monitor_distribution.yaml +++ b/vnftest/onap/onboard/monitor_distribution.yaml @@ -12,12 +12,12 @@ # the License ############################################################################## --- -method: "GET" -url: "http://{sdc_ip}:{sdc_catalog_port}/sdc1/feProxy/rest/v1/catalog/services/{distributed_service_id}/distribution" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic YmVlcDpib29w", - "USER_ID": "{sdc_operations_user}", - "Accept": "application/json" - } -body: {} +method: GET +url: http://{{sdc_ip}}:{{sdc_catalog_port}}/sdc1/feProxy/rest/v1/catalog/services/{{distributed_service_id}}/distribution +headers: + Content-Type: application/json + Authorization: Basic YmVlcDpib29w + USER_ID: {{sdc_operations_user}} + Accept: application/json + +body: diff --git a/vnftest/onap/onboard/process_package.yaml b/vnftest/onap/onboard/process_package.yaml index ee8f791..20dc082 100644 --- a/vnftest/onap/onboard/process_package.yaml +++ b/vnftest/onap/onboard/process_package.yaml @@ -12,11 +12,10 @@ # the License ############################################################################## --- -method: "PUT" -url: "http://{sdc_ip}:{sdc_port}/onboarding-api/v1.0/vendor-software-products/{vsp_id}/versions/0.1/orchestration-template-candidate/process" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", - "USER_ID": "{sdc_designer_user}", - "Accept": "application/json" - } \ No newline at end of file +method: PUT +url: http://{{sdc_ip}}:{{sdc_port}}/onboarding-api/v1.0/vendor-software-products/{{vsp_id}}/versions/0.1/orchestration-template-candidate/process +headers: + Content-Type: application/json + Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== + USER_ID: {{sdc_designer_user}} + Accept: application/json diff --git a/vnftest/onap/onboard/start_resource_test.yaml b/vnftest/onap/onboard/start_resource_test.yaml index d6ba7b3..b55c909 100644 --- a/vnftest/onap/onboard/start_resource_test.yaml +++ b/vnftest/onap/onboard/start_resource_test.yaml @@ -12,12 +12,12 @@ # the License ############################################################################## --- -method: "POST" -url: "http://{sdc_ip}:{sdc_catalog_port}/sdc1/feProxy/rest/v1/catalog/resources/{resource_id}/lifecycleState/startCertification" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic YmVlcDpib29w", - "USER_ID": "{sdc_tester_user}", - "Accept": "application/json" - } +method: POST +url: http://{{sdc_ip}}:{{sdc_catalog_port}}/sdc1/feProxy/rest/v1/catalog/resources/{{resource_id}}/lifecycleState/startCertification +headers: + Content-Type: application/json + Authorization: Basic YmVlcDpib29w + USER_ID: {{sdc_tester_user}} + Accept: application/json + body: {} diff --git a/vnftest/onap/onboard/start_service_test.yaml b/vnftest/onap/onboard/start_service_test.yaml index a9d9da4..dff74b9 100644 --- a/vnftest/onap/onboard/start_service_test.yaml +++ b/vnftest/onap/onboard/start_service_test.yaml @@ -12,12 +12,11 @@ # the License ############################################################################## --- -method: "POST" -url: "http://{sdc_ip}:{sdc_catalog_port}/sdc1/feProxy/rest/v1/catalog/services/{sdc_service_id}/lifecycleState/startCertification" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic YmVlcDpib29w", - "USER_ID": "{sdc_tester_user}", - "Accept": "application/json" - } +method: POST +url: http://{{sdc_ip}}:{{sdc_catalog_port}}/sdc1/feProxy/rest/v1/catalog/services/{{sdc_service_id}}/lifecycleState/startCertification +headers: + Content-Type: application/json + Authorization: Basic YmVlcDpib29w + USER_ID: {{sdc_tester_user}} + Accept: application/json body: {} diff --git a/vnftest/onap/onboard/submit_resource_for_testing.yaml b/vnftest/onap/onboard/submit_resource_for_testing.yaml index 4bdc2be..22dbb64 100644 --- a/vnftest/onap/onboard/submit_resource_for_testing.yaml +++ b/vnftest/onap/onboard/submit_resource_for_testing.yaml @@ -12,12 +12,13 @@ # the License ############################################################################## --- -method: "POST" -url: "http://{sdc_ip}:{sdc_catalog_port}/sdc1/feProxy/rest/v1/catalog/resources/{resource_id}/lifecycleState/certificationRequest" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic YmVlcDpib29w", - "USER_ID": "{sdc_designer_user}", - "Accept": "application/json" - } -body: {"userRemarks":"resource submited for testing"} +method: POST +url: http://{{sdc_ip}}:{{sdc_catalog_port}}/sdc1/feProxy/rest/v1/catalog/resources/{{resource_id}}/lifecycleState/certificationRequest +headers: + Content-Type: application/json + Authorization: Basic YmVlcDpib29w + USER_ID: {{sdc_designer_user}} + Accept: application/json + +body: + userRemarks: resource submited for testing diff --git a/vnftest/onap/onboard/submit_service_for_testing.yaml b/vnftest/onap/onboard/submit_service_for_testing.yaml index fe57ded..1910695 100644 --- a/vnftest/onap/onboard/submit_service_for_testing.yaml +++ b/vnftest/onap/onboard/submit_service_for_testing.yaml @@ -12,12 +12,13 @@ # the License ############################################################################## --- -method: "POST" -url: "http://{sdc_ip}:{sdc_catalog_port}/sdc1/feProxy/rest/v1/catalog/services/{sdc_service_id}/lifecycleState/certificationRequest" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic YmVlcDpib29w", - "USER_ID": "{sdc_designer_user}", - "Accept": "application/json" - } -body: {"userRemarks":"resource submited for testing"} +method: POST +url: http://{{sdc_ip}}:{{sdc_catalog_port}}/sdc1/feProxy/rest/v1/catalog/services/{{sdc_service_id}}/lifecycleState/certificationRequest +headers: + Content-Type: application/json + Authorization: Basic YmVlcDpib29w + USER_ID: {{sdc_designer_user}} + Accept: application/json + +body: + userRemarks: resource submited for testing diff --git a/vnftest/onap/onboard/submit_vlm.yaml b/vnftest/onap/onboard/submit_vlm.yaml index eb1683a..8fcd234 100644 --- a/vnftest/onap/onboard/submit_vlm.yaml +++ b/vnftest/onap/onboard/submit_vlm.yaml @@ -13,12 +13,13 @@ ############################################################################## --- -method: "PUT" -url: "http://{sdc_ip}:{sdc_port}/onboarding-api/v1.0/vendor-license-models/{vendor_id}/versions/0.1/actions" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", - "USER_ID": "{sdc_designer_user}", - "Accept": "application/json" - } -body: {"action":"Submit"} +method: PUT +url: http://{{sdc_ip}}:{{sdc_port}}/onboarding-api/v1.0/vendor-license-models/{{vendor_id}}/versions/0.1/actions +headers: + Content-Type: application/json + Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== + USER_ID: {{sdc_designer_user}} + Accept: application/json + +body: + action: Submit diff --git a/vnftest/onap/onboard/submit_vsp.yaml b/vnftest/onap/onboard/submit_vsp.yaml index c255cd7..38fe218 100644 --- a/vnftest/onap/onboard/submit_vsp.yaml +++ b/vnftest/onap/onboard/submit_vsp.yaml @@ -12,12 +12,13 @@ # the License ############################################################################## --- -method: "PUT" -url: "http://{sdc_ip}:{sdc_port}/onboarding-api/v1.0/vendor-software-products/{vsp_id}/versions/0.1/actions" -headers: { - "Content-Type": "application/json", - "Authorization": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", - "USER_ID": "{sdc_designer_user}", - "Accept": "application/json" - } -body: {"action":"Submit"} +method: PUT +url: http://{{sdc_ip}}:{{sdc_port}}/onboarding-api/v1.0/vendor-software-products/{{vsp_id}}/versions/0.1/actions +headers: + Content-Type: application/json + Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== + USER_ID: {{sdc_designer_user}} + Accept: application/json + +body: + action: Submit diff --git a/vnftest/onap/onboard/upload_package.yaml b/vnftest/onap/onboard/upload_package.yaml index 958782f..43bdae3 100644 --- a/vnftest/onap/onboard/upload_package.yaml +++ b/vnftest/onap/onboard/upload_package.yaml @@ -12,12 +12,11 @@ # the License ############################################################################## --- -method: "POST" -url: "http://{sdc_ip}:{sdc_port}/onboarding-api/v1.0/vendor-software-products/{vsp_id}/versions/0.1/orchestration-template-candidate" -headers: { - "Content-Type": "multipart/form-data", - "Authorization": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==", - "USER_ID": "{sdc_designer_user}", - "Accept": "application/json" - } -file: "{package_file_path}" \ No newline at end of file +method: POST +url: http://{{sdc_ip}}:{{sdc_port}}/onboarding-api/v1.0/vendor-software-products/{{vsp_id}}/versions/0.1/orchestration-template-candidate +headers: + Content-Type: multipart/form-data + Authorization: Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA== + USER_ID: {{sdc_designer_user}} + Accept: application/json +file: {{package_file_path}} \ No newline at end of file -- cgit 1.2.3-korg