diff options
3 files changed, 28 insertions, 40 deletions
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-test-request-schema-dublin-moco.json b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-test-request-schema-dublin-moco.json index f3f1d839..442c9c14 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-test-request-schema-dublin-moco.json +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-test-request-schema-dublin-moco.json @@ -1,40 +1,40 @@ [ { "request" : { "method" : "post", - "uri" : "/sdc2/rest/v1/catalog/services/fb8ffb35-a8e3-493f-9b9b-b31321b68dfa/lifecycleState/certificationRequest", + "uri" : "/sdc2/rest/v1/catalog/services/58620731-40a9-4f8e-95db-ef9fc478a705/lifecycleState/certificationRequest", "headers" : { "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh", "X-FromAppId" : "ONAP CLI", "Accept" : "application/json", "USER_ID" : "cs0008", - "X-TransactionId" : "req-d49e86c7-c5fb-43ba-8bc4-5069c37f4635", + "X-TransactionId" : "req-18989ac3-bf7d-4c4a-8239-601c400273b2", "Content-Type" : "application/json" }, "json" : { - "userRemarks" : "Requesting certification via CLI" + "userRemarks" : "Created by Open Command Platform - OCOMP" } }, "response" : { "status" : 200, "json" : { - "uniqueId" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa", - "name" : "cli-service", + "uniqueId" : "58620731-40a9-4f8e-95db-ef9fc478a705", + "name" : "vgwocompvtp Service", "version" : "0.1", "isHighestVersion" : true, - "creationDate" : 1553192910482, - "lastUpdateDate" : 1553193141863, - "description" : "create service model with cli", + "creationDate" : 1567068764463, + "lastUpdateDate" : 1567068797890, + "description" : "Created by Open Command Platform - OCOMP", "lifecycleState" : "READY_FOR_CERTIFICATION", - "tags" : [ "cli-service" ], + "tags" : [ "vgwocompvtp Service" ], "icon" : "defaulticon", - "normalizedName" : "cliservice", - "systemName" : "CliService", + "normalizedName" : "vgwocompvtpservice", + "systemName" : "VgwocompvtpService", "contactId" : "cs0008", "allVersions" : { - "0.1" : "fb8ffb35-a8e3-493f-9b9b-b31321b68dfa" + "0.1" : "58620731-40a9-4f8e-95db-ef9fc478a705" }, - "projectCode" : "000000", - "invariantUUID" : "4dd682d8-4c3c-4f6c-96b1-9e19eed5987c", + "projectCode" : "OCOMP", + "invariantUUID" : "1b6d7385-916d-4f96-aebd-f2cd03c59079", "componentType" : "SERVICE", "categories" : [ { "name" : "Network L1-3", @@ -55,8 +55,8 @@ "environmentContext" : "General_Revenue-Bearing", "instantiationType" : "A-la-carte", "vspArchived" : false, - "archived" : false, - "uuid" : "788289e1-161a-42b8-89ed-14adde63c600" + "uuid" : "ea98398d-1858-4a22-b227-74eb0e60df49", + "archived" : false } } } ]
\ No newline at end of file diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-test-request-schema-dublin-sample.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-test-request-schema-dublin-sample.yaml index fcd0aac0..ba8ebf79 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-test-request-schema-dublin-sample.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/service-model/service-model-test-request-schema-dublin-sample.yaml @@ -1,22 +1,10 @@ -# Copyright © Intel Corporation 2019 -# -# Licensed under the Apache License, Version 2.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 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. open_cli_sample_version: 1.0 -name: -b +name: service-model-test-request version: onap-dublin samples: sample1: - name: -b - input: fb8ffb35-a8e3-493f-9b9b-b31321b68dfa -r cli test request -u cs0008 -p demo123456! -m http://10.12.6.129:30205 + name: service-model-test-request + input: --format json --remarks Created by Open Command Platform - OCOMP --service-id 58620731-40a9-4f8e-95db-ef9fc478a705 moco: service-model-test-request-schema-dublin-moco.json - output:
\ No newline at end of file + output: | + [{}] diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-request-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-request-schema-dublin.yaml index cf3f7c9d..c0bdcd59 100644 --- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-request-schema-dublin.yaml +++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-request-schema-dublin.yaml @@ -18,21 +18,21 @@ description: Request the certification of Service model in SDC info: product: onap-dublin - service: sdc + service: sdc.catalog author: ONAP CLI Team onap-discuss@lists.onap.org parameters: - - name: service-model-id + - name: service-id description: Service model ID type: string - long_option: service-model-id + long_option: service-id short_option: b is_optional: true - - name: remark + - name: remarks description: Remarks when submitting for testing type: string - long_option: remark + long_option: remarks short_option: r http: @@ -42,9 +42,9 @@ http: auth: basic mode: direct request: - uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/certificationRequest + uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/certificationRequest method: POST - body: '{"userRemarks": "Requesting certification via CLI"}' + body: '{"userRemarks": "${remarks}"}' success_codes: - 200 |