diff options
Diffstat (limited to 'plugins')
8 files changed, 127 insertions, 43 deletions
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-create-schema-1.1.yaml index efe28eec..2c6c0636 100644 --- a/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-create-schema-1.1.yaml +++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-create-schema-1.1.yaml @@ -70,7 +70,7 @@ parameters: http: request: - uri: /aai/v11/external-system/esr-ems-list/esr-ems/{ems-id} + uri: /aai/v11/external-system/esr-ems-list/esr-ems/${ems-id} method: PUT body: '{"ems-id":"${ems-id}","passive":true,"remote-path":"${remote-path}","esr-system-info-list":{"esr-system-info":[{"esr-system-info-id":"${ems-id}","system-name":"${name}","type":"${type}","vendor":"${vendor}","version":"${ems-version}","service-url":"${url}","user-name":"${username}","password":"${password}","system-type":"ems","protocal":"","ssl-cacert":"","ssl-insecure":"","ip-address":"","port":"","cloud-domain":"","default-tenant":""}]}}' success_codes: diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-delete-schema-1.1.yaml index dbbe7ecd..45ffd35b 100644 --- a/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-delete-schema-1.1.yaml +++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-delete-schema-1.1.yaml @@ -19,14 +19,19 @@ parameters: short_option: x long_option: ems-id is_optional: false - + - name: resource-version + description: Onap vim resource version + type: uuid + short_option: y + long_option: resource-version + is_optional: true http: request: - uri: /aai/v11/external-system/esr-ems-list/esr-ems/{ems-id} + uri: /aai/v11/external-system/esr-ems-list/esr-ems/${ems-id}?resource-version=${resource-version} method: DELETE success_codes: - - 201 + - 204 - 404 sample_response: diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-list-schema-1.1.yaml index 91ba7ebb..4facacb7 100644 --- a/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-list-schema-1.1.yaml +++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-list-schema-1.1.yaml @@ -19,34 +19,6 @@ results: description: Onap ems id scope: short type: string - - name: name - description: Onap ems name - scope: short - type: string - - name: type - description: Onap ems type - scope: short - type: string - - name: vendor - description: Onap ems vendor - scope: short - type: string - - name: version - description: Onap ems version - scope: short - type: string - - name: url - description: Onap ems url - scope: short - type: string - - name: username - description: Onap ems username - scope: long - type: string - - name: remote-path - description: Onap ems remote-path - scope: short - type: string - name: resource-version description: Onap ems resource version scope: short @@ -59,17 +31,15 @@ http: success_codes: - 200 result_map: - ems-id: $b{$.esr-ems.[*].ems-id - name: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].system-name - type: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].type - vendor: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].vendor - version: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].version - url: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].service-url - username: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].user-name - remote-path: $b{$.esr-ems.[*].remote-path - resource-version: $b{$.esr-ems.[*].resource-version + ems-id: $b{$.esr-ems.[*].ems-id} + name: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].system-name} + type: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].type} + vendor: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].vendor} + version: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].version} + url: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].service-url} + username: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].user-name} + remote-path: $b{$.esr-ems.[*].remote-path} + resource-version: $b{$.esr-ems.[*].resource-version} sample_response: body: '{"esr-ems":[{"ems-id":"example-ems-id-val-36878","passive":true,"remote-path":"example-remotepath-val-80493","esr-system-info-list":{"esr-system-info":[{"esr-system-info-id":"example-esr-system-info-id-val-44791","system-name":"example-system-name-val-48687","type":"example-type-val-95885","vendor":"example-vendor-val-41061","version":"example-version-val-38559","service-url":"example-service-url-val-2663","user-name":"example-user-name-val-26126","password":"example-password-val-33838","system-type":"ems","protocal":"","ssl-cacert":"","ssl-insecure":false,"ip-address":"","port":"","cloud-domain":"","default-tenant":""}]}}]}' - - diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-show-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-show-schema-1.1.yaml new file mode 100644 index 00000000..c03a75bd --- /dev/null +++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-show-schema-1.1.yaml @@ -0,0 +1,66 @@ +open_cli_schema_version: 1.0 + +name: ems-show + +description: Show the details of configured ems + +version: onap-1.1 + +service: + name: aai + version: v11 + auth: basic + mode: direct + +parameters: + - name: ems-id + description: Onap EMS unique id + type: uuid + short_option: x + long_option: ems-id + is_optional: false + +results: + direction: landscape + attributes: + - name: name + description: Onap ems name + scope: short + type: string + - name: type + description: Onap ems type + scope: short + type: string + - name: vendor + description: Onap ems vendor + scope: short + type: string + - name: version + description: Onap ems version + scope: short + type: string + - name: url + description: Onap ems url + scope: short + type: string + - name: username + description: Onap ems username + scope: long + type: string + +http: + request: + uri: /aai/v11/external-system/esr-ems-list/esr-ems/${ems-id}/esr-system-info-list/esr-system-info/${ems-id} + method: GET + success_codes: + - 200 + result_map: + name: $b{$.system-name} + type: $b{$.type} + vendor: $b{$.vendor} + version: $b{$.version} + url: $b{$.service-url} + username: $b{$.user-name} + + sample_response: + body: '{"esr-system-info-id":"example-esr-system-info-id-val-44791","system-name":"example-system-name-val-48687","type":"example-type-val-95885","vendor":"example-vendor-val-41061","version":"example-version-val-38559","service-url":"example-service-url-val-2663","user-name":"example-user-name-val-26126","password":"example-password-val-33838","system-type":"ems","protocal":"","ssl-cacert":"","ssl-insecure":false,"ip-address":"","port":"","cloud-domain":"","default-tenant":""}' diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-sample-1.1.yaml new file mode 100644 index 00000000..2856ba62 --- /dev/null +++ b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-sample-1.1.yaml @@ -0,0 +1,8 @@ +onap_cli_sample_version: 1.0 + +name: ems-register +version: onap-1.1 +samples: + sample1: + name: Create a ems + input: -z f962fa1e-d439-4b02-a122-cc38fd0da07c -b ems-1 -c OpenStack -e HW -q 1.0 -g http://locahost -i user -j password -x remote-path -d diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-sample-1.1.yaml new file mode 100644 index 00000000..99a92785 --- /dev/null +++ b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-sample-1.1.yaml @@ -0,0 +1,8 @@ +onap_cli_sample_version: 1.0 + +name: ems-unregister +version: onap-1.1 +samples: + sample1: + name: Delete the ems + input: -x f962fa1e-d439-4b02-a122-cc38fd0da07c -y 1505298922586 diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-sample-1.1.yaml new file mode 100644 index 00000000..88997812 --- /dev/null +++ b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-sample-1.1.yaml @@ -0,0 +1,13 @@ +onap_cli_sample_version: 1.0 + +name: ems-list +version: onap-1.1 +samples: + sample1: + name: List all ems + output: | + +--------------------------------------+------------------+ + |ems-id |resource-version | + +--------------------------------------+------------------+ + |f962fa1e-d439-4b02-a122-cc38fd0da07c |1505298922586 | + +--------------------------------------+------------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-sample-1.1.yaml new file mode 100644 index 00000000..e11753ac --- /dev/null +++ b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-sample-1.1.yaml @@ -0,0 +1,14 @@ +onap_cli_sample_version: 1.0 + +name: ems-show +version: onap-1.1 +samples: + sample1: + name: Show the ems + input: -x f962fa1e-d439-4b02-a122-cc38fd0da07c -y 1505298922586 + output: | + +--------+------------+--------+----------+------------------+ + |name |type |vendor |version |url | + +--------+------------+--------+----------+------------------+ + |ems-1 |OpenStack |HW |1.0 |http://locahost | + +--------+------------+--------+----------+------------------+ |