From 9a7c3f58efc9a4fcff5052700457cf6f7565cf39 Mon Sep 17 00:00:00 2001 From: Kanagaraj Manickam k00365106 Date: Tue, 14 Nov 2017 11:50:31 +0530 Subject: Merges from 1.1.0 Issue-Id: CLI-66 Change-Id: I89fde334e2425eb91630912d726c320ece4aebd6 Signed-off-by: Kanagaraj Manickam k00365106 --- .../service-instance/service-list-schema-1.1.yaml | 62 ------- .../service-instance/vf-list-schema-1.1.yaml | 53 ------ .../service-instance/vf-show-schema-1.1.yaml | 64 ------- .../cloud-region/cloud-create-schema-1.1-moco.json | 24 --- .../cloud-create-schema-1.1-sample.yaml | 10 - .../cloud-region/cloud-delete-schema-1.1-moco.json | 18 -- .../cloud-delete-schema-1.1-sample.yaml | 10 - .../cloud-region/cloud-list-schema-1.1-moco.json | 34 ---- .../cloud-region/cloud-list-schema-1.1-sample.yaml | 16 -- .../customer/customer-create-schema-1.1-moco.json | 22 --- .../customer-create-schema-1.1-sample.yaml | 10 - .../customer/customer-delete-schema-1.1-moco.json | 18 -- .../customer-delete-schema-1.1-sample.yaml | 10 - .../customer/customer-list-schema-1.1-moco.json | 35 ---- .../customer/customer-list-schema-1.1-sample.yaml | 18 -- .../customer/customer-show-schema-1.1-moco.json | 23 --- .../customer/customer-show-schema-1.1-sample.yaml | 14 -- .../esr/ems/ems-create-schema-1.1-moco.json | 42 ----- .../esr/ems/ems-create-schema-1.1-sample.yaml | 9 - .../esr/ems/ems-delete-schema-1.1-moco.json | 18 -- .../esr/ems/ems-delete-schema-1.1-sample.yaml | 9 - .../esr/ems/ems-list-schema-1.1-moco.json | 23 --- .../esr/ems/ems-list-schema-1.1-sample.yaml | 14 -- .../esr/ems/ems-show-schema-1.1-moco.json | 35 ---- .../esr/ems/ems-show-schema-1.1-sample.yaml | 14 -- .../esr/vim/vim-create-schema-1.1-moco.json | 35 ---- .../esr/vim/vim-create-schema-1.1-sample.yaml | 9 - .../esr/vim/vim-delete-schema-1.1-moco.json | 18 -- .../esr/vim/vim-delete-schema-1.1-sample.yaml | 9 - .../esr/vim/vim-list-schema-1.1-moco.json | 54 ------ .../esr/vim/vim-list-schema-1.1-sample.yaml | 16 -- .../esr/vnfm/vnfm-create-schema-1.1-moco.json | 42 ----- .../esr/vnfm/vnfm-create-schema-1.1-sample.yaml | 9 - .../esr/vnfm/vnfm-delete-schema-1.1-moco.json | 18 -- .../esr/vnfm/vnfm-delete-schema-1.1-sample.yaml | 9 - .../esr/vnfm/vnfm-list-schema-1.1-moco.json | 25 --- .../esr/vnfm/vnfm-list-schema-1.1-sample.yaml | 14 -- .../esr/vnfm/vnfm-show-schema-1.1-moco.json | 35 ---- .../esr/vnfm/vnfm-show-schema-1.1-sample.yaml | 22 --- .../service-list-schema-1.1-moco.json | 205 --------------------- .../service-list-schema-1.1-sample.yaml | 36 ---- .../service-instance/vf-list-schema-1.1-moco.json | 137 -------------- .../vf-list-schema-1.1-sample.yaml | 32 ---- .../service-instance/vf-show-schema-1.1-moco.json | 55 ------ .../vf-show-schema-1.1-sample.yaml | 26 --- .../service-type-create-schema-1.1-moco.json | 21 --- .../service-type-create-schema-1.1-sample.yaml | 9 - .../service-type-delete-schema-1.1-moco.json | 18 -- .../service-type-delete-schema-1.1-sample.yaml | 9 - .../service-type-list-schema-1.1-moco.json | 44 ----- .../service-type-list-schema-1.1-sample.yaml | 24 --- .../subscription-create-schema-1.1-moco.json | 35 ---- .../subscription-create-schema-1.1-sample.yaml | 9 - .../subscription-delete-schema-1.1-moco.json | 18 -- .../subscription-delete-schema-1.1-sample.yaml | 9 - .../subscription-list-schema-1.1-moco.json | 43 ----- .../subscription-list-schema-1.1-sample.yaml | 14 -- 57 files changed, 1664 deletions(-) delete mode 100644 plugins/aai/src/main/resources/onap-cli-schema/service-instance/service-list-schema-1.1.yaml delete mode 100644 plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-list-schema-1.1.yaml delete mode 100644 plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-show-schema-1.1.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-create-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-delete-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-create-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/service-instance/service-list-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/service-instance/service-list-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-moco.json delete mode 100644 plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml (limited to 'plugins/aai') diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-instance/service-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-instance/service-list-schema-1.1.yaml deleted file mode 100644 index 3e5dcc65..00000000 --- a/plugins/aai/src/main/resources/onap-cli-schema/service-instance/service-list-schema-1.1.yaml +++ /dev/null @@ -1,62 +0,0 @@ -open_cli_schema_version: 1.0 -name: service-list -description: List created service instance -version: onap-1.1 -service: - name: aai - version: v11 - auth: basic - mode: direct - -parameters: - - name: customer-name - description: customer name - type: string - short_option: x - long_option: customer-name - is_optional: false - - name: service-type - description: service subscription type - type: string - short_option: y - long_option: service-type - is_optional: false - -results: - direction: landscape - attributes: - - name: service-id - description: instance id of service - scope: short - type: string - - name: service-name - description: Service name - scope: short - type: string - - name: model-invariant-id - description: Model invariant id of service model - scope: long - type: string - - name: model-uuid - description: Model uuid for service model - scope: long - type: string - - name: description - description: service description - scope: long - type: string - -http: - request: - uri: /aai/v11/business/customers/customer/${customer-name}/service-subscriptions/service-subscription/${service-type}/service-instances - method: GET - success_codes: - - 200 - result_map: - service-id: $b{service-instance.[*].service-instance-id} - service-name: $b{service-instance.[*].service-instance-name} - model-invariant-id: $b{service-instance.[*].model-invariant-id} - model-uuid: $b{service-instance.[*].model-version-id} - description: $b{service-instance.[*].description} - sample_response: - body: '{"service-instance": [{"service-instance-id": "${service-id}","service-instance-name": "${service-name}","description": "${description}","model-invariant-id": "${model-invariant-id}","model-version-id": "${model-uuid}"}]}' diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-list-schema-1.1.yaml deleted file mode 100644 index b29f5d0f..00000000 --- a/plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-list-schema-1.1.yaml +++ /dev/null @@ -1,53 +0,0 @@ -open_cli_schema_version: 1.0 -name: vf-list -description: List created VF instances for a service instance -version: onap-1.1 -service: - name: aai - version: v11 - auth: basic - mode: direct - -parameters: - - name: customer-name - description: customer name - type: string - short_option: x - long_option: customer-name - is_optional: false - - name: service-type - description: service subscription type - type: string - short_option: y - long_option: service-type - is_optional: false - - name: service-id - description: service ID - type: string - short_option: z - long_option: service-id - is_optional: false - -results: - direction: landscape - attributes: - - name: vf-id - description: VF ID for the given service - scope: short - type: string - - name: vf-name - description: VF name - scope: short - type: string - -http: - request: - uri: /aai/v11/business/customers/customer/${customer-name}/service-subscriptions/service-subscription/${service-type}/service-instances/service-instance/${service-id} - method: GET - success_codes: - - 200 - result_map: - vf-id: $b{relationship-list.relationship.[*].relationship-data[?(@.relationship-key=='generic-vnf.vnf-id')].relationship-value} - vf-name: $b{relationship-list.relationship.[*].related-to-property.[?(@.property-key == 'generic-vnf.vnf-name')].property-value} - sample_response: - body: '{"service-instance": [{"service-instance-id": "${service-id}","service-instance-name": "${service-name}","description": "${description}","model-invariant-id": "${model-invariant-id}","model-version-id": "${model-uuid}"}]}' diff --git a/plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-show-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-show-schema-1.1.yaml deleted file mode 100644 index 01cb9bd4..00000000 --- a/plugins/aai/src/main/resources/onap-cli-schema/service-instance/vf-show-schema-1.1.yaml +++ /dev/null @@ -1,64 +0,0 @@ -open_cli_schema_version: 1.0 -name: vf-show -description: Show details for VF -version: onap-1.1 -service: - name: aai - version: v11 - auth: basic - mode: direct - -parameters: - - name: vf-id - description: VF identifier - type: string - short_option: x - long_option: vf-id - is_optional: false - -results: - direction: portrait - attributes: - - name: vf-id - description: VF ID for the given service - scope: short - type: string - - name: vf-name - description: VF name - scope: short - type: string - - name: vf-type - description: VF name - scope: short - type: string - - name: model-invariant-id - description: VF name - scope: short - type: string - - name: model-uuid - description: model uuid - scope: short - type: string - - name: model-customization-id - description: Model customization id - scope: short - type: string - - name: service-id - description: Service ID of parent service - scope: short - type: string - -http: - request: - uri: /aai/v11/network/generic-vnfs/generic-vnf/${vf-id} - method: GET - success_codes: - - 200 - result_map: - vf-id: $b{vnf-id} - vf-name: $b{vnf-name} - vf-type: $b{vnf-type} - model-invariant-id: $b{model-invariant-id} - model-uuid: $b{model-version-id} - model-customization-id: $b{model-customization-id} - service-id: $b{$.relationship-list.relationship.[*].relationship-data.[?(@.relationship-key=='service-instance.service-instance-id')].relationship-value} \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json deleted file mode 100644 index 223ebd26..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json +++ /dev/null @@ -1,24 +0,0 @@ -[ { - "request" : { - "method" : "put", - "uri" : "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-63eebfa7-ebdb-4707-9208-a159d2f53c6e", - "Content-Type" : "application/json" - }, - "json" : { - "sriov-automation" : false, - "cloud-region-id" : "bangalore", - "cloud-owner" : "huawei-cloud", - "new-attribute-for-demo" : "blah", - "number-attribute-for-demo" : 1 - } - }, - "response" : { - "status" : 201, - "json" : null - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml deleted file mode 100644 index 9c64395d..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml +++ /dev/null @@ -1,10 +0,0 @@ -onap_cli_sample_version: 1.0 -name: cloud-create -version: onap-1.1 -samples: - sample1: - name: cloud-create - input: --cloud-name huawei-cloud --region-name bangalore - moco: cloud-create-schema-1.1-moco.json - output: | - diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json deleted file mode 100644 index 85094a9d..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json +++ /dev/null @@ -1,18 +0,0 @@ -[ { - "request" : { - "method" : "delete", - "uri" : "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud-test/bangalore-test", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-2d7993c7-9355-435a-a0d7-2f8aa02bf9a6", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 204, - "json" : null - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml deleted file mode 100644 index a61523a3..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml +++ /dev/null @@ -1,10 +0,0 @@ -onap_cli_sample_version: 1.0 -name: cloud-delete -version: onap-1.1 -samples: - sample1: - name: cloud-delete - input: --cloud-name huawei-cloud-test --region-name bangalore-test --resource-version 1509027982352 - moco: cloud-delete-schema-1.1-moco.json - output: | - diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json deleted file mode 100644 index 2e5b1db0..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json +++ /dev/null @@ -1,34 +0,0 @@ -[ { - "request" : { - "method" : "get", - "uri" : "/aai/v11/cloud-infrastructure/cloud-regions", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-77c08aa0-662e-4d32-9206-bd569c3bf61b", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 200, - "json" : { - "cloud-region" : [ { - "cloud-owner" : "huawei-cloud", - "cloud-region-id" : "bangalore", - "sriov-automation" : false, - "resource-version" : "1509027332165" - }, { - "cloud-owner" : "Rackspace", - "cloud-region-id" : "RegionOne", - "cloud-type" : "SharedNode", - "owner-defined-type" : "OwnerType", - "cloud-region-version" : "v1", - "cloud-zone" : "CloudZone", - "sriov-automation" : false, - "resource-version" : "1508827902543" - } ] - } - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml deleted file mode 100644 index 00342b23..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml +++ /dev/null @@ -1,16 +0,0 @@ -onap_cli_sample_version: 1.0 -name: cloud-list -version: onap-1.1 -samples: - sample1: - name: cloud-list - input: - moco: cloud-list-schema-1.1-moco.json - output: | - +--------------+------------+------------------+ - |cloud |region |resource-version | - +--------------+------------+------------------+ - |huawei-cloud |bangalore |1509027332165 | - +--------------+------------+------------------+ - |Rackspace |RegionOne |1508827902543 | - +--------------+------------+------------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-moco.json deleted file mode 100644 index 18bb05d7..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-moco.json +++ /dev/null @@ -1,22 +0,0 @@ -[ { - "request" : { - "method" : "put", - "uri" : "/aai/v11/business/customers/customer/test", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-9ad55bff-efbb-4306-bc8a-b76687e8e065", - "Content-Type" : "application/json" - }, - "json" : { - "global-customer-id" : "test", - "subscriber-name" : "test", - "subscriber-type" : "INFRA" - } - }, - "response" : { - "status" : 201, - "json" : null - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-sample.yaml deleted file mode 100644 index 72273417..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-sample.yaml +++ /dev/null @@ -1,10 +0,0 @@ -onap_cli_sample_version: 1.0 -name: customer-create -version: onap-1.1 -samples: - sample1: - name: customer-create - input: --customer-name test --subscriber-name test - moco: customer-create-schema-1.1-moco.json - output: | - diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-moco.json deleted file mode 100644 index 26e8a918..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-moco.json +++ /dev/null @@ -1,18 +0,0 @@ -[ { - "request" : { - "method" : "delete", - "uri" : "/aai/v11/business/customers/customer/test", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-5f5bb7d0-5d03-42a3-a24f-fd8d125a7a8e", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 204, - "json" : null - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-sample.yaml deleted file mode 100644 index 7e6f0dcb..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-sample.yaml +++ /dev/null @@ -1,10 +0,0 @@ -onap_cli_sample_version: 1.0 -name: customer-delete -version: onap-1.1 -samples: - sample1: - name: customer-delete - input: --customer-name test --resource-version 1509029022293 - moco: customer-delete-schema-1.1-moco.json - output: | - diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-moco.json deleted file mode 100644 index f7737271..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-moco.json +++ /dev/null @@ -1,35 +0,0 @@ -[ { - "request" : { - "method" : "get", - "uri" : "/aai/v11/business/customers", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-f56d4034-1ee8-469c-848a-8b9cd1afa19b", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 200, - "json" : { - "customer" : [ { - "global-customer-id" : "test", - "subscriber-name" : "test", - "subscriber-type" : "INFRA", - "resource-version" : "1509029022293" - }, { - "global-customer-id" : "kanag", - "subscriber-name" : "kanag", - "subscriber-type" : "INFRA", - "resource-version" : "1509029007060" - }, { - "global-customer-id" : "Demonstration", - "subscriber-name" : "Demonstration", - "subscriber-type" : "INFRA", - "resource-version" : "1508827908763" - } ] - } - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-sample.yaml deleted file mode 100644 index 7ff64210..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-sample.yaml +++ /dev/null @@ -1,18 +0,0 @@ -onap_cli_sample_version: 1.0 -name: customer-list -version: onap-1.1 -samples: - sample1: - name: customer-list - input: - moco: customer-list-schema-1.1-moco.json - output: | - +----------------+------------------+ - |name |resource-version | - +----------------+------------------+ - |test |1509029022293 | - +----------------+------------------+ - |kanag |1509029007060 | - +----------------+------------------+ - |Demonstration |1508827908763 | - +----------------+------------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-moco.json deleted file mode 100644 index 242db8c1..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-moco.json +++ /dev/null @@ -1,23 +0,0 @@ -[ { - "request" : { - "method" : "get", - "uri" : "/aai/v11/business/customers/customer/kanag", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-95e5eac5-6839-49f3-8f9e-786789e69c67", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 200, - "json" : { - "global-customer-id" : "kanag", - "subscriber-name" : "kanag", - "subscriber-type" : "INFRA", - "resource-version" : "1509029007060" - } - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-sample.yaml deleted file mode 100644 index 1669ffd2..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-sample.yaml +++ /dev/null @@ -1,14 +0,0 @@ -onap_cli_sample_version: 1.0 -name: customer-show -version: onap-1.1 -samples: - sample1: - name: customer-show - input: --customer-name kanag --long - moco: customer-show-schema-1.1-moco.json - output: | - +--------+------------------+------------------+------------------+ - |name |subscriber-name |resource-version |subscriber-type | - +--------+------------------+------------------+------------------+ - |kanag |kanag |1509029007060 |INFRA | - +--------+------------------+------------------+------------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-moco.json deleted file mode 100644 index d14653f6..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-moco.json +++ /dev/null @@ -1,42 +0,0 @@ -[ { - "request" : { - "method" : "put", - "uri" : "/aai/v11/external-system/esr-ems-list/esr-ems/51a480ed-649c-4c47-a84b-f966dc4f9554", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-8552f11b-5e79-4d98-9e05-ccc4e66c42c0", - "Content-Type" : "application/json" - }, - "json" : { - "ems-id" : "51a480ed-649c-4c47-a84b-f966dc4f9554", - "passive" : true, - "remote-path" : "sample", - "esr-system-info-list" : { - "esr-system-info" : [ { - "esr-system-info-id" : "51a480ed-649c-4c47-a84b-f966dc4f9554", - "system-name" : "ems1", - "type" : "ems", - "vendor" : "boco", - "version" : "1.0", - "service-url" : "http://10.0.0.1", - "user-name" : "admin", - "password" : "password", - "system-type" : "ems", - "protocal" : "", - "ssl-cacert" : "", - "ssl-insecure" : "", - "ip-address" : "", - "port" : "", - "cloud-domain" : "", - "default-tenant" : "" - } ] - } - } - }, - "response" : { - "status" : 201, - "json" : null - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml deleted file mode 100644 index accd0567..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml +++ /dev/null @@ -1,9 +0,0 @@ -onap_cli_sample_version: 1.0 -name: ems-register -version: onap-1.1 -samples: - sample1: - name: ems-register - input: --name ems1 --type ems --vendor boco --ems-version 1.0 --url http://10.0.0.1 --username admin --password password --remote-path sample - moco: ems-create-schema-1.1-moco.json - output: \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json deleted file mode 100644 index c5d12863..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json +++ /dev/null @@ -1,18 +0,0 @@ -[ { - "request" : { - "method" : "delete", - "uri" : "/aai/v11/external-system/esr-ems-list/esr-ems/51a480ed-649c-4c47-a84b-f966dc4f9554", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-d9a77e12-34be-4d8f-b7da-c749dbc3fc8a", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 204, - "json" : null - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml deleted file mode 100644 index df4d080a..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml +++ /dev/null @@ -1,9 +0,0 @@ -onap_cli_sample_version: 1.0 -name: ems-unregister -version: onap-1.1 -samples: - sample1: - name: ems-unregister - input: --ems-id 51a480ed-649c-4c47-a84b-f966dc4f9554 --resource-version 1509095358658 - moco: ems-delete-schema-1.1-moco.json - output: \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-moco.json deleted file mode 100644 index 4a2f1674..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-moco.json +++ /dev/null @@ -1,23 +0,0 @@ -[ { - "request" : { - "method" : "get", - "uri" : "/aai/v11/external-system/esr-ems-list", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-ed3e792b-9436-4ddd-ba76-3684dca3e4cf", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 200, - "json" : { - "esr-ems" : [ { - "ems-id" : "51a480ed-649c-4c47-a84b-f966dc4f9554", - "resource-version" : "1509095358658" - } ] - } - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml deleted file mode 100644 index 174f4541..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml +++ /dev/null @@ -1,14 +0,0 @@ -onap_cli_sample_version: 1.0 -name: ems-list -version: onap-1.1 -samples: - sample1: - name: ems-list - input: - moco: ems-list-schema-1.1-moco.json - output: | - +--------------------------------------+------------------+ - |ems-id |resource-version | - +--------------------------------------+------------------+ - |51a480ed-649c-4c47-a84b-f966dc4f9554 |1509095358658 | - +--------------------------------------+------------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-moco.json deleted file mode 100644 index c9c09f97..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-moco.json +++ /dev/null @@ -1,35 +0,0 @@ -[ { - "request" : { - "method" : "get", - "uri" : "/aai/v11/external-system/esr-ems-list/esr-ems/51a480ed-649c-4c47-a84b-f966dc4f9554/esr-system-info-list/esr-system-info/51a480ed-649c-4c47-a84b-f966dc4f9554", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-369be4d7-7a6f-4e44-996e-1e65d8129cb4", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 200, - "json" : { - "esr-system-info-id" : "51a480ed-649c-4c47-a84b-f966dc4f9554", - "system-name" : "ems1", - "type" : "ems", - "vendor" : "boco", - "version" : "1.0", - "service-url" : "http://10.0.0.1", - "user-name" : "admin", - "password" : "password", - "system-type" : "ems", - "ssl-cacert" : "", - "ssl-insecure" : false, - "ip-address" : "", - "port" : "", - "cloud-domain" : "", - "default-tenant" : "", - "resource-version" : "1509095358847" - } - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml deleted file mode 100644 index 4601cdef..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml +++ /dev/null @@ -1,14 +0,0 @@ -onap_cli_sample_version: 1.0 -name: ems-show -version: onap-1.1 -samples: - sample1: - name: ems-show - input: --ems-id 51a480ed-649c-4c47-a84b-f966dc4f9554 - moco: ems-show-schema-1.1-moco.json - output: | - +------+------+--------+----------+------------------+ - |name |type |vendor |version |url | - +------+------+--------+----------+------------------+ - |ems1 |ems |boco |1.0 |http://10.0.0.1 | - +------+------+--------+----------+------------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-create-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-create-schema-1.1-moco.json deleted file mode 100644 index ebbf12ed..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-create-schema-1.1-moco.json +++ /dev/null @@ -1,35 +0,0 @@ -[ { - "request" : { - "method" : "put", - "uri" : "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/esr-system-info-list/esr-system-info/810edb5a-42e9-462d-9587-96bc9272ac27", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-bbda56c1-81d6-4a3f-b82f-4c74f9673be7", - "Content-Type" : "application/json" - }, - "json" : { - "esr-system-info-id" : "810edb5a-42e9-462d-9587-96bc9272ac27", - "system-name" : "vim1", - "type" : "OpenStack", - "vendor" : "Devstack", - "version" : "newton", - "service-url" : "http://192.168.16.149/identity", - "user-name" : "onap", - "password" : "onap", - "system-type" : "vim", - "protocal" : "", - "ssl-cacert" : "", - "ssl-insecure" : "false", - "ip-address" : "", - "port" : "", - "cloud-domain" : "default", - "default-tenant" : "onap" - } - }, - "response" : { - "status" : 201, - "json" : null - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml deleted file mode 100644 index e23e61cb..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml +++ /dev/null @@ -1,9 +0,0 @@ -onap_cli_sample_version: 1.0 -name: vim-register -version: onap-1.1 -samples: - sample1: - name: vim-register - input: --cloud-name huawei-cloud --region-name bangalore --name vim1 --type OpenStack --vendor Devstack --vim-version newton --url http://192.168.16.149/identity --username onap --password onap --cloud-domain default --default-tenant onap - moco: vim-create-schema-1.1-moco.json - output: \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-delete-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-delete-schema-1.1-moco.json deleted file mode 100644 index 7beabc12..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-delete-schema-1.1-moco.json +++ /dev/null @@ -1,18 +0,0 @@ -[ { - "request" : { - "method" : "delete", - "uri" : "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/esr-system-info-list/esr-system-info/810edb5a-42e9-462d-9587-96bc9272ac27", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-236b38a5-911c-43db-9740-dd69d2adb755", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 204, - "json" : null - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml deleted file mode 100644 index fdadc344..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml +++ /dev/null @@ -1,9 +0,0 @@ -onap_cli_sample_version: 1.0 -name: vim-unregister -version: onap-1.1 -samples: - sample1: - name: vim-unregister - input: --vim-id 810edb5a-42e9-462d-9587-96bc9272ac27 --cloud-name huawei-cloud --region-name bangalore --resource-version 1509093590932 - moco: vim-delete-schema-1.1-moco.json - output: \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-moco.json deleted file mode 100644 index 9f687dfa..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-moco.json +++ /dev/null @@ -1,54 +0,0 @@ -[ { - "request" : { - "method" : "get", - "uri" : "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/esr-system-info-list", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-170cf86a-e3df-4940-b361-973aa698e015", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 200, - "json" : { - "esr-system-info" : [ { - "esr-system-info-id" : "acc5e14e-1320-4ab5-97fe-b7cc82ad03f2", - "system-name" : "RegionOne", - "type" : "OpenStack", - "vendor" : "Devstack", - "version" : "newton", - "service-url" : "http://192.168.16.149/identity", - "user-name" : "onap", - "password" : "onap", - "system-type" : "vim", - "ssl-cacert" : "", - "ssl-insecure" : false, - "ip-address" : "", - "port" : "", - "cloud-domain" : "default", - "default-tenant" : "onap", - "resource-version" : "1509093477505" - }, { - "esr-system-info-id" : "810edb5a-42e9-462d-9587-96bc9272ac27", - "system-name" : "vim1", - "type" : "OpenStack", - "vendor" : "Devstack", - "version" : "newton", - "service-url" : "http://192.168.16.149/identity", - "user-name" : "onap", - "password" : "onap", - "system-type" : "vim", - "ssl-cacert" : "", - "ssl-insecure" : false, - "ip-address" : "", - "port" : "", - "cloud-domain" : "default", - "default-tenant" : "onap", - "resource-version" : "1509093590932" - } ] - } - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml deleted file mode 100644 index 50f4eb3a..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml +++ /dev/null @@ -1,16 +0,0 @@ -onap_cli_sample_version: 1.0 -name: vim-list -version: onap-1.1 -samples: - sample1: - name: vim-list - input: --cloud-name huawei-cloud --region-name bangalore --long - moco: vim-list-schema-1.1-moco.json - output: | - +--------------------------------------+------------+------------+----------+----------+--------------------------------+----------+--------------+----------------+------------------+ - |vim-id |name |type |vendor |version |url |username |cloud-domain |default-tenant |resource-version | - +--------------------------------------+------------+------------+----------+----------+--------------------------------+----------+--------------+----------------+------------------+ - |acc5e14e-1320-4ab5-97fe-b7cc82ad03f2 |RegionOne |OpenStack |Devstack |newton |http://192.168.16.149/identity |onap |default |onap |1509093477505 | - +--------------------------------------+------------+------------+----------+----------+--------------------------------+----------+--------------+----------------+------------------+ - |810edb5a-42e9-462d-9587-96bc9272ac27 |vim1 |OpenStack |Devstack |newton |http://192.168.16.149/identity |onap |default |onap |1509093590932 | - +--------------------------------------+------------+------------+----------+----------+--------------------------------+----------+--------------+----------------+------------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-create-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-create-schema-1.1-moco.json deleted file mode 100644 index d43db5b9..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-create-schema-1.1-moco.json +++ /dev/null @@ -1,42 +0,0 @@ -[ { - "request" : { - "method" : "put", - "uri" : "/aai/v11/external-system/esr-vnfm-list/esr-vnfm/c0ecd788-22f4-49a4-a969-68051cd517e7", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-99986f20-ae09-41f7-95a3-a962cda7b24e", - "Content-Type" : "application/json" - }, - "json" : { - "vnfm-id" : "c0ecd788-22f4-49a4-a969-68051cd517e7", - "vim-id" : "acc5e14e-1320-4ab5-97fe-b7cc82ad03f2", - "certificate-url" : "", - "esr-system-info-list" : { - "esr-system-info" : [ { - "esr-system-info-id" : "c0ecd788-22f4-49a4-a969-68051cd517e7", - "system-name" : "vnfm1", - "type" : "OpenStack", - "vendor" : "ONAP", - "version" : "1.0", - "service-url" : "http://10.0.1.1", - "user-name" : "admin", - "password" : "password", - "system-type" : "vnfm", - "protocal" : "", - "ssl-cacert" : "", - "ssl-insecure" : "", - "ip-address" : "", - "port" : "", - "cloud-domain" : "", - "default-tenant" : "" - } ] - } - } - }, - "response" : { - "status" : 201, - "json" : null - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml deleted file mode 100644 index 411efcbe..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml +++ /dev/null @@ -1,9 +0,0 @@ -onap_cli_sample_version: 1.0 -name: vnfm-register -version: onap-1.1 -samples: - sample1: - name: vnfm-register - input: --vim-id acc5e14e-1320-4ab5-97fe-b7cc82ad03f2 --name vnfm1 --type OpenStack --vendor ONAP --vnfm-version 1.0 --url http://10.0.1.1 --username admin --password password - moco: vnfm-create-schema-1.1-moco.json - output: \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-moco.json deleted file mode 100644 index 9e31836d..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-moco.json +++ /dev/null @@ -1,18 +0,0 @@ -[ { - "request" : { - "method" : "delete", - "uri" : "/aai/v11/external-system/esr-vnfm-list/esr-vnfm/c0ecd788-22f4-49a4-a969-68051cd517e7", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-c47a3c8f-ac92-4847-98b8-399707379a67", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 204, - "json" : null - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml deleted file mode 100644 index e58a20fb..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml +++ /dev/null @@ -1,9 +0,0 @@ -onap_cli_sample_version: 1.0 -name: vnfm-unregister -version: onap-1.1 -samples: - sample1: - name: vnfm-unregister - input: --vnfm-id c0ecd788-22f4-49a4-a969-68051cd517e7 --resource-version 1509094328901 - moco: vnfm-delete-schema-1.1-moco.json - output: \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-moco.json deleted file mode 100644 index 5cfa56b5..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-moco.json +++ /dev/null @@ -1,25 +0,0 @@ -[ { - "request" : { - "method" : "get", - "uri" : "/aai/v11/external-system/esr-vnfm-list", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-07be51f0-22b4-4ea0-a098-bf68ed59f2ce", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 200, - "json" : { - "esr-vnfm" : [ { - "vnfm-id" : "c0ecd788-22f4-49a4-a969-68051cd517e7", - "vim-id" : "acc5e14e-1320-4ab5-97fe-b7cc82ad03f2", - "certificate-url" : "", - "resource-version" : "1509094328901" - } ] - } - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml deleted file mode 100644 index eab55c2e..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml +++ /dev/null @@ -1,14 +0,0 @@ -onap_cli_sample_version: 1.0 -name: vnfm-list -version: onap-1.1 -samples: - sample1: - name: vnfm-list - input: - moco: vnfm-list-schema-1.1-moco.json - output: | - +--------------------------------------+--------------------------------------+------------------+------------------+ - |vnfm-id |vim-id |certificate-url |resource-version | - +--------------------------------------+--------------------------------------+------------------+------------------+ - |c0ecd788-22f4-49a4-a969-68051cd517e7 |acc5e14e-1320-4ab5-97fe-b7cc82ad03f2 | |1509094328901 | - +--------------------------------------+--------------------------------------+------------------+------------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-moco.json deleted file mode 100644 index 9eb10b3c..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-moco.json +++ /dev/null @@ -1,35 +0,0 @@ -[ { - "request" : { - "method" : "get", - "uri" : "/aai/v11/external-system/esr-vnfm-list/esr-vnfm/c0ecd788-22f4-49a4-a969-68051cd517e7/esr-system-info-list/esr-system-info/c0ecd788-22f4-49a4-a969-68051cd517e7", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-c87981f1-c110-4d29-887e-12e44b96507c", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 200, - "json" : { - "esr-system-info-id" : "c0ecd788-22f4-49a4-a969-68051cd517e7", - "system-name" : "vnfm1", - "type" : "OpenStack", - "vendor" : "ONAP", - "version" : "1.0", - "service-url" : "http://10.0.1.1", - "user-name" : "admin", - "password" : "password", - "system-type" : "vnfm", - "ssl-cacert" : "", - "ssl-insecure" : false, - "ip-address" : "", - "port" : "", - "cloud-domain" : "", - "default-tenant" : "", - "resource-version" : "1509094329093" - } - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml deleted file mode 100644 index c79921f7..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml +++ /dev/null @@ -1,22 +0,0 @@ -onap_cli_sample_version: 1.0 -name: vnfm-show -version: onap-1.1 -samples: - sample1: - name: vnfm-show - input: --vnfm-id c0ecd788-22f4-49a4-a969-68051cd517e7 - moco: vnfm-show-schema-1.1-moco.json - output: | - +----------+------------------+ - |property |value | - +----------+------------------+ - |name |vnfm1 | - +----------+------------------+ - |type |OpenStack | - +----------+------------------+ - |vendor |ONAP | - +----------+------------------+ - |version |1.0 | - +----------+------------------+ - |url |http://10.0.1.1 | - +----------+------------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/service-list-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/service-instance/service-list-schema-1.1-moco.json deleted file mode 100644 index e9a1d529..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/service-list-schema-1.1-moco.json +++ /dev/null @@ -1,205 +0,0 @@ -[ { - "request" : { - "method" : "get", - "uri" : "/aai/v11/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vLB/service-instances", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-f23a4ee4-d7fe-4f66-8a3a-2811f2c7b21b", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 200, - "json" : { - "service-instance" : [ { - "service-instance-id" : "1db042a9-6b28-4290-baba-872d32eeecf2", - "service-instance-name" : "sample-instance", - "model-invariant-id" : "1de901ed-17af-4b03-bc1f-41659cfa27cb", - "model-version-id" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0", - "resource-version" : "1509022618290" - }, { - "service-instance-id" : "9244629b-4ae4-48a0-bac0-b76937105ec7", - "service-instance-name" : "demo-vlb-vid", - "model-invariant-id" : "1de901ed-17af-4b03-bc1f-41659cfa27cb", - "model-version-id" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0", - "resource-version" : "1509022547366" - }, { - "service-instance-id" : "912d6d8d-9534-41d0-9323-289e81d4e399", - "service-instance-name" : "sample-instance-3", - "model-invariant-id" : "1de901ed-17af-4b03-bc1f-41659cfa27cb", - "model-version-id" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0", - "resource-version" : "1509080251181" - }, { - "service-instance-id" : "26b4ea72-d119-4345-95c8-568b08a093aa", - "service-instance-name" : "sample-service-onap-cli-2", - "model-invariant-id" : "1de901ed-17af-4b03-bc1f-41659cfa27cb", - "model-version-id" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0", - "resource-version" : "1509084185281" - }, { - "service-instance-id" : "b2ebdb88-cfa5-496f-93a5-d535accbf56a", - "service-instance-name" : "sample-instance-1", - "model-invariant-id" : "1de901ed-17af-4b03-bc1f-41659cfa27cb", - "model-version-id" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0", - "resource-version" : "1509023258677" - }, { - "service-instance-id" : "01eb6e59-5c28-4c76-85c7-a6b1e48058b9", - "service-instance-name" : "sample-service-onap-cli-4", - "model-invariant-id" : "1de901ed-17af-4b03-bc1f-41659cfa27cb", - "model-version-id" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0", - "resource-version" : "1509084558970" - }, { - "service-instance-id" : "03acb854-647b-4cf9-bfd8-a76083bb7266", - "service-instance-name" : "sample-service-onap-cli-3", - "model-invariant-id" : "1de901ed-17af-4b03-bc1f-41659cfa27cb", - "model-version-id" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0", - "resource-version" : "1509084249566" - }, { - "service-instance-id" : "14a9d485-63de-4ce2-b763-133ec3ce3d23", - "service-instance-name" : "sample-service-onap-cli-8", - "model-invariant-id" : "1de901ed-17af-4b03-bc1f-41659cfa27cb", - "model-version-id" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0", - "resource-version" : "1509086790040" - }, { - "service-instance-id" : "fdb98970-9de8-48a3-a321-d02693d2d1ad", - "service-instance-name" : "sample-service-onap-cli-9", - "model-invariant-id" : "1de901ed-17af-4b03-bc1f-41659cfa27cb", - "model-version-id" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0", - "resource-version" : "1509086896605" - }, { - "service-instance-id" : "50de14d5-73d6-458e-880e-de8278b6f944", - "service-instance-name" : "test", - "model-invariant-id" : "1de901ed-17af-4b03-bc1f-41659cfa27cb", - "model-version-id" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0", - "resource-version" : "1509106683895" - }, { - "service-instance-id" : "2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee", - "service-instance-name" : "sample-instance-cli-10", - "model-invariant-id" : "1de901ed-17af-4b03-bc1f-41659cfa27cb", - "model-version-id" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0", - "resource-version" : "1509109122018", - "relationship-list" : { - "relationship" : [ { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/1a667ce8-8b8b-4f59-ba5c-b162ae462fef", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "1a667ce8-8b8b-4f59-ba5c-b162ae462fef" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-8" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/048c2c4a-ee30-41a1-bb55-c4e7fe1a9a0d", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "048c2c4a-ee30-41a1-bb55-c4e7fe1a9a0d" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-11" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/c37c401f-a839-4b6e-9c65-33e023c412ee", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "c37c401f-a839-4b6e-9c65-33e023c412ee" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-10" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/b544f164-97c9-483a-98eb-eafd1f808e79", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "b544f164-97c9-483a-98eb-eafd1f808e79" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-5" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/5ef95bd9-4d7a-4d06-879e-0c7964f9de65", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "5ef95bd9-4d7a-4d06-879e-0c7964f9de65" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-4" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/eb29edb5-0a9f-4bc6-a7bf-3211341fffc2", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "eb29edb5-0a9f-4bc6-a7bf-3211341fffc2" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-9" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/2a152730-f6eb-4dc6-9b81-7a6f6f263d71", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "2a152730-f6eb-4dc6-9b81-7a6f6f263d71" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-1" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/f53cd512-e172-410e-87b4-37064b5b5f8c", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "f53cd512-e172-410e-87b4-37064b5b5f8c" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-7" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/f4bfcd6a-2ea1-42ab-853a-5d863b150c40", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "f4bfcd6a-2ea1-42ab-853a-5d863b150c40" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-3" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/4bb4beaa-5b6b-414e-97d8-53949bbb5c5e", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "4bb4beaa-5b6b-414e-97d8-53949bbb5c5e" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-6" - } ] - } ] - } - }, { - "service-instance-id" : "4415727d-dc2a-4378-a3a7-bc4411d391c7", - "service-instance-name" : "sample-service-onap-cli-5", - "model-invariant-id" : "1de901ed-17af-4b03-bc1f-41659cfa27cb", - "model-version-id" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0", - "resource-version" : "1509084703790" - } ] - } - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/service-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/service-instance/service-list-schema-1.1-sample.yaml deleted file mode 100644 index 2cda799b..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/service-list-schema-1.1-sample.yaml +++ /dev/null @@ -1,36 +0,0 @@ -onap_cli_sample_version: 1.0 -name: service-list -version: onap-1.1 -samples: - sample1: - name: service-list - input: -x Demonstration -y vLB --long - moco: service-list-schema-1.1-moco.json - output: | - +--------------------------------------+----------------------------+--------------------------------------+--------------------------------------+--------------+ - |service-id |service-name |model-invariant-id |model-uuid |description | - +--------------------------------------+----------------------------+--------------------------------------+--------------------------------------+--------------+ - |1db042a9-6b28-4290-baba-872d32eeecf2 |sample-instance |1de901ed-17af-4b03-bc1f-41659cfa27cb |ace39141-09ec-4068-b06d-ac6b23bdc6e0 | | - +--------------------------------------+----------------------------+--------------------------------------+--------------------------------------+--------------+ - |9244629b-4ae4-48a0-bac0-b76937105ec7 |demo-vlb-vid |1de901ed-17af-4b03-bc1f-41659cfa27cb |ace39141-09ec-4068-b06d-ac6b23bdc6e0 | | - +--------------------------------------+----------------------------+--------------------------------------+--------------------------------------+--------------+ - |912d6d8d-9534-41d0-9323-289e81d4e399 |sample-instance-3 |1de901ed-17af-4b03-bc1f-41659cfa27cb |ace39141-09ec-4068-b06d-ac6b23bdc6e0 | | - +--------------------------------------+----------------------------+--------------------------------------+--------------------------------------+--------------+ - |26b4ea72-d119-4345-95c8-568b08a093aa |sample-service-onap-cli-2 |1de901ed-17af-4b03-bc1f-41659cfa27cb |ace39141-09ec-4068-b06d-ac6b23bdc6e0 | | - +--------------------------------------+----------------------------+--------------------------------------+--------------------------------------+--------------+ - |b2ebdb88-cfa5-496f-93a5-d535accbf56a |sample-instance-1 |1de901ed-17af-4b03-bc1f-41659cfa27cb |ace39141-09ec-4068-b06d-ac6b23bdc6e0 | | - +--------------------------------------+----------------------------+--------------------------------------+--------------------------------------+--------------+ - |01eb6e59-5c28-4c76-85c7-a6b1e48058b9 |sample-service-onap-cli-4 |1de901ed-17af-4b03-bc1f-41659cfa27cb |ace39141-09ec-4068-b06d-ac6b23bdc6e0 | | - +--------------------------------------+----------------------------+--------------------------------------+--------------------------------------+--------------+ - |03acb854-647b-4cf9-bfd8-a76083bb7266 |sample-service-onap-cli-3 |1de901ed-17af-4b03-bc1f-41659cfa27cb |ace39141-09ec-4068-b06d-ac6b23bdc6e0 | | - +--------------------------------------+----------------------------+--------------------------------------+--------------------------------------+--------------+ - |14a9d485-63de-4ce2-b763-133ec3ce3d23 |sample-service-onap-cli-8 |1de901ed-17af-4b03-bc1f-41659cfa27cb |ace39141-09ec-4068-b06d-ac6b23bdc6e0 | | - +--------------------------------------+----------------------------+--------------------------------------+--------------------------------------+--------------+ - |fdb98970-9de8-48a3-a321-d02693d2d1ad |sample-service-onap-cli-9 |1de901ed-17af-4b03-bc1f-41659cfa27cb |ace39141-09ec-4068-b06d-ac6b23bdc6e0 | | - +--------------------------------------+----------------------------+--------------------------------------+--------------------------------------+--------------+ - |50de14d5-73d6-458e-880e-de8278b6f944 |test |1de901ed-17af-4b03-bc1f-41659cfa27cb |ace39141-09ec-4068-b06d-ac6b23bdc6e0 | | - +--------------------------------------+----------------------------+--------------------------------------+--------------------------------------+--------------+ - |2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee |sample-instance-cli-10 |1de901ed-17af-4b03-bc1f-41659cfa27cb |ace39141-09ec-4068-b06d-ac6b23bdc6e0 | | - +--------------------------------------+----------------------------+--------------------------------------+--------------------------------------+--------------+ - |4415727d-dc2a-4378-a3a7-bc4411d391c7 |sample-service-onap-cli-5 |1de901ed-17af-4b03-bc1f-41659cfa27cb |ace39141-09ec-4068-b06d-ac6b23bdc6e0 | | - +--------------------------------------+----------------------------+--------------------------------------+--------------------------------------+--------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-moco.json deleted file mode 100644 index 096b5992..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-moco.json +++ /dev/null @@ -1,137 +0,0 @@ -[ { - "request" : { - "method" : "get", - "uri" : "/aai/v11/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vLB/service-instances/service-instance/2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-9f249fd5-ea11-439e-b205-e814325b95ff", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 200, - "json" : { - "service-instance-id" : "2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee", - "service-instance-name" : "sample-instance-cli-10", - "model-invariant-id" : "1de901ed-17af-4b03-bc1f-41659cfa27cb", - "model-version-id" : "ace39141-09ec-4068-b06d-ac6b23bdc6e0", - "resource-version" : "1509109122018", - "relationship-list" : { - "relationship" : [ { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/1a667ce8-8b8b-4f59-ba5c-b162ae462fef", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "1a667ce8-8b8b-4f59-ba5c-b162ae462fef" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-8" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/048c2c4a-ee30-41a1-bb55-c4e7fe1a9a0d", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "048c2c4a-ee30-41a1-bb55-c4e7fe1a9a0d" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-11" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/c37c401f-a839-4b6e-9c65-33e023c412ee", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "c37c401f-a839-4b6e-9c65-33e023c412ee" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-10" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/b544f164-97c9-483a-98eb-eafd1f808e79", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "b544f164-97c9-483a-98eb-eafd1f808e79" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-5" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/5ef95bd9-4d7a-4d06-879e-0c7964f9de65", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "5ef95bd9-4d7a-4d06-879e-0c7964f9de65" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-4" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/eb29edb5-0a9f-4bc6-a7bf-3211341fffc2", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "eb29edb5-0a9f-4bc6-a7bf-3211341fffc2" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-9" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/2a152730-f6eb-4dc6-9b81-7a6f6f263d71", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "2a152730-f6eb-4dc6-9b81-7a6f6f263d71" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-1" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/f53cd512-e172-410e-87b4-37064b5b5f8c", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "f53cd512-e172-410e-87b4-37064b5b5f8c" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-7" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/f4bfcd6a-2ea1-42ab-853a-5d863b150c40", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "f4bfcd6a-2ea1-42ab-853a-5d863b150c40" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-3" - } ] - }, { - "related-to" : "generic-vnf", - "related-link" : "/aai/v11/network/generic-vnfs/generic-vnf/4bb4beaa-5b6b-414e-97d8-53949bbb5c5e", - "relationship-data" : [ { - "relationship-key" : "generic-vnf.vnf-id", - "relationship-value" : "4bb4beaa-5b6b-414e-97d8-53949bbb5c5e" - } ], - "related-to-property" : [ { - "property-key" : "generic-vnf.vnf-name", - "property-value" : "vlb-cli-sample-6" - } ] - } ] - } - } - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml deleted file mode 100644 index b93b9d16..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml +++ /dev/null @@ -1,32 +0,0 @@ -onap_cli_sample_version: 1.0 -name: vf-list -version: onap-1.1 -samples: - sample1: - name: vf-list - input: -x Demonstration -y vLB --service-id 2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee - moco: vf-list-schema-1.1-moco.json - output: | - +--------------------------------------+--------------------+ - |vf-id |vf-name | - +--------------------------------------+--------------------+ - |1a667ce8-8b8b-4f59-ba5c-b162ae462fef |vlb-cli-sample-8 | - +--------------------------------------+--------------------+ - |048c2c4a-ee30-41a1-bb55-c4e7fe1a9a0d |vlb-cli-sample-11 | - +--------------------------------------+--------------------+ - |c37c401f-a839-4b6e-9c65-33e023c412ee |vlb-cli-sample-10 | - +--------------------------------------+--------------------+ - |b544f164-97c9-483a-98eb-eafd1f808e79 |vlb-cli-sample-5 | - +--------------------------------------+--------------------+ - |5ef95bd9-4d7a-4d06-879e-0c7964f9de65 |vlb-cli-sample-4 | - +--------------------------------------+--------------------+ - |eb29edb5-0a9f-4bc6-a7bf-3211341fffc2 |vlb-cli-sample-9 | - +--------------------------------------+--------------------+ - |2a152730-f6eb-4dc6-9b81-7a6f6f263d71 |vlb-cli-sample-1 | - +--------------------------------------+--------------------+ - |f53cd512-e172-410e-87b4-37064b5b5f8c |vlb-cli-sample-7 | - +--------------------------------------+--------------------+ - |f4bfcd6a-2ea1-42ab-853a-5d863b150c40 |vlb-cli-sample-3 | - +--------------------------------------+--------------------+ - |4bb4beaa-5b6b-414e-97d8-53949bbb5c5e |vlb-cli-sample-6 | - +--------------------------------------+--------------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-moco.json deleted file mode 100644 index 3d697e03..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-moco.json +++ /dev/null @@ -1,55 +0,0 @@ -[ { - "request" : { - "method" : "get", - "uri" : "/aai/v11/network/generic-vnfs/generic-vnf/1a667ce8-8b8b-4f59-ba5c-b162ae462fef", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-46bd1d68-55a3-442a-91b3-850787784bab", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 200, - "json" : { - "vnf-id" : "1a667ce8-8b8b-4f59-ba5c-b162ae462fef", - "vnf-name" : "vlb-cli-sample-8", - "vnf-type" : "demoVLB/null", - "service-id" : "vLB", - "prov-status" : "PREPROV", - "orchestration-status" : "Created", - "in-maint" : false, - "is-closed-loop-disabled" : false, - "resource-version" : "1509115214962", - "model-invariant-id" : "cc34cd54-dd7c-44cd-8847-f9577c6f1a49", - "model-version-id" : "8b1f63f3-e0cc-4c27-8903-fafe2f25bfbe", - "model-customization-id" : "cf893f5a-1bb1-4e32-a92b-2456e12178f8", - "nf-type" : "", - "nf-function" : "", - "nf-role" : "", - "nf-naming-code" : "", - "relationship-list" : { - "relationship" : [ { - "related-to" : "service-instance", - "related-link" : "/aai/v11/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vLB/service-instances/service-instance/2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee", - "relationship-data" : [ { - "relationship-key" : "customer.global-customer-id", - "relationship-value" : "Demonstration" - }, { - "relationship-key" : "service-subscription.service-type", - "relationship-value" : "vLB" - }, { - "relationship-key" : "service-instance.service-instance-id", - "relationship-value" : "2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee" - } ], - "related-to-property" : [ { - "property-key" : "service-instance.service-instance-name", - "property-value" : "sample-instance-cli-10" - } ] - } ] - } - } - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml deleted file mode 100644 index 365affcf..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml +++ /dev/null @@ -1,26 +0,0 @@ -onap_cli_sample_version: 1.0 -name: vf-show -version: onap-1.1 -samples: - sample1: - name: vf-show - input: --vf-id 1a667ce8-8b8b-4f59-ba5c-b162ae462fef -m https://192.168.17.111:8443 -u AAI -p AAI - moco: vf-show-schema-1.1-moco.json - output: | - +------------------------+--------------------------------------+ - |property |value | - +------------------------+--------------------------------------+ - |vf-id |1a667ce8-8b8b-4f59-ba5c-b162ae462fef | - +------------------------+--------------------------------------+ - |vf-name |vlb-cli-sample-8 | - +------------------------+--------------------------------------+ - |vf-type |demoVLB/null | - +------------------------+--------------------------------------+ - |model-invariant-id |cc34cd54-dd7c-44cd-8847-f9577c6f1a49 | - +------------------------+--------------------------------------+ - |model-uuid |8b1f63f3-e0cc-4c27-8903-fafe2f25bfbe | - +------------------------+--------------------------------------+ - |model-customization-id |cf893f5a-1bb1-4e32-a92b-2456e12178f8 | - +------------------------+--------------------------------------+ - |service-id |2ad87511-4289-4bd7-ab0b-0b29d3d4c8ee | - +------------------------+--------------------------------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-schema-1.1-moco.json deleted file mode 100644 index 5e54f153..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-schema-1.1-moco.json +++ /dev/null @@ -1,21 +0,0 @@ -[ { - "request" : { - "method" : "put", - "uri" : "/aai/v11/service-design-and-creation/services/service/de1fa33f-f676-42e5-b79a-a39825c19b1d", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-db81a881-11a9-4eca-9611-e0abdfa81597", - "Content-Type" : "application/json" - }, - "json" : { - "service-description" : "test", - "service-id" : "de1fa33f-f676-42e5-b79a-a39825c19b1d" - } - }, - "response" : { - "status" : 201, - "json" : null - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml deleted file mode 100644 index c0ccdc83..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml +++ /dev/null @@ -1,9 +0,0 @@ -onap_cli_sample_version: 1.0 -name: service-type-create -version: onap-1.1 -samples: - sample1: - name: service-type-create - input: --service-type test - moco: service-type-create-schema-1.1-moco.json - output: diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-schema-1.1-moco.json deleted file mode 100644 index 961e3a90..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-schema-1.1-moco.json +++ /dev/null @@ -1,18 +0,0 @@ -[ { - "request" : { - "method" : "delete", - "uri" : "/aai/v11/service-design-and-creation/services/service/de1fa33f-f676-42e5-b79a-a39825c19b1d", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-41247f9a-4124-4b09-b7e1-045a74e610fb", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 204, - "json" : null - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml deleted file mode 100644 index a5c2841f..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml +++ /dev/null @@ -1,9 +0,0 @@ -onap_cli_sample_version: 1.0 -name: service-type-delete -version: onap-1.1 -samples: - sample1: - name: service-type-delete - input: --service-type-id de1fa33f-f676-42e5-b79a-a39825c19b1d --resource-version 1509029708094 - moco: service-type-delete-schema-1.1-moco.json - output: diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-schema-1.1-moco.json deleted file mode 100644 index 52ced9b0..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-schema-1.1-moco.json +++ /dev/null @@ -1,44 +0,0 @@ -[ { - "request" : { - "method" : "get", - "uri" : "/aai/v11/service-design-and-creation/services", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-aded3320-855c-46f6-8c28-1a14413c0585", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 200, - "json" : { - "service" : [ { - "service-id" : "2733fe6f-8725-48fa-8609-092a34106dba", - "service-description" : "vIMS", - "resource-version" : "1508827920395" - }, { - "service-id" : "bc549d9d-2335-4b07-9f03-3a85439c0bbb", - "service-description" : "vFW-kanag", - "resource-version" : "1509029699189" - }, { - "service-id" : "de1fa33f-f676-42e5-b79a-a39825c19b1d", - "service-description" : "test", - "resource-version" : "1509029708094" - }, { - "service-id" : "1482d2f2-b9e6-4421-a2f6-31959278db6f", - "service-description" : "vCPE", - "resource-version" : "1508827919819" - }, { - "service-id" : "4426c557-e012-47eb-85cc-6128fa4f55c1", - "service-description" : "vLB", - "resource-version" : "1508827918467" - }, { - "service-id" : "dd04cc4b-6283-480d-8c5a-2c7bba8497ea", - "service-description" : "vFW", - "resource-version" : "1508827917148" - } ] - } - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml deleted file mode 100644 index 081a42b1..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml +++ /dev/null @@ -1,24 +0,0 @@ -onap_cli_sample_version: 1.0 -name: service-type-list -version: onap-1.1 -samples: - sample1: - name: service-type-list - input: - moco: service-type-list-schema-1.1-moco.json - output: | - +--------------------------------------+--------------+------------------+ - |service-type-id |service-type |resource-version | - +--------------------------------------+--------------+------------------+ - |2733fe6f-8725-48fa-8609-092a34106dba |vIMS |1508827920395 | - +--------------------------------------+--------------+------------------+ - |bc549d9d-2335-4b07-9f03-3a85439c0bbb |vFW-kanag |1509029699189 | - +--------------------------------------+--------------+------------------+ - |de1fa33f-f676-42e5-b79a-a39825c19b1d |test |1509029708094 | - +--------------------------------------+--------------+------------------+ - |1482d2f2-b9e6-4421-a2f6-31959278db6f |vCPE |1508827919819 | - +--------------------------------------+--------------+------------------+ - |4426c557-e012-47eb-85cc-6128fa4f55c1 |vLB |1508827918467 | - +--------------------------------------+--------------+------------------+ - |dd04cc4b-6283-480d-8c5a-2c7bba8497ea |vFW |1508827917148 | - +--------------------------------------+--------------+------------------+ diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-schema-1.1-moco.json deleted file mode 100644 index 13ec1e2b..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-schema-1.1-moco.json +++ /dev/null @@ -1,35 +0,0 @@ -[ { - "request" : { - "method" : "put", - "uri" : "/aai/v11/business/customers/customer/kanag/service-subscriptions/service-subscription/vFW-kanag", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-2f281cd8-98da-4cb5-899e-294d9bf7b03d", - "Content-Type" : "application/json" - }, - "json" : { - "relationship-list" : { - "relationship" : [ { - "related-to" : "tenant", - "relationship-data" : [ { - "relationship-key" : "cloud-region.cloud-owner", - "relationship-value" : "huawei-cloud" - }, { - "relationship-key" : "cloud-region.cloud-region-id", - "relationship-value" : "bangalore" - }, { - "relationship-key" : "tenant.tenant-id", - "relationship-value" : "e18173e6-6a13-4614-a13c-3859e7321103" - } ] - } ] - }, - "service-type" : "vFW-kanag" - } - }, - "response" : { - "status" : 201, - "json" : null - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml deleted file mode 100644 index facdcc77..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml +++ /dev/null @@ -1,9 +0,0 @@ -onap_cli_sample_version: 1.0 -name: subscription-create -version: onap-1.1 -samples: - sample1: - name: subscription-create - input: --customer-name kanag --cloud-name huawei-cloud --cloud-region bangalore --cloud-tenant-id e18173e6-6a13-4614-a13c-3859e7321103 --service-type vFW-kanag - moco: subscription-create-schema-1.1-moco.json - output: \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-moco.json deleted file mode 100644 index bcbd8451..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-moco.json +++ /dev/null @@ -1,18 +0,0 @@ -[ { - "request" : { - "method" : "delete", - "uri" : "/aai/v11//business/customers/customer/kanag/service-subscriptions/service-subscription/vFW-kanag", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-64fc35d5-c804-4e92-befd-0c695a77e12d", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 204, - "json" : null - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml deleted file mode 100644 index f4b16b54..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml +++ /dev/null @@ -1,9 +0,0 @@ -onap_cli_sample_version: 1.0 -name: subscription-delete -version: onap-1.1 -samples: - sample1: - name: subscription-delete - input: --customer-name kanag --service-type vFW-kanag --resource-version 1509079144326 - moco: subscription-delete-schema-1.1-moco.json - output: \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-moco.json deleted file mode 100644 index a70ce4e0..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-moco.json +++ /dev/null @@ -1,43 +0,0 @@ -[ { - "request" : { - "method" : "get", - "uri" : "/aai/v11/business/customers/customer/kanag/service-subscriptions", - "headers" : { - "Authorization" : "Basic QUFJOkFBSQ==", - "X-FromAppId" : "onap-cli", - "Accept" : "application/json", - "X-TransactionId" : "req-fd86411d-c6ea-4af5-a4f8-2296587b832b", - "Content-Type" : "application/json" - }, - "json" : null - }, - "response" : { - "status" : 200, - "json" : { - "service-subscription" : [ { - "service-type" : "vFW-kanag", - "resource-version" : "1509079144326", - "relationship-list" : { - "relationship" : [ { - "related-to" : "tenant", - "related-link" : "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/tenants/tenant/e18173e6-6a13-4614-a13c-3859e7321103", - "relationship-data" : [ { - "relationship-key" : "cloud-region.cloud-owner", - "relationship-value" : "huawei-cloud" - }, { - "relationship-key" : "cloud-region.cloud-region-id", - "relationship-value" : "bangalore" - }, { - "relationship-key" : "tenant.tenant-id", - "relationship-value" : "e18173e6-6a13-4614-a13c-3859e7321103" - } ], - "related-to-property" : [ { - "property-key" : "tenant.tenant-name", - "property-value" : "kanag-tenant" - } ] - } ] - } - } ] - } - } -} ] \ No newline at end of file diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml deleted file mode 100644 index eb823673..00000000 --- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml +++ /dev/null @@ -1,14 +0,0 @@ -onap_cli_sample_version: 1.0 -name: subscription-list -version: onap-1.1 -samples: - sample1: - name: subscription-list - input: --customer-name kanag - moco: subscription-list-schema-1.1-moco.json - output: | - +--------------+------------------+ - |service-type |resource-version | - +--------------+------------------+ - |vFW-kanag |1509079144326 | - +--------------+------------------+ -- cgit 1.2.3-korg