aboutsummaryrefslogtreecommitdiffstats
path: root/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model
diff options
context:
space:
mode:
Diffstat (limited to 'products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model')
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml2
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-artifact-schema-dublin.yaml8
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-dublin.yaml27
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-dublin.yaml10
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-archive-schema-dublin.yaml45
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-dublin.yaml30
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-dublin.yaml19
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-dublin.yaml11
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-dublin.yaml8
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-dublin.yaml6
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-set-property.yaml28
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-accept-schema-dublin.yaml34
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-reject-schema-dublin.yaml8
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-request-schema-dublin.yaml14
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-start-schema-dublin.yaml8
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-undocheckout-schema-dublin.yaml8
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-dublin.yaml12
17 files changed, 190 insertions, 88 deletions
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml
index addce58d..bd67c6a1 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/get-resource-module-name.yaml
@@ -18,7 +18,7 @@ description: Get resource module name
info:
product: onap-dublin
- service: sdc
+ service: sdc.catalog
author: ONAP HPA Team onap-discuss@lists.onap.org
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-artifact-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-artifact-schema-dublin.yaml
index dc881d90..0a81b0f1 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-artifact-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-artifact-schema-dublin.yaml
@@ -18,15 +18,15 @@ description: Add a artifact to a Service model
info:
product: onap-dublin
- service: sdc
+ service: sdc.catalog
author: ONAP HPA Team onap-discuss@lists.onap.org
parameters:
- - name: service-uniqueId
+ - name: service-id
description: Service Unique Id
type: string
- long_option: service-uniqueId
+ long_option: service-id
short_option: x
is_optional: false
- name: remarks
@@ -62,7 +62,7 @@ http:
auth: basic
mode: direct
request:
- uri: /sdc2/rest/v1/catalog/services/${service-uniqueId}/artifacts
+ uri: /sdc2/rest/v1/catalog/services/${service-id}/artifacts
method: POST
headers:
Content-MD5: $s{md5:__body__}
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-dublin.yaml
index 06b4c4fb..c0d6bbf0 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-add-vf-schema-dublin.yaml
@@ -18,22 +18,22 @@ description: Helps to add VF into service models 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: Onap Service Name
type: string
short_option: x
- long_option: service-model-id
+ long_option: service-id
is_optional: false
- - name: vf-uniqueId
+ - name: vf-id
description: VF Unique ID
type: string
short_option: y
- long_option: vf-uniqueId
+ long_option: vf-id
is_optional: true
- name: vf-name
description: VF Name
@@ -51,14 +51,18 @@ parameters:
results:
direction: portrait
attributes:
- - name: ID
+ - name: id
description: Service ID
scope: short
type: string
- - name: UUID
+ - name: uuid
description: Service UUID
scope: short
type: string
+ - name: inputs
+ description: VNF Input ids
+ scope: short
+ type: string
http:
service:
name: sdc
@@ -66,11 +70,12 @@ http:
auth: basic
mode: direct
request:
- uri: /sdc2/rest/v1/catalog/services/${service-model-id}/resourceInstance
+ uri: /sdc2/rest/v1/catalog/services/${service-id}/resourceInstance
method: POST
- body: '{"name": "${vf-name}", "componentVersion": "${vf-version}", "posY": 248, "posX": 406, "uniqueId": "${service-model-id}-${vf-uniqueId}", "originType": "VF", "componentUid": "${vf-uniqueId}", "icon": "defaulticon"}'
+ body: '{"name": "${vf-name}", "componentVersion": "${vf-version}", "posY": 248, "posX": 406, "uniqueId": "${service-id}-${vf-id}", "originType": "VF", "componentUid": "${vf-id}", "icon": "defaulticon"}'
success_codes:
- 201
result_map:
- ID: $b{$.uniqueId}
- UUID: $b{$.componentUid} \ No newline at end of file
+ id: $b{$.uniqueId}
+ uuid: $b{$.componentUid}
+ inputs: $b{$.inputs.[*].uniqueId} \ No newline at end of file
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-dublin.yaml
index 5b39b846..943796df 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-approve-schema-dublin.yaml
@@ -18,15 +18,15 @@ description: Approves the 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-uniqueId
- description: Service model UniqueId (can be found by running service-model-list)
+ - name: service-id
+ description: Service model UniqueId
type: string
- long_option: service-model-uniqueId
+ long_option: service-id
short_option: b
is_optional: false
- name: remarks
@@ -43,7 +43,7 @@ http:
auth: basic
mode: direct
request:
- uri: /sdc2/rest/v1/catalog/services/${service-model-uniqueId}/distribution-state/approve
+ uri: /sdc2/rest/v1/catalog/services/${service-id}/distribution-state/approve
method: POST
body: '{"userRemarks": "${remarks}"}'
success_codes:
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-archive-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-archive-schema-dublin.yaml
new file mode 100644
index 00000000..e28e4ac6
--- /dev/null
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-archive-schema-dublin.yaml
@@ -0,0 +1,45 @@
+# 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_schema_version: 1.0
+name: service-model-archive
+description: Archive the Service model in SDC
+
+info:
+ product: onap-dublin
+ service: sdc.catalog
+ author: ONAP CLI Team onap-discuss@lists.onap.org
+
+
+parameters:
+ - name: service-id
+ description: Service model UniqueId
+ type: string
+ long_option: service-id
+ short_option: b
+ is_optional: false
+
+http:
+ service:
+ name: sdc
+ version: v1.0
+ auth: basic
+ mode: direct
+ request:
+ uri: /sdc2/rest/v1/catalog/services/${service-id}/archive
+ method: POST
+ body: '{}'
+ success_codes:
+ - 200
+ - 417 \ No newline at end of file
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-dublin.yaml
index 444a0c58..29936912 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkin-schema-dublin.yaml
@@ -18,14 +18,14 @@ description: Checkin 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-uuid
- description: Service model UUID (can be found by running service-model-list)
+ - name: service-id
+ description: Service model ID
type: string
- long_option: service-model-uuid
+ long_option: service-id
short_option: b
is_optional: false
- name: remarks
@@ -34,7 +34,21 @@ parameters:
long_option: remarks
short_option: r
is_optional: false
-
+results:
+ direction: portrait
+ attributes:
+ - name: id
+ description: NS checked out version unique ID
+ scope: short
+ type: string
+ - name: uuid
+ description: NS checked out version unique ID
+ scope: short
+ type: string
+ - name: version
+ description: VF version
+ scope: short
+ type: string
http:
service:
name: sdc
@@ -42,8 +56,12 @@ http:
auth: basic
mode: direct
request:
- uri: /sdc2/rest/v1/catalog/services/${service-model-uuid}/lifecycleState/CHECKIN
+ uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/CHECKIN
method: POST
body: '{"userRemarks": "${remarks}"}'
success_codes:
- 200
+ result_map:
+ id: $b{$.uniqueId}
+ version: $b{$.version}
+ uuid: $b{$.unid} \ No newline at end of file
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-dublin.yaml
index ec0ccc6d..4d15c875 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-checkout-schema-dublin.yaml
@@ -18,25 +18,29 @@ description: Checkout 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-uuid
- description: Service model UUID (can be found from service-model-list)
+ - name: service-id
+ description: Service model ID
type: string
- long_option: service-model-uuid
+ long_option: service-id
short_option: b
is_optional: true
results:
direction: portrait
attributes:
- - name: ID
+ - name: id
description: NS checked out version unique ID
scope: short
type: string
+ - name: version
+ description: VF version
+ scope: short
+ type: string
http:
service:
name: sdc
@@ -44,10 +48,11 @@ http:
auth: basic
mode: direct
request:
- uri: /sdc2/rest/v1/catalog/services/${service-model-uuid}/lifecycleState/CHECKOUT
+ uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/CHECKOUT
method: POST
body: '{}'
success_codes:
- 200
result_map:
- ID: $b{$.uniqueId} \ No newline at end of file
+ id: $b{$.uniqueId}
+ version: $b{$.version} \ No newline at end of file
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-dublin.yaml
index ebc0c468..aa0e004b 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-create-schema-dublin.yaml
@@ -18,7 +18,7 @@ description: Create Service model in SDC
info:
product: onap-dublin
- service: sdc
+ service: sdc.catalog
author: ONAP HPA Team onap-discuss@lists.onap.org
@@ -66,10 +66,14 @@ parameters:
results:
direction: portrait
attributes:
- - name: ID
+ - name: id
description: Service ID
scope: short
type: string
+ - name: uuid
+ description: Service UUID
+ scope: short
+ type: string
http:
service:
name: sdc
@@ -117,4 +121,5 @@ http:
- 200
- 201
result_map:
- ID: $b{$.uniqueId}
+ id: $b{$.uniqueId}
+ uuid: $b{$.uuid}
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-dublin.yaml
index cf981b71..adbe0c0e 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-distribute-schema-dublin.yaml
@@ -18,15 +18,15 @@ description: Distributes the 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-uniqueId
+ - name: service-id
description: Service model UUID (can be found from service-model-list)
type: string
- long_option: service-model-uniqueId
+ long_option: service-id
short_option: b
is_optional: true
@@ -37,7 +37,7 @@ http:
auth: basic
mode: direct
request:
- uri: /sdc2/rest/v1/catalog/services/${service-model-uniqueId}/distribution/PROD/activate
+ uri: /sdc2/rest/v1/catalog/services/${service-id}/distribution/PROD/activate
method: POST
body: '{}'
success_codes:
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-dublin.yaml
index 87ccf7c8..8e5a3abf 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-list-schema-dublin.yaml
@@ -18,7 +18,7 @@ description: List the service model in SDC
info:
product: onap-dublin
- service: sdc
+ service: sdc.catalog
author: ONAP CLI Team onap-discuss@lists.onap.org
@@ -29,7 +29,7 @@ results:
description: UUID
type: string
scope: short
- - name: uniqueId
+ - name: id
description: uniqueId
type: string
scope: short
@@ -71,7 +71,7 @@ http:
- 200
result_map:
uuid: $b{services.[*].uuid}
- uniqueId: $b{services.[*].uniqueId}
+ id: $b{services.[*].uniqueId}
invariant-uuid: $b{services.[*].invariantUUID}
version: $b{services.[*].version}
name: $b{services.[*].name}
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-set-property.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-set-property.yaml
index a7ea76b7..d69b6669 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-set-property.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-set-property.yaml
@@ -18,27 +18,27 @@ description: Set property to a service model
info:
product: onap-dublin
- service: sdc
+ service: sdc.catalog
author: ONAP HPA Team onap-discuss@lists.onap.org
parameters:
- - name: service-uniqueId
+ - name: service-id
description: service UniqueId
type: string
- long_option: service-uniqueId
+ long_option: service-id
short_option: x
is_optional: false
- - name: resource-uuid
- description: resource uuid
+ - name: vf-resource-id
+ description: resource id provided by service ns_id.vf_id.vf_name
type: string
- long_option: resource-uuid
+ long_option: vf-resource-id
short_option: y
is_optional: false
- - name: resource-uniqueId
- description: resource UniqueId
+ - name: vf-id
+ description: resource id
type: string
- long_option: resource-uniqueId
+ long_option: vf-id
short_option: z
is_optional: false
- name: property-name
@@ -53,6 +53,12 @@ parameters:
long_option: property-value
short_option: r
is_optional: false
+ - name: input-uuid
+ description: VF Model Input uuid
+ type: string
+ long_option: input-uuid
+ short_option: R
+ is_optional: false
http:
service:
name: sdc
@@ -60,8 +66,8 @@ http:
auth: basic
mode: direct
request:
- uri: /sdc2/rest/v1/catalog/services/${service-uniqueId}/resourceInstance/${resource-uniqueId}/properties
+ uri: /sdc2/rest/v1/catalog/services/${service-id}/resourceInstance/${vf-resource-id}/inputs
method: POST
- body: '[{"constraints":null,"defaultValue":null,"description":null,"name":"${property-name}","parentUniqueId":null,"password":false,"required":false,"schema":{"property":{}},"schemaType":null,"type":"string","uniqueId":"${resource-uuid}.${property-name}","value":"${property-value}","definition":false,"getInputValues":null,"parentPropertyType":null,"subPropertyInputPath":null,"toscaPresentation":{"ownerId":null},"getPolicyValues":null,"inputPath":null}]'
+ body: '[{"constraints":[],"definition":false,"name":"${property-name}","parentUniqueId":"${input-uuid}","password":false,"required":false,"schema":{"property":{}},"toscaPresentation":{"ownerId":"${input-uuid}"},"type":"string","uniqueId":"${input-uuid}.${property-name}","value":"${property-value}"}]'
success_codes:
- 200
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-accept-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-accept-schema-dublin.yaml
index 85a31861..8522ea6a 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-accept-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-accept-schema-dublin.yaml
@@ -18,24 +18,38 @@ description: Accepts the Service model test 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: false
- - name: test-remark
+ - name: remarks
description: Remarks when accepting test
type: string
- long_option: test-remark
+ long_option: remarks
short_option: r
is_optional: false
-
+results:
+ direction: portrait
+ attributes:
+ - name: id
+ description: NS checked out version unique ID
+ scope: short
+ type: string
+ - name: uuid
+ description: NS checked out version unique ID
+ scope: short
+ type: string
+ - name: version
+ description: VF version
+ scope: short
+ type: string
http:
service:
name: sdc
@@ -43,8 +57,12 @@ http:
auth: basic
mode: direct
request:
- uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/certify
+ uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/certify
method: POST
- body: '{"userRemarks": "${test-remark}"}'
+ body: '{"userRemarks": "${remarks}"}'
success_codes:
- 200
+ result_map:
+ id: $b{$.uniqueId}
+ version: $b{$.version}
+ uuid: $b{$.unid} \ No newline at end of file
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-reject-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-reject-schema-dublin.yaml
index 7a1aad14..83aead84 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-reject-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-reject-schema-dublin.yaml
@@ -18,15 +18,15 @@ description: Rejects the Service model test in SDC
info:
product: onap-dublin
- service: sdc
+ service: sdc.catalog
author: ONAP HPA 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: false
- name: test-remark
@@ -43,7 +43,7 @@ http:
auth: basic
mode: direct
request:
- uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/failCertification
+ uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/failCertification
method: POST
body: '{"userRemarks": "${test-remark}"}'
success_codes:
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
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-start-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-start-schema-dublin.yaml
index 60c3239f..c43358d9 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-start-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-test-start-schema-dublin.yaml
@@ -18,15 +18,15 @@ description: Starts the testing of a 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
@@ -37,7 +37,7 @@ http:
auth: basic
mode: direct
request:
- uri: /sdc2/rest/v1/catalog/services/${service-model-id}/lifecycleState/startCertification
+ uri: /sdc2/rest/v1/catalog/services/${service-id}/lifecycleState/startCertification
method: POST
body: '{}'
success_codes:
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-undocheckout-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-undocheckout-schema-dublin.yaml
index ae9e8356..50023907 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-undocheckout-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service-model-undocheckout-schema-dublin.yaml
@@ -18,15 +18,15 @@ description: Undo Checkout 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-uuid
+ - name: service-uuid
description: Service model UUIID (check service-model-list)
type: string
- long_option: service-model-uuid
+ long_option: service-uuid
short_option: b
is_optional: true
@@ -37,7 +37,7 @@ http:
auth: basic
mode: direct
request:
- uri: /sdc2/rest/v1/catalog/services/${service-model-uuid}/lifecycleState/UNDOCHECKOUT
+ uri: /sdc2/rest/v1/catalog/services/${service-uuid}/lifecycleState/UNDOCHECKOUT
method: POST
body: '{"userRemarks": null}'
success_codes:
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-dublin.yaml b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-dublin.yaml
index 2241e05c..f2c67371 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-dublin.yaml
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-schema/service-model/service2vf-model-list-schema-dublin.yaml
@@ -18,16 +18,16 @@ description: List the VF in a given 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 uuid
type: string
short_option: z
- long_option: service-model-id
+ long_option: service-id
is_optional: false
results:
@@ -49,7 +49,7 @@ results:
description: version
type: string
scope: short
- - name: vf-unique-uuid
+ - name: vf-id
description: customization UUID
type: string
scope: short
@@ -61,12 +61,12 @@ http:
auth: basic
mode: direct
request:
- uri: /sdc2/rest/v1/catalog/services/${service-model-id}
+ uri: /sdc2/rest/v1/catalog/services/${service-id}
method: GET
success_codes:
- 200
result_map:
- vf-unique-uuid: $b{componentInstances.[*].uniqueId}
+ vf-id: $b{componentInstances.[*].uniqueId}
vf-uuid: $b{componentInstances.[*].componentUid}
vf-name: $b{componentInstances.[*].componentName}
vf-version: $b{componentInstances.[*].componentVersion}