summaryrefslogtreecommitdiffstats
path: root/products/onap-dublin
diff options
context:
space:
mode:
authorzhaoliping123 <zhaoliping@chinamobile.com>2020-04-23 19:03:20 +0800
committerzhaoliping123 <zhaoliping@chinamobile.com>2020-04-23 19:03:49 +0800
commit070a79ca528ce774a8ace8abef7f83897e32efbf (patch)
tree10eacd429d303d551846c54ee0a7d9412ea52620 /products/onap-dublin
parent5d5c63058d95c4044a9d73d1edb1648f75de839f (diff)
Update vfc cli
Issue-ID: CLI-268 Change-Id: Ib66d4cd23b811aee91630608d85a5df797f7d06e Signed-off-by: zhaoliping123 <zhaoliping@chinamobile.com>
Diffstat (limited to 'products/onap-dublin')
-rw-r--r--products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-descriptors-schema-moco.json37
-rw-r--r--products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-descriptors-schema-sample.yaml22
-rw-r--r--products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-query-multinslcmopoccs-schema-moco.json224
-rw-r--r--products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-query-multinslcmopoccs-schema-sample.yaml22
-rw-r--r--products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-get-ns-descriptors-schema.yaml29
-rw-r--r--products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-get-schema.yaml10
-rw-r--r--products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-query-multinslcmopoccs.yaml27
-rw-r--r--products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-create-schema.yaml2
-rw-r--r--products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-delete-schema.yaml2
-rw-r--r--products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-get-schema.yaml12
-rw-r--r--products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-instantiate-schema.yaml2
11 files changed, 349 insertions, 40 deletions
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-descriptors-schema-moco.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-descriptors-schema-moco.json
new file mode 100644
index 00000000..8dc819e1
--- /dev/null
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-descriptors-schema-moco.json
@@ -0,0 +1,37 @@
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/api/nsd/v1/ns_descriptors/2295cab6-4b4a-403f-8eb9-4dd83ca049d0",
+ "headers" : {
+ "Accept" : "application/json",
+ "Content-Type" : "application/json"
+ },
+ "json" : { }
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "id": "2295cab6-4b4a-403f-8eb9-4dd83ca049d0",
+ "nsdId": "2295cab6-4b4a-403f-8eb9-4dd83ca049d0",
+ "nsdName": "vCPE-tes1",
+ "nsdVersion": "",
+ "nsdDesigner": "",
+ "nsdInvariantId": "83fbd4c0-a2f3-4b35-8ba4-dfec47c6a99b",
+ "vnfPkgIds": [
+ "0a628ee7-465d-4916-b772-b72b541d8320",
+ "af099c7a-a975-40f5-bf9f-ac67de1b11a9",
+ "5bcdb6a8-6c4b-4032-b56d-d3030ee1ec05",
+ "1347001a-38ca-480a-a77b-d34873b6d0be",
+ "0ec7a346-26f2-414b-bcfd-4dfd63846c4d"
+ ],
+ "pnfdInfoIds": [],
+ "nestedNsdInfoIds": [],
+ "nsdOnboardingState": "ONBOARDED",
+ "onboardingFailureDetails": null,
+ "nsdOperationalState": "ENABLED",
+ "nsdUsageState": "NOT_IN_USE",
+ "userDefinedData": {},
+ "_links": null
+ }
+ }
+} ] \ No newline at end of file
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-descriptors-schema-sample.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-descriptors-schema-sample.yaml
new file mode 100644
index 00000000..6a10c251
--- /dev/null
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/catalog/vfc-catalog-get-ns-descriptors-schema-sample.yaml
@@ -0,0 +1,22 @@
+open_cli_sample_version: 1.0
+name: vfc-nslcm-get-ns-descriptors
+version: onap-dublin
+samples:
+ sample1:
+ name: vfc-nslcm-get-ns-descriptors
+ input: -m http://10.12.5.155:30280 -c 2295cab6-4b4a-403f-8eb9-4dd83ca049d0
+ moco: vfc-catalog-get-ns-descriptors-schema-moco.json
+ output: |
+ +--------------------------------------+--------------------------------------+------------+----------------------+--------------------------------------+------------------+
+ |id |nsd-info-id |nsd-name |nsd-onboarding-state |vnf-package-ids |pnf-package-ids |
+ +--------------------------------------+--------------------------------------+------------+----------------------+--------------------------------------+------------------+
+ |2295cab6-4b4a-403f-8eb9-4dd83ca049d0 |2295cab6-4b4a-403f-8eb9-4dd83ca049d0 |vCPE-tes1 |ONBOARDED |0a628ee7-465d-4916-b772-b72b541d8320 | |
+ +--------------------------------------+--------------------------------------+------------+----------------------+--------------------------------------+------------------+
+ | | | | |af099c7a-a975-40f5-bf9f-ac67de1b11a9 | |
+ +--------------------------------------+--------------------------------------+------------+----------------------+--------------------------------------+------------------+
+ | | | | |5bcdb6a8-6c4b-4032-b56d-d3030ee1ec05 | |
+ +--------------------------------------+--------------------------------------+------------+----------------------+--------------------------------------+------------------+
+ | | | | |1347001a-38ca-480a-a77b-d34873b6d0be | |
+ +--------------------------------------+--------------------------------------+------------+----------------------+--------------------------------------+------------------+
+ | | | | |0ec7a346-26f2-414b-bcfd-4dfd63846c4d | |
+ +--------------------------------------+--------------------------------------+------------+----------------------+--------------------------------------+------------------+
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-query-multinslcmopoccs-schema-moco.json b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-query-multinslcmopoccs-schema-moco.json
new file mode 100644
index 00000000..e8afc2e2
--- /dev/null
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-query-multinslcmopoccs-schema-moco.json
@@ -0,0 +1,224 @@
+
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/api/nslcm/v1/ns_lcm_op_occs",
+ "headers" : {
+ "Accept" : "application/json",
+ "Content-Type" : "application/json"
+ }
+ },
+ "response" : {
+ "status" : 200,
+ "json" : [
+ {
+ "id": "1aa6afe6-035a-47f0-a14d-7b63e00424f4",
+ "operationState": "COMPLETED",
+ "stateEnteredTime": "2020-04-20 09:59:59",
+ "startTime": "2020-04-20 09:58:08",
+ "nsInstanceId": "18c8be1a-6776-47b4-bbfc-bb8cd4a61152",
+ "operation": "INSTANTIATE",
+ "isAutomaticInvocation": "False",
+ "operationParams": {
+ "additionalParamForNs": {
+ "sdncontroller": "e8bd9e9e-70f4-4893-b75c-9cd3fe161eab",
+ "location": "OCOMP-hiofn_RegionOne"
+ }
+ },
+ "isCancelPending": "False",
+ "cancelMode": null,
+ "error": null,
+ "resourceChanges": null,
+ "_links": {
+ "self": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/1aa6afe6-035a-47f0-a14d-7b63e00424f4"
+ },
+ "nsInstance": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_instances/18c8be1a-6776-47b4-bbfc-bb8cd4a61152"
+ },
+ "retry": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/1aa6afe6-035a-47f0-a14d-7b63e00424f4/retry"
+ },
+ "rollback": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/1aa6afe6-035a-47f0-a14d-7b63e00424f4/rollback"
+ },
+ "continue": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/1aa6afe6-035a-47f0-a14d-7b63e00424f4/continue"
+ },
+ "fail": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/1aa6afe6-035a-47f0-a14d-7b63e00424f4/fail"
+ },
+ "cancel": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/1aa6afe6-035a-47f0-a14d-7b63e00424f4/cancel"
+ }
+ }
+ },
+ {
+ "id": "7bb94926-cf28-487e-a40d-1cdc90d14abe",
+ "operationState": "COMPLETED",
+ "stateEnteredTime": "2020-04-20 10:36:12",
+ "startTime": "2020-04-20 10:35:03",
+ "nsInstanceId": "1a68a79b-e1b6-47d3-9655-b8e4afb5f4f7",
+ "operation": "INSTANTIATE",
+ "isAutomaticInvocation": "False",
+ "operationParams": {
+ "additionalParamForNs": {
+ "sdncontroller": "58e5c86b-7f07-487d-a507-b123a245e37d",
+ "location": "OCOMP-rsnbf_RegionOne"
+ }
+ },
+ "isCancelPending": "False",
+ "cancelMode": null,
+ "error": null,
+ "resourceChanges": null,
+ "_links": {
+ "self": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/7bb94926-cf28-487e-a40d-1cdc90d14abe"
+ },
+ "nsInstance": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_instances/1a68a79b-e1b6-47d3-9655-b8e4afb5f4f7"
+ },
+ "retry": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/7bb94926-cf28-487e-a40d-1cdc90d14abe/retry"
+ },
+ "rollback": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/7bb94926-cf28-487e-a40d-1cdc90d14abe/rollback"
+ },
+ "continue": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/7bb94926-cf28-487e-a40d-1cdc90d14abe/continue"
+ },
+ "fail": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/7bb94926-cf28-487e-a40d-1cdc90d14abe/fail"
+ },
+ "cancel": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/7bb94926-cf28-487e-a40d-1cdc90d14abe/cancel"
+ }
+ }
+ },
+ {
+ "id": "816cf68f-56f2-423b-8fb4-aae5b96f3908",
+ "operationState": "COMPLETED",
+ "stateEnteredTime": "2020-04-20 10:50:23",
+ "startTime": "2020-04-20 10:48:51",
+ "nsInstanceId": "b7609865-9212-4ab0-a390-c192ffce751c",
+ "operation": "INSTANTIATE",
+ "isAutomaticInvocation": "False",
+ "operationParams": {
+ "additionalParamForNs": {
+ "sdncontroller": "ac2906fe-8304-4db6-9678-1ff392884d75",
+ "location": "OCOMP-tmlfq_RegionOne"
+ }
+ },
+ "isCancelPending": "False",
+ "cancelMode": null,
+ "error": null,
+ "resourceChanges": null,
+ "_links": {
+ "self": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/816cf68f-56f2-423b-8fb4-aae5b96f3908"
+ },
+ "nsInstance": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_instances/b7609865-9212-4ab0-a390-c192ffce751c"
+ },
+ "retry": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/816cf68f-56f2-423b-8fb4-aae5b96f3908/retry"
+ },
+ "rollback": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/816cf68f-56f2-423b-8fb4-aae5b96f3908/rollback"
+ },
+ "continue": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/816cf68f-56f2-423b-8fb4-aae5b96f3908/continue"
+ },
+ "fail": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/816cf68f-56f2-423b-8fb4-aae5b96f3908/fail"
+ },
+ "cancel": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/816cf68f-56f2-423b-8fb4-aae5b96f3908/cancel"
+ }
+ }
+ },
+ {
+ "id": "cc2180c2-52c0-41fa-8ae1-a3b54142cc95",
+ "operationState": "COMPLETED",
+ "stateEnteredTime": "2020-04-20 11:08:15",
+ "startTime": "2020-04-20 11:06:53",
+ "nsInstanceId": "deccc3a8-3f90-4801-b43a-8eccbadce8f2",
+ "operation": "INSTANTIATE",
+ "isAutomaticInvocation": "False",
+ "operationParams": {
+ "additionalParamForNs": {
+ "sdncontroller": "56c16600-4aae-4680-ba1b-6acfc8f8b27f",
+ "location": "OCOMP-pvjzk_RegionOne"
+ }
+ },
+ "isCancelPending": "False",
+ "cancelMode": null,
+ "error": null,
+ "resourceChanges": null,
+ "_links": {
+ "self": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/cc2180c2-52c0-41fa-8ae1-a3b54142cc95"
+ },
+ "nsInstance": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_instances/deccc3a8-3f90-4801-b43a-8eccbadce8f2"
+ },
+ "retry": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/cc2180c2-52c0-41fa-8ae1-a3b54142cc95/retry"
+ },
+ "rollback": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/cc2180c2-52c0-41fa-8ae1-a3b54142cc95/rollback"
+ },
+ "continue": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/cc2180c2-52c0-41fa-8ae1-a3b54142cc95/continue"
+ },
+ "fail": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/cc2180c2-52c0-41fa-8ae1-a3b54142cc95/fail"
+ },
+ "cancel": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/cc2180c2-52c0-41fa-8ae1-a3b54142cc95/cancel"
+ }
+ }
+ },
+ {
+ "id": "f3a5e32e-22e9-4f23-b881-59c0360af22f",
+ "operationState": "COMPLETED",
+ "stateEnteredTime": "2020-04-20 10:41:05",
+ "startTime": "2020-04-20 10:39:59",
+ "nsInstanceId": "1a68a79b-e1b6-47d3-9655-b8e4afb5f4f7",
+ "operation": "TERMINATE",
+ "isAutomaticInvocation": "False",
+ "operationParams": {
+ "gracefulTerminationTimeout": 60000,
+ "terminationType": "FORCEFUL"
+ },
+ "isCancelPending": "False",
+ "cancelMode": null,
+ "error": null,
+ "resourceChanges": null,
+ "_links": {
+ "self": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/f3a5e32e-22e9-4f23-b881-59c0360af22f"
+ },
+ "nsInstance": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_instances/1a68a79b-e1b6-47d3-9655-b8e4afb5f4f7"
+ },
+ "retry": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/f3a5e32e-22e9-4f23-b881-59c0360af22f/retry"
+ },
+ "rollback": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/f3a5e32e-22e9-4f23-b881-59c0360af22f/rollback"
+ },
+ "continue": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/f3a5e32e-22e9-4f23-b881-59c0360af22f/continue"
+ },
+ "fail": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/f3a5e32e-22e9-4f23-b881-59c0360af22f/fail"
+ },
+ "cancel": {
+ "href": "http://msb-iag:80/api/nslcm/v1/ns_lcm_op_occs/f3a5e32e-22e9-4f23-b881-59c0360af22f/cancel"
+ }
+ }
+ }
+ ]
+ }
+} ]
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-query-multinslcmopoccs-schema-sample.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-query-multinslcmopoccs-schema-sample.yaml
new file mode 100644
index 00000000..1a114655
--- /dev/null
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-sample/nslcm/vfc-nslcm-query-multinslcmopoccs-schema-sample.yaml
@@ -0,0 +1,22 @@
+open_cli_sample_version: 1.0
+name: vfc-nslcm-query-multinslcmopoccs
+version: onap-dublin
+samples:
+ sample1:
+ name: vfc-nslcm-query-multinslcmopoccs
+ input: -m http://10.12.5.155:30280
+ moco: vfc-nslcm-query-multinslcmopoccs-schema-moco.json
+ output: |
+ +--------------------------------------+--------------------+--------------------------------------+--------------------+----------------------+
+ |nslcm-opocc-id |ns-operation-state |ns-instance-id |lcm-operation-type |state-entered-time |
+ +--------------------------------------+--------------------+--------------------------------------+--------------------+----------------------+
+ |1aa6afe6-035a-47f0-a14d-7b63e00424f4 |COMPLETED |18c8be1a-6776-47b4-bbfc-bb8cd4a61152 |INSTANTIATE |2020-04-20 09:59:59 |
+ +--------------------------------------+--------------------+--------------------------------------+--------------------+----------------------+
+ |7bb94926-cf28-487e-a40d-1cdc90d14abe |COMPLETED |1a68a79b-e1b6-47d3-9655-b8e4afb5f4f7 |INSTANTIATE |2020-04-20 10:36:12 |
+ +--------------------------------------+--------------------+--------------------------------------+--------------------+----------------------+
+ |816cf68f-56f2-423b-8fb4-aae5b96f3908 |COMPLETED |b7609865-9212-4ab0-a390-c192ffce751c |INSTANTIATE |2020-04-20 10:50:23 |
+ +--------------------------------------+--------------------+--------------------------------------+--------------------+----------------------+
+ |cc2180c2-52c0-41fa-8ae1-a3b54142cc95 |COMPLETED |deccc3a8-3f90-4801-b43a-8eccbadce8f2 |INSTANTIATE |2020-04-20 11:08:15 |
+ +--------------------------------------+--------------------+--------------------------------------+--------------------+----------------------+
+ |f3a5e32e-22e9-4f23-b881-59c0360af22f |COMPLETED |1a68a79b-e1b6-47d3-9655-b8e4afb5f4f7 |TERMINATE |2020-04-20 10:41:05 |
+ +--------------------------------------+--------------------+--------------------------------------+--------------------+----------------------+
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-get-ns-descriptors-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-get-ns-descriptors-schema.yaml
index e0036a8f..dbb14e4f 100644
--- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-get-ns-descriptors-schema.yaml
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/catalog/vfc-catalog-get-ns-descriptors-schema.yaml
@@ -32,6 +32,10 @@ parameters:
results:
direction: landscape
attributes:
+ - name: id
+ description: ns package id
+ scope: short
+ type: string
- name: nsd-info-id
description: nsd-info-id
scope: short
@@ -40,25 +44,25 @@ results:
description: nsd-name
scope: short
type: string
- - name: nsd-description
- description: nsd-description
+ - name: nsd-onboarding-state
+ description: nsd-onboarding-state
scope: short
type: string
- - name: ns-package-id
- description: ns-package-id
+ - name: vnf-package-ids
+ description: vnf-package-ids
scope: short
- type: string
- - name: sdc-csar-id
- description: sdc-csar-id
+ type: array
+ - name: pnf-package-ids
+ description: pnf-package-ids
scope: short
- type: string
+ type: array
http:
service:
auth: none
mode: direct
request:
- uri: api/nsd/v1/ns_descriptors/${nsd-info-id}
+ uri: /api/nsd/v1/ns_descriptors/${nsd-info-id}
method: GET
context:
remove_empty_node: true
@@ -69,8 +73,9 @@ http:
success_codes:
- 200
result_map:
+ id: $b{$.id}
nsd-info-id: $b{$.nsdId}
nsd-name: $b{$.nsdName}
- nsd-description: $b{$.nsdDescription}
- ns-package-id: $b{$.nsPackageId}
- sdc-csar-id: $b{$.sdcCsarId }
+ nsd-onboarding-state: $b{$.nsdOnboardingState}
+ vnf-package-ids: $b{$.vnfPkgIds}
+ pnf-package-ids: $b{$.pnfdInfoIds}
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-get-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-get-schema.yaml
index 984a1dc7..b17a45fa 100644
--- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-get-schema.yaml
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-get-schema.yaml
@@ -22,7 +22,7 @@ info:
author: ONAP HPA Integration Team (haibin.huang@intel.com)
results:
- direction: portrait
+ direction: landscape
attributes:
- name: ns-instance-id
description: ns-instance-id
@@ -57,7 +57,7 @@ http:
success_codes:
- 200
result_map:
- ns-instance-id: $b{$.nsInstanceId}
- ns-name: $b{$.nsName}
- description: $b{$.description}
- nsd-id: $b{$.nsdId}
+ ns-instance-id: $b{$.[*].nsInstanceId}
+ ns-name: $b{$.[*].nsName}
+ description: $b{$.[*].description}
+ nsd-id: $b{$.[*].nsdId} \ No newline at end of file
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-query-multinslcmopoccs.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-query-multinslcmopoccs.yaml
index 3634a714..ccf3ed62 100644
--- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-query-multinslcmopoccs.yaml
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-query-multinslcmopoccs.yaml
@@ -19,14 +19,14 @@ info:
author: ONAP VFC Team (yangyanyj@chinamobile.com)
results:
- direction: portrait
+ direction: landscape
attributes:
- name: nslcm-opocc-id
description: nslcm-opocc-id
scope: short
type: string
- - name: operation-state
- description: operation-state
+ - name: ns-operation-state
+ description: ns-operation-state
scope: short
type: string
- name: ns-instance-id
@@ -37,8 +37,8 @@ results:
description: lcm-operation-type
scope: short
type: string
- - name: status-entered-time
- description: status-entered-time
+ - name: state-entered-time
+ description: state-entered-time
scope: short
type: string
@@ -47,19 +47,18 @@ http:
auth: none
mode: direct
request:
- uri: api/nslcm/v1/ns_lcm_op_occs
+ uri: /api/nslcm/v1/ns_lcm_op_occs
method: GET
- context:
- remove_empty_node: true
- body: '{}'
headers:
Content-Type: application/json
Accept: application/json
+
success_codes:
- 200
+
result_map:
- nslcm-opocc-id: $b{$.nslcmOpoccId}
- ns-operation-state: $b{$.operationState}
- ns-instance-id: $b{$.nsInstanceId}
- lcm-operation-type-id: $b{$.lcmOperationType}
- status-entered-time: $b{$.statusEnteredTime}
+ nslcm-opocc-id: $b{$.[*].id}
+ ns-operation-state: $b{$.[*].operationState}
+ ns-instance-id: $b{$.[*].nsInstanceId}
+ lcm-operation-type: $b{$.[*].operation}
+ state-entered-time: $b{$.[*].stateEnteredTime}
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-create-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-create-schema.yaml
index fde5fc17..0b6dd99f 100644
--- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-create-schema.yaml
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-create-schema.yaml
@@ -60,7 +60,7 @@ http:
auth: none
mode: direct
request:
- uri: api/nslcm/v1/ns_instances
+ uri: /api/nslcm/v1/ns_instances
method: POST
context:
remove_empty_node: true
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-delete-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-delete-schema.yaml
index 1d131cd0..7ede7160 100644
--- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-delete-schema.yaml
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-delete-schema.yaml
@@ -33,7 +33,7 @@ http:
auth: none
mode: direct
request:
- uri: api/nslcm/v1/ns_instances/${ns-instance-id}
+ uri: /api/nslcm/v1/ns_instances/${ns-instance-id}
method: DELETE
context:
remove_empty_node: true
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-get-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-get-schema.yaml
index 00cb8f5e..bb83ed85 100644
--- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-get-schema.yaml
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-get-schema.yaml
@@ -22,7 +22,7 @@ info:
author: ONAP VFC Team (yangyanyj@chinamobile.com)
results:
- direction: portrait
+ direction: landscape
attributes:
- name: ns-instance-id
description: ns-instance-id
@@ -46,7 +46,7 @@ http:
auth: none
mode: direct
request:
- uri: api/nslcm/v1/ns_instances
+ uri: /api/nslcm/v1/ns_instances
method: GET
context:
remove_empty_node: true
@@ -57,7 +57,7 @@ http:
success_codes:
- 200
result_map:
- ns-instance-id: $b{$.nsInstanceId}
- ns-name: $b{$.nsName}
- description: $b{$.description}
- nsd-id: $b{$.nsdId}
+ ns-instance-id: $b{$.[*].id}
+ ns-name: $b{$.[*].nsInstanceName}
+ description: $b{$.[*].nsInstanceDescription}
+ nsd-id: $b{$.[*].nsdId}
diff --git a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-instantiate-schema.yaml b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-instantiate-schema.yaml
index d6738186..43eb7755 100644
--- a/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-instantiate-schema.yaml
+++ b/products/onap-dublin/features/vfc/src/main/resources/open-cli-schema/nslcm/vfc-nslcm-sol005-instantiate-schema.yaml
@@ -54,7 +54,7 @@ http:
auth: none
mode: direct
request:
- uri: api/nslcm/v1/ns_instances/${ns-instance-id}/instantiate
+ uri: /api/nslcm/v1/ns_instances/${ns-instance-id}/instantiate
method: POST
context:
remove_empty_node: true