aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/onap-amsterdam/features/aai/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/onap-amsterdam/features/aai/src')
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml36
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml38
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml59
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml35
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml32
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml34
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml52
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml80
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml39
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml38
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml67
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml98
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml34
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml41
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml109
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml52
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml93
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml86
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml39
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml49
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml68
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml67
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/vf-list-schema-1.1.yaml58
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/vf-show-schema-1.1.yaml69
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml34
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml36
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml39
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml54
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml41
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml62
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml48
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml45
-rw-r--r--plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml57
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json24
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml10
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json18
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml10
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json34
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml16
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-moco.json22
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-sample.yaml10
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-moco.json18
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-sample.yaml10
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-moco.json35
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-sample.yaml18
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-moco.json23
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-sample.yaml14
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-moco.json42
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml9
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json18
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml9
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-moco.json23
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml14
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-moco.json35
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml14
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-moco.json35
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml9
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-moco.json18
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml9
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-moco.json54
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml16
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-moco.json42
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml9
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-moco.json18
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml9
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-moco.json25
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml14
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-moco.json35
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml22
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-moco.json205
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-sample.yaml36
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-moco.json137
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml32
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-moco.json55
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml26
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-moco.json21
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml9
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-moco.json18
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml9
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-moco.json44
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml24
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-moco.json35
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml9
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-moco.json18
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml9
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-moco.json43
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml14
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-create-sample-1.1.yaml8
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-delete-sample-1.1.yaml8
-rw-r--r--plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-list-sample-1.1.yaml15
90 files changed, 0 insertions, 3305 deletions
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml
deleted file mode 100644
index 4377332b..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-open_cli_schema_version: 1.0
-name: cloud-create
-description: Create a cloud region in Onap
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-
-parameters:
- - name: cloud-name
- description: Onap cloud name
- type: string
- short_option: x
- long_option: cloud-name
- is_optional: false
- - name: region-name
- description: Onap region name
- type: string
- short_option: y
- long_option: region-name
- is_optional: false
-
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name}
- method: PUT
- body: '{"sriov-automation": false, "cloud-region-id": "${region-name}", "cloud-owner": "${cloud-name}", "new-attribute-for-demo": "blah", "number-attribute-for-demo": 1 }'
- success_codes:
- - 201
- sample_response:
- body: ''
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml
deleted file mode 100644
index c9f7e7a5..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-open_cli_schema_version: 1.0
-name: cloud-delete
-description: Delete a cloud region from Onap
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: cloud-name
- description: Onap cloud name
- type: string
- short_option: x
- long_option: cloud-name
- is_optional: false
- - name: region-name
- description: Onap cloud region name
- type: string
- short_option: y
- long_option: region-name
- is_optional: false
- - name: resource-version
- description: Onap cloud region version
- type: uuid
- short_option: z
- long_option: resource-version
- is_optional: true
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name}?resource-version=${resource-version}
- method: DELETE
- success_codes:
- - 204
- - 404
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
deleted file mode 100644
index 6048e907..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-open_cli_schema_version: 1.0
-name: cloud-list
-description: List the configured clouds and Onap service subscriptions
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-results:
- direction: landscape
- attributes:
- - name: cloud
- description: Onap cloud
- scope: short
- type: string
- - name: region
- description: Onap cloud region
- scope: short
- type: string
- - name: tenant
- description: Onap cloud tenat
- scope: long
- type: string
- - name: tenant-id
- description: Onap cloud tenat id
- scope: long
- type: string
- - name: customer
- description: Onap cloud customer
- scope: long
- type: string
- - name: service
- description: Onap cloud service
- scope: long
- type: string
- - name: resource-version
- description: Onap cloud resource version
- scope: short
- type: string
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/cloud-infrastructure/cloud-regions
- method: GET
- success_codes:
- - 200
- result_map:
- cloud: $b{cloud-region.[*].cloud-owner}
- region: $b{cloud-region.[*].cloud-region-id}
- resource-version: $b{cloud-region.[*].resource-version}
- tenant: $b{cloud-region.[*].tenants.tenant.[*].tenant-name}
- tenant-id: $b{cloud-region.[*].tenants.tenant.[*].tenant-id}
- customer: $b{cloud-region.[*].tenants.tenant.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'customer.global-customer-id')].relationship-value}
- service: $b{cloud-region.[*].tenants.tenant.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'service-subscription.service-type')].relationship-value}
- sample_response:
- body: '{"cloud-region":[{"cloud-owner":"Rackspace","cloud-region-id":"RegionOne","cloud-type":"SharedNode","owner-defined-type":"OwnerType","cloud-region-version":"v1","cloud-zone":"CloudZone","resource-version":"1500729864","tenants":{"tenant":[{"tenant-id":"e69e6d64b44347509c3fc512391f34a6","tenant-name":"onap","resource-version":"1500729865","relationship-list":{"relationship":[{"related-to":"service-subscription","related-link":"https://192.168.17.12:8443/aai/v8/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vFW/","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"Demonstration"},{"relationship-key":"service-subscription.service-type","relationship-value":"vFW"}]},{"related-to":"service-subscription","related-link":"https://192.168.17.12:8443/aai/v8/business/customers/customer/Demonstration123/service-subscriptions/service-subscription/vFW/","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"Demonstration123"},{"relationship-key":"service-subscription.service-type","relationship-value":"vFW"}]},{"related-to":"service-subscription","related-link":"https://192.168.17.12:8443/aai/v8/business/customers/customer/u1/service-subscriptions/service-subscription/vFW/","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"u1"},{"relationship-key":"service-subscription.service-type","relationship-value":"vFW"}]},{"related-to":"service-subscription","related-link":"https://192.168.17.12:8443/aai/v8/business/customers/customer/u2/service-subscriptions/service-subscription/vFW/","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"u2"},{"relationship-key":"service-subscription.service-type","relationship-value":"vFW"}]},{"related-to":"service-subscription","related-link":"https://192.168.17.12:8443/aai/v8/business/customers/customer/DemoCust_7151e36a-1a57-4993-b513-54134f2b8f19/service-subscriptions/service-subscription/vFW/","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"DemoCust_7151e36a-1a57-4993-b513-54134f2b8f19"},{"relationship-key":"service-subscription.service-type","relationship-value":"vFW"}]},{"related-to":"service-subscription","related-link":"https://192.168.17.12:8443/aai/v8/business/customers/customer/Demonstration/service-subscriptions/service-subscription/vLB/","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"Demonstration"},{"relationship-key":"service-subscription.service-type","relationship-value":"vLB"}]},{"related-to":"service-subscription","related-link":"https://192.168.17.12:8443/aai/v8/business/customers/customer/Linan/service-subscriptions/service-subscription/vFW/","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"Linan"},{"relationship-key":"service-subscription.service-type","relationship-value":"vFW"}]},{"related-to":"service-subscription","related-link":"https://192.168.17.12:8443/aai/v8/business/customers/customer/Linan/service-subscriptions/service-subscription/vLB/","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"Linan"},{"relationship-key":"service-subscription.service-type","relationship-value":"vLB"}]}]}}]}}]}'
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml
deleted file mode 100644
index 709e7358..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-open_cli_schema_version: 1.0
-name: customer-create
-description: Create a customer in Onap
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: customer-name
- description: Onap customer name
- type: string
- short_option: x
- long_option: customer-name
- is_optional: false
- - name: subscriber-name
- description: Onap subscriber name
- type: string
- short_option: y
- long_option: subscriber-name
- is_optional: false
-
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/business/customers/customer/${customer-name}
- method: PUT
- body: '{"global-customer-id": "${customer-name}", "subscriber-name": "${subscriber-name}", "subscriber-type": "INFRA"}'
- success_codes:
- - 201
- sample_response:
- body: ''
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml
deleted file mode 100644
index c765dc73..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-open_cli_schema_version: 1.0
-name: customer-delete
-description: Delete a customer from Onap
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: customer-name
- description: Onap customer name
- type: string
- short_option: x
- long_option: customer-name
- is_optional: false
- - name: resource-version
- description: Onap customer resource version
- type: uuid
- short_option: y
- long_option: resource-version
- is_optional: true
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/business/customers/customer/${customer-name}?resource-version=${resource-version}
- method: DELETE
- success_codes:
- - 204
- - 404
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml
deleted file mode 100644
index ca2fd79c..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-open_cli_schema_version: 1.0
-name: customer-list
-description: Lists the registetred customers in Onap
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-results:
- direction: landscape
- attributes:
- - name: name
- description: Onap customer name
- scope: short
- type: string
- - name: resource-version
- description: Onap customer resource version
- scope: short
- type: string
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/business/customers
- method: GET
- success_codes:
- - 200
- result_map:
- name: $b{customer.[*].global-customer-id}
- resource-version: $b{customer.[*].resource-version}
- sample_response:
- body: '{"customer":[{"global-customer-id":"Demonstration","subscriber-name":"Demonstration","subscriber-type":"INFRA","resource-version":"1500729865","service-subscriptions":{"service-subscription":[{"service-type":"vFW","resource-version":"1500729865","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}},{"service-type":"vLB","resource-version":"1500729865","service-instances":{"service-instance":[{"service-instance-id":"d6167ea1-ff83-4236-9b32-37494dfb7537","service-instance-name":"demoVLB-1","persona-model-id":"af01a849-721b-407d-a880-be836e26ee81","persona-model-version":"1.0","resource-version":"1501154574","relationship-list":{"relationship":[{"related-to":"generic-vnf","related-link":"https://192.168.17.12:8443/aai/v8/network/generic-vnfs/generic-vnf/16c6d95d-44e3-4527-aa63-a495bf8e776e/","relationship-data":[{"relationship-key":"generic-vnf.vnf-id","relationship-value":"16c6d95d-44e3-4527-aa63-a495bf8e776e"}],"related-to-property":[{"property-key":"generic-vnf.vnf-name","property-value":"demoVLB-1-VNF-1"}]}]}}]},"relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}}]}},{"global-customer-id":"Linan","subscriber-name":"Linan","subscriber-type":"INFRA","resource-version":"1501768482","service-subscriptions":{"service-subscription":[{"service-type":"vFW","resource-version":"1501768482","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}},{"service-type":"vLB","resource-version":"1501768482","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}}]}},{"global-customer-id":"DemoCust_7151e36a-1a57-4993-b513-54134f2b8f19","subscriber-name":"DemoCust_7151e36a-1a57-4993-b513-54134f2b8f19","subscriber-type":"INFRA","resource-version":"1501766760","service-subscriptions":{"service-subscription":[{"service-type":"vFW","resource-version":"1501766760","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}}]}}]}' \ No newline at end of file
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml
deleted file mode 100644
index f8cb93d0..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-open_cli_schema_version: 1.0
-name: customer-show
-description: Lists the registetred customers in Onap
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: customer-name
- description: Onap customer name
- type: string
- short_option: x
- long_option: customer-name
- is_optional: false
-
-results:
- direction: landscape
- attributes:
- - name: name
- description: Onap customer name
- scope: short
- type: string
- - name: subscriber-name
- description: Onap subscriber name
- scope: short
- type: string
- - name: resource-version
- description: Onap subscriber resource version
- scope: long
- type: string
- - name: subscriber-type
- description: Onap subscriber type
- scope: long
- type: string
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/business/customers/customer/${customer-name}
- method: GET
- success_codes:
- - 200
- result_map:
- name: $b{$.global-customer-id}
- subscriber-name: $b{$.subscriber-name}
- subscriber-type: $b{$.subscriber-type}
- resource-version: $b{$.resource-version}
- sample_response:
- body: '{"global-customer-id":"Linan","subscriber-name":"Linan","subscriber-type":"INFRA","resource-version":"1501768482","service-subscriptions":{"service-subscription":[{"service-type":"vFW","resource-version":"1501768482","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}},{"service-type":"vLB","resource-version":"1501768482","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"https://192.168.17.12:8443/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/RegionOne/tenants/tenant/e69e6d64b44347509c3fc512391f34a6/","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"Rackspace"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"RegionOne"},{"relationship-key":"tenant.tenant-id","relationship-value":"e69e6d64b44347509c3fc512391f34a6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"onap"}]}]}}]}}'
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml
deleted file mode 100644
index bd00aee8..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: ems-register
-
-description: Register a EMS in Onap
-
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: ems-id
- description: Onap EMS unique id
- type: uuid
- short_option: z
- long_option: ems-id
- is_optional: false
- - name: name
- description: Onap EMS name
- type: string
- short_option: b
- long_option: name
- is_optional: false
- - name: type
- description: Onap EMS type
- type: string
- short_option: c
- long_option: type
- is_optional: false
- - name: vendor
- description: Onap EMS vendor
- type: string
- short_option: e
- long_option: vendor
- is_optional: false
- - name: ems-version
- description: Onap EMS version
- type: string
- short_option: q
- long_option: ems-version
- is_optional: false
- - name: url
- description: Onap EMS URL
- type: string
- short_option: g
- long_option: url
- is_optional: false
- - name: username
- description: Onap EMS username
- type: string
- short_option: i
- long_option: username
- is_optional: false
- - name: password
- description: Onap EMS password
- type: string
- short_option: j
- long_option: password
- is_optional: false
- - name: remote-path
- description: Onap EMS remote-path
- type: string
- short_option: x
- long_option: remote-path
- is_optional: false
-
-http:
- service:
- auth: basic
- mode: direct
- request:
- 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:
- - 201
- sample_response:
- body: ''
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
deleted file mode 100644
index 140dfc9e..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: ems-unregister
-
-description: Un-register a EMS in Onap
-
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: ems-id
- description: Onap EMS unique id
- type: uuid
- short_option: x
- long_option: ems-id
- is_optional: false
- - name: resource-version
- description: Onap vim resource version
- type: string
- short_option: y
- long_option: resource-version
- is_optional: true
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/external-system/esr-ems-list/esr-ems/${ems-id}?resource-version=${resource-version}
- method: DELETE
-
- success_codes:
- - 204
- - 404
-
- sample_response:
- body: ''
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml
deleted file mode 100644
index 244d6aec..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: ems-list
-
-description: List the configured ems
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-results:
- direction: landscape
- attributes:
- - name: ems-id
- description: Onap ems id
- scope: short
- type: string
- - name: resource-version
- description: Onap ems resource version
- scope: short
- type: string
-
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/external-system/esr-ems-list
- method: GET
- success_codes:
- - 200
- result_map:
- ems-id: $b{$.esr-ems.[*].ems-id}
- 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/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml
deleted file mode 100644
index 6c511602..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: ems-show
-
-description: Show the details of configured ems
-
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-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:
- service:
- auth: basic
- mode: direct
- 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/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
deleted file mode 100644
index 58b14ac5..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
+++ /dev/null
@@ -1,98 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: sdnc-register
-
-description: Register a SDNC in Onap
-
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: location
- description: Onap VIM unique id
- type: uuid
- short_option: x
- long_option: location
- is_optional: false
- - name: sdnc-id
- description: Onap SDNC unique id
- type: uuid
- short_option: y
- long_option: sdnc-id
- is_optional: false
- - name: name
- description: Onap SDNC name
- type: string
- short_option: b
- long_option: name
- is_optional: false
- - name: type
- description: Onap SDNC type
- type: string
- short_option: c
- long_option: type
- is_optional: false
- - name: vendor
- description: Onap SDNC vendor
- type: string
- short_option: e
- long_option: vendor
- is_optional: false
- - name: sdnc-version
- description: Onap SDNC version
- type: string
- short_option: q
- long_option: sdnc-version
- is_optional: false
- - name: ip-address
- description: Onap SDNC ip address
- type: string
- short_option: g
- long_option: ip-address
- is_optional: false
- - name: port
- description: Onap SDNC port
- type: string
- short_option: k
- long_option: port
- is_optional: false
- - name: protocal
- description: Onap SDNC protocal
- type: string
- short_option: r
- long_option: protocal
- is_optional: false
- - name: username
- description: Onap SDNC username
- type: string
- short_option: i
- long_option: username
- is_optional: false
- - name: password
- description: Onap SDNC password
- type: string
- short_option: j
- long_option: password
- is_optional: false
- - name: product-name
- description: Onap SDNC product-name
- type: string
- short_option: z
- long_option: product-name
- is_optional: false
-
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/${sdnc-id}
- method: PUT
- body: '{"thirdparty-sdnc-id":"${sdnc-id}","location":"${location}","product-name":"${product-name}","esr-system-info-list":{"esr-system-info":[{"esr-system-info-id":"${sdnc-id}","system-name":"${name}","type":"${type}","vendor":"${vendor}","version":"${sdnc-version}","service-url":"","user-name":"${username}","password":"${password}","system-type":"sdnc","protocal":"${protocal}","ssl-cacert":"","ssl-insecure":"","ip-address":"${ip-address}","port":"${port}","cloud-domain":"","default-tenant":""}]}}'
- success_codes:
- - 201
- sample_response:
- body: ''
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
deleted file mode 100644
index f8fb4943..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: sdnc-unregister
-
-description: Un-register a VNFM in Onap
-
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: sdnc-id
- description: Onap VNFM unique id
- type: string
- short_option: x
- long_option: sdnc-id
- is_optional: false
-
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/${sdnc-id}
- method: DELETE
-
- success_codes:
- - 201
- - 404
-
- sample_response:
- body: ''
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
deleted file mode 100644
index fd17c14e..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: sdnc-list
-
-description: List the configured sdnc
-
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-results:
- direction: landscape
- attributes:
- - name: sdnc-id
- description: Onap sdnc id
- scope: short
- type: string
- - name: resource-version
- description: Onap sdnc resource version
- scope: short
- type: string
-
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/external-system/esr-sdnc-list
- method: GET
- success_codes:
- - 200
- result_map:
- sdnc-id: $b{$.esr-sdnc.[*].sdnc-id}
- resource-version: $b{$.esr-sdnc.[*].resource-version}
-
- sample_response:
- body: '{"esr-sdnc":[{"sdnc-id":"example-sdnc-id-val-36878","location":"location","product-name":"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":"sdnc","protocal":"","ssl-cacert":"","ssl-insecure":false,"ip-address":"","port":"","cloud-domain":"","default-tenant":""}]}}]}'
-
-
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml
deleted file mode 100644
index 877940aa..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml
+++ /dev/null
@@ -1,109 +0,0 @@
-open_cli_schema_version: 1.0
-name: vim-register
-description: Register a VIM under a given cloud region in Onap
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: cloud-name
- description: Onap cloud name
- type: string
- short_option: x
- long_option: cloud-name
- is_optional: false
- - name: region-name
- description: Onap region name
- type: string
- short_option: y
- long_option: region-name
- is_optional: false
- - name: vim-id
- description: Onap VIM unique id
- type: uuid
- short_option: z
- long_option: vim-id
- is_optional: false
- - name: name
- description: Onap VIM name
- type: string
- short_option: b
- long_option: name
- is_optional: false
- - name: type
- description: Onap VIM type
- type: string
- short_option: c
- long_option: type
- is_optional: false
- - name: vendor
- description: Onap VIM vendor
- type: string
- short_option: e
- long_option: vendor
- is_optional: false
- - name: vim-version
- description: Onap VIM version
- type: string
- short_option: q
- long_option: vim-version
- is_optional: false
- - name: url
- description: Onap VIM URL
- type: string
- short_option: g
- long_option: url
- is_optional: false
- - name: username
- description: Onap VIM username
- type: string
- short_option: i
- long_option: username
- is_optional: false
- - name: password
- description: Onap VIM password
- type: string
- short_option: j
- long_option: password
- is_optional: false
- - name: ssl-cacert
- description: Onap VIM SSL certificate
- type: text
- short_option: k
- long_option: ssl-cacert
- is_optional: true
- - name: ssl-insecure
- description: Onap VIM insecure
- type: bool
- short_option: l
- long_option: ssl-insecure
- is_optional: true
- default: false
- - name: cloud-domain
- description: Onap VIM cloud domain
- type: string
- short_option: n
- long_option: cloud-domain
- is_optional: false
- default: default
- - name: default-tenant
- description: Onap VIM default tenant
- type: string
- short_option: o
- long_option: default-tenant
- is_optional: false
-
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name}/esr-system-info-list/esr-system-info/${vim-id}
- method: PUT
- body: '{"esr-system-info-id":"${vim-id}","system-name":"${name}","type":"${type}","vendor":"${vendor}","version":"${vim-version}","service-url":"${url}","user-name":"${username}","password":"${password}","system-type":"vim","protocal":"","ssl-cacert":"${ssl-cacert}","ssl-insecure":"${ssl-insecure}","ip-address":"","port":"","cloud-domain":"${cloud-domain}","default-tenant":"${default-tenant}"}'
- success_codes:
- - 201
- sample_response:
- body: ''
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
deleted file mode 100644
index 2ecc868e..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: vim-unregister
-
-description: Un-register a VIM under from cloud region in Onap
-
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: cloud-name
- description: Onap cloud name
- type: string
- short_option: x
- long_option: cloud-name
- is_optional: false
- - name: region-name
- description: Onap region name
- type: string
- short_option: y
- long_option: region-name
- is_optional: false
- - name: vim-id
- description: Onap VIM unique id
- type: uuid
- short_option: z
- long_option: vim-id
- is_optional: false
- - name: resource-version
- description: Onap vim resource version
- type: string
- short_option: b
- long_option: resource-version
- is_optional: true
-
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name}/esr-system-info-list/esr-system-info/${vim-id}?resource-version=${resource-version}
- method: DELETE
-
- success_codes:
- - 204
- - 404
-
- sample_response:
- body: ''
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml
deleted file mode 100644
index 3624824a..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: vim-list
-
-description: List the configured vims
-
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: cloud-name
- description: Onap cloud name
- type: string
- short_option: x
- long_option: cloud-name
- is_optional: false
- - name: region-name
- description: Onap region name
- type: string
- short_option: y
- long_option: region-name
- is_optional: false
-
-results:
- direction: landscape
- attributes:
- - name: vim-id
- description: Onap vim id
- scope: short
- type: string
- - name: name
- description: Onap vim name
- scope: short
- type: string
- - name: type
- description: Onap vim type
- scope: long
- type: string
- - name: vendor
- description: Onap vim vendor
- scope: short
- type: string
- - name: version
- description: Onap vim version
- scope: long
- type: string
- - name: url
- description: Onap vim url
- scope: long
- type: string
- - name: username
- description: Onap vim username
- scope: long
- type: string
- - name: cloud-domain
- description: Onap vim cloud domain
- scope: long
- type: string
- - name: default-tenant
- description: Onap vim tenant
- scope: short
- type: string
- - name: resource-version
- description: Onap vim resource version
- scope: short
- type: string
-
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name}/esr-system-info-list
- method: GET
- success_codes:
- - 200
- result_map:
- vim-id: $b{$.esr-system-info.[*].esr-system-info-id}
- name: $b{$.esr-system-info.[*].system-name}
- type: $b{$.esr-system-info.[*].type}
- vendor: $b{$.esr-system-info.[*].vendor}
- version: $b{$.esr-system-info.[*].version}
- url: $b{$.esr-system-info.[*].service-url}
- username: $b{$.esr-system-info.[*].user-name}
- cloud-domain: $b{$.esr-system-info.[*].cloud-domain}
- default-tenant: $b{$.esr-system-info.[*].default-tenant}
- resource-version: $b{$.esr-system-info.[*].resource-version}
-
- sample_response:
- body: '{esr-system-info":[{"esr-system-info-id":"example-esr-system-info-id-val-62966","system-name":"example-system-name-val-76894","type":"example-type-val-32301","vendor":"example-vendor-val-38139","version":"example-version-val-42345","service-url":"example-service-url-val-33729","user-name":"example-user-name-val-32122","password":"example-password-val-56539","system-type":"example-system-type-val-80707","protocal":"example-protocal-val-30105","ssl-cacert":"example-ssl-cacert-val-52110","ssl-insecure":true,"ip-address":"example-ip-address-val-10140","port":"example-port-val-26369","cloud-domain":"example-cloud-domain-val-22303","default-tenant":"example-default-tenant-val-26326"}]}'
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
deleted file mode 100644
index 71ea1b8f..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
+++ /dev/null
@@ -1,86 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: vnfm-register
-
-description: Register a VNFM in Onap
-
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: vim-id
- description: Onap VIM unique id
- type: uuid
- short_option: x
- long_option: vim-id
- is_optional: false
- - name: vnfm-id
- description: Onap VNFM unique id
- type: uuid
- short_option: y
- long_option: vnfm-id
- is_optional: false
- - name: name
- description: Onap VNFM name
- type: string
- short_option: b
- long_option: name
- is_optional: false
- - name: type
- description: Onap VNFM type
- type: string
- short_option: c
- long_option: type
- is_optional: false
- - name: vendor
- description: Onap VNFM vendor
- type: string
- short_option: e
- long_option: vendor
- is_optional: false
- - name: vnfm-version
- description: Onap VNFM version
- type: string
- short_option: q
- long_option: vnfm-version
- is_optional: false
- - name: url
- description: Onap VNFM URL
- type: string
- short_option: g
- long_option: url
- is_optional: false
- - name: username
- description: Onap VNFM username
- type: string
- short_option: i
- long_option: username
- is_optional: false
- - name: password
- description: Onap VNFM password
- type: string
- short_option: j
- long_option: password
- is_optional: false
- - name: certificate-url
- description: Onap VNFM certificate-url
- type: string
- short_option: z
- long_option: certificate-url
- is_optional: true
-
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/external-system/esr-vnfm-list/esr-vnfm/${vnfm-id}
- method: PUT
- body: '{"vnfm-id":"${vnfm-id}","vim-id":"${vim-id}","certificate-url":"${certificate-url}","esr-system-info-list":{"esr-system-info":[{"esr-system-info-id":"${vnfm-id}","system-name":"${name}","type":"${type}","vendor":"${vendor}","version":"${vnfm-version}","service-url":"${url}","user-name":"${username}","password":"${password}","system-type":"vnfm","protocal":"","ssl-cacert":"","ssl-insecure":"","ip-address":"","port":"","cloud-domain":"","default-tenant":""}]}}'
- success_codes:
- - 201
- sample_response:
- body: ''
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
deleted file mode 100644
index 449a2f5d..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: vnfm-unregister
-
-description: Un-register a VNFM in Onap
-
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: vnfm-id
- description: Onap VNFM unique id
- type: uuid
- short_option: x
- long_option: vnfm-id
- is_optional: false
- - name: resource-version
- description: Onap vim resource version
- type: string
- short_option: y
- long_option: resource-version
- is_optional: true
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/external-system/esr-vnfm-list/esr-vnfm/${vnfm-id}?resource-version=${resource-version}
- method: DELETE
-
- success_codes:
- - 204
- - 404
-
- sample_response:
- body: ''
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
deleted file mode 100644
index d63e10b5..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: vnfm-list
-
-description: List the configured vnfm
-
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-results:
- direction: landscape
- attributes:
- - name: vnfm-id
- description: Onap vnfm id
- scope: short
- type: string
- - name: vim-id
- description: Onap vnfm id
- scope: short
- type: string
- - name: certificate-url
- description: Onap vnfm certificate-url
- scope: short
- type: string
- - name: resource-version
- description: Onap vnfm resource version
- scope: short
- type: string
-
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/external-system/esr-vnfm-list
- method: GET
- success_codes:
- - 200
- result_map:
- vnfm-id: $b{$.esr-vnfm.[*].vnfm-id}
- vim-id: $b{$.esr-vnfm.[*].vim-id}
- certificate-url: $b{$.esr-vnfm.[*].certificate-url}
- resource-version: $b{$.esr-vnfm.[*].resource-version}
-
- sample_response:
- body: '{"esr-vnfm":[{"vnfm-id":"example-vnfm-id-val-36878","vim-id":"vim-id","certificate-url":"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":"vnfm","protocal":"","ssl-cacert":"","ssl-insecure":false,"ip-address":"","port":"","cloud-domain":"","default-tenant":""}]}}]}'
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml
deleted file mode 100644
index 241e4b14..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml
+++ /dev/null
@@ -1,68 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: vnfm-show
-
-description: Show the VNFM in Onap
-
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: vnfm-id
- description: Onap VNFM unique id
- type: uuid
- short_option: x
- long_option: vnfm-id
- is_optional: false
-
-results:
- direction: portrait
- attributes:
- - name: name
- description: Onap vnfm name
- scope: short
- type: string
- - name: type
- description: Onap vnfm type
- scope: short
- type: string
- - name: vendor
- description: Onap vnfm vendor
- scope: short
- type: string
- - name: version
- description: Onap vnfm version
- scope: short
- type: string
- - name: url
- description: Onap vnfm url
- scope: short
- type: string
- - name: username
- description: Onap vnfm username
- scope: long
- type: string
-
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/external-system/esr-vnfm-list/esr-vnfm/${vnfm-id}/esr-system-info-list/esr-system-info/${vnfm-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: ''
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml
deleted file mode 100644
index 10e058d6..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/service-list-schema-1.1.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-list
-description: List created service instance
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-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:
- service:
- name: aai
- version: v11
- auth: basic
- mode: direct
-
- 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/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/vf-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/vf-list-schema-1.1.yaml
deleted file mode 100644
index adb238c0..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/vf-list-schema-1.1.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
-open_cli_schema_version: 1.0
-name: vf-list
-description: List created VF instances for a service instance
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-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:
- service:
- name: aai
- version: v11
- auth: basic
- mode: direct
-
- 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/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/vf-show-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/vf-show-schema-1.1.yaml
deleted file mode 100644
index 95463354..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-instance/vf-show-schema-1.1.yaml
+++ /dev/null
@@ -1,69 +0,0 @@
-open_cli_schema_version: 1.0
-name: vf-show
-description: Show details for VF
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-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:
- service:
- name: aai
- version: v11
- auth: basic
- mode: direct
-
- 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/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml
deleted file mode 100644
index 5475ce38..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-type-create
-description: Add a service type in Onap
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-parameters:
- - name: service-type
- description: Onap service type
- type: string
- short_option: x
- long_option: service-type
- is_optional: false
- - name: service-type-id
- description: Onap service type uuid
- type: uuid
- short_option: y
- long_option: service-type-id
- is_optional: true
-
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/service-design-and-creation/services/service/${service-type-id}
- method: PUT
- body: '{"service-description": "${service-type}", "service-id": "${service-type-id}"}'
- success_codes:
- - 201
- sample_response:
- body: ''
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml
deleted file mode 100644
index 2c1f1af8..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-type-delete
-description: Delete a service type from Onap
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: service-type-id
- description: Onap service type uuid
- type: uuid
- short_option: x
- long_option: service-type-id
- is_optional: true
- - name: resource-version
- description: Onap service resource version
- type: uuid
- short_option: y
- long_option: resource-version
- is_optional: true
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/service-design-and-creation/services/service/${service-type-id}?resource-version=${resource-version}
- queries:
- resource-version: ${resource-version}
- method: DELETE
- success_codes:
- - 204
- - 404
- sample_response:
- body: ''
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml
deleted file mode 100644
index 747d7c11..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-type-list
-description: List the service types configured in Onap
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-results:
- direction: landscape
- attributes:
- - name: service-type-id
- description: Onap cloud service
- scope: short
- type: string
- - name: service-type
- description: Onap cloud service
- scope: short
- type: string
- - name: resource-version
- description: Onap cloud service resource version
- scope: short
- type: string
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/service-design-and-creation/services
- method: GET
- success_codes:
- - 200
- result_map:
- service-type: $b{service.[*].service-description}
- service-type-id: $b{service.[*].service-id}
- resource-version: $b{service.[*].resource-version}
- sample_response:
- body: '{"service":[{"service-id":"db3403eb-5c94-4295-bb00-a9dba8964ab3","service-description":"vFW","resource-version":"1500729865"},{"service-id":"33737156-ff09-4b3d-884a-fe9a372afa4e","service-description":"vLB","resource-version":"1500729866"}]}'
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml
deleted file mode 100644
index ddf6a579..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml
+++ /dev/null
@@ -1,54 +0,0 @@
-open_cli_schema_version: 1.0
-name: subscription-create
-description: Create a subscription of a customer for given service in specific cloud region in Onap
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: customer-name
- description: Onap customer name
- type: string
- short_option: x
- long_option: customer-name
- is_optional: false
- - name: cloud-name
- description: Onap cloud name
- type: string
- short_option: z
- long_option: cloud-name
- is_optional: false
- - name: cloud-region
- description: Onap cloud region
- type: string
- short_option: r
- long_option: cloud-region
- is_optional: false
- - name: cloud-tenant-id
- description: Onap cloud tenant id
- type: string
- short_option: c
- long_option: cloud-tenant-id
- is_optional: false
- - name: service-type
- description: Onap service type
- type: string
- short_option: e
- long_option: service-type
- is_optional: false
-
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/business/customers/customer/${customer-name}/service-subscriptions/service-subscription/${service-type}
- method: PUT
- body: '{"relationship-list":{"relationship":[{"related-to":"tenant","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"${cloud-name}"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"${cloud-region}"},{"relationship-key":"tenant.tenant-id","relationship-value":"${cloud-tenant-id}"}]}]},"service-type":"${service-type}"}'
- success_codes:
- - 200
- - 201
- sample_response:
- body: ''
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml
deleted file mode 100644
index c20862ad..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,41 +0,0 @@
-open_cli_schema_version: 1.0
-name: subscription-delete
-description: Delete the subscription for a given customer in Onap
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: customer-name
- description: Onap customer name
- type: string
- short_option: x
- long_option: customer-name
- is_optional: false
- - name: service-type
- description: Onap subscribtion id
- type: string
- short_option: y
- long_option: service-type
- is_optional: false
- - name: resource-version
- description: Onap subscription resource version
- type: string
- short_option: g
- long_option: resource-version
- is_optional: true
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11//business/customers/customer/${customer-name}/service-subscriptions/service-subscription/${service-type}?resource-version=${resource-version}
- method: DELETE
- success_codes:
- - 204
- - 404
-
-
-
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml
deleted file mode 100644
index 7938c090..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml
+++ /dev/null
@@ -1,62 +0,0 @@
-open_cli_schema_version: 1.0
-name: subscription-list
-description: Lists the subscription for a given customer in Onap
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: customer-name
- description: Onap customer name
- type: string
- short_option: x
- long_option: customer-name
- is_optional: false
-
-results:
- direction: landscape
- attributes:
- - name: service-type
- description: Onap service type
- scope: short
- type: string
- - name: resource-version
- description: Onap subscription resource version
- scope: short
- type: string
- - name: tenant
- description: Onap tenant name
- scope: long
- type: string
- - name: region
- description: Onap region name
- scope: long
- type: string
- - name: cloud
- description: Onap cloud name
- scope: long
- type: string
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/business/customers/customer/${customer-name}/service-subscriptions
- method: GET
- success_codes:
- - 200
- result_map:
- service-type: $b{$.service-subscription.[*].service-type}
- resource-version: $b{$.service-subscription.[*].resource-version}
- tenant: $b{service-subscription.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'tenant.tenant-id')].relationship-value}
- region: $b{service-subscription.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'cloud-region.cloud-region-id')].relationship-value}
- cloud: $b{service-subscription.[*].relationship-list.relationship.[*].relationship-data.[?(@.relationship-key == 'cloud-region.cloud-owner')].relationship-value}
-
- sample_response:
- body: '{"service-subscription":[{"service-type":"vTest","resource-version":"1504091375183","relationship-list":{"relationship":[{"related-to":"tenant","related-link":"/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant/26ab7af6-96cc-4c4e-814a-e533af4ef9f6","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"att-aic"},{"relationship-key":"cloud-region.cloud-region-id","relationship-value":"AAIAIC25"},{"relationship-key":"tenant.tenant-id","relationship-value":"26ab7af6-96cc-4c4e-814a-e533af4ef9f6"}],"related-to-property":[{"property-key":"tenant.tenant-name","property-value":"test"}]}]}}]}'
-
-
-
-
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml
deleted file mode 100644
index f10dde93..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-open_cli_schema_version: 1.0
-name: tenant-create
-description: Create a tenant under given cloud region in Onap
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: cloud
- description: Onap cloud
- type: string
- short_option: x
- long_option: cloud
- is_optional: false
- - name: region
- description: Onap cloud region
- type: string
- short_option: y
- long_option: region
- is_optional: false
- - name: tenant-id
- description: Onap cloud tenant id
- type: string
- short_option: z
- long_option: tenant-id
- is_optional: false
- - name: tenant-name
- description: Onap cloud tenant name
- type: string
- short_option: r
- long_option: tenant-name
- is_optional: false
-
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud}/${region}/tenants/tenant/${tenant-id}
- method: PUT
- body: '{"tenant-id": "${tenant-id}", "tenant-name": "${tenant-name}"}'
- success_codes:
- - 200
- - 201
- sample_response:
- body: ''
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml
deleted file mode 100644
index 000ca852..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,45 +0,0 @@
-open_cli_schema_version: 1.0
-name: tenant-delete
-description: Delete tenant under given cloud region in Onap
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: cloud
- description: Onap cloud
- type: string
- short_option: x
- long_option: cloud
- is_optional: false
- - name: region
- description: Onap cloud region
- type: string
- short_option: y
- long_option: region
- is_optional: false
- - name: tenant-id
- description: Onap cloud tenant id
- type: string
- short_option: z
- long_option: tenant-id
- is_optional: false
- - name: resource-version
- description: Onap cloud tenant version
- type: uuid
- short_option: r
- long_option: resource-version
- is_optional: true
-
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud}/${region}/tenants/tenant/${tenant-id}?resource-version=${resource-version}
- method: DELETE
- success_codes:
- - 204
- - 404
diff --git a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml
deleted file mode 100644
index c30dacd6..00000000
--- a/plugins/onap-amsterdam/features/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-open_cli_schema_version: 1.0
-name: tenant-list
-description: Lists the tenants under given cloud region in Onap
-
-info:
- product: onap-amsterdam
- service: aai
- author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
- - name: cloud
- description: Onap cloud
- type: string
- short_option: x
- long_option: cloud
- is_optional: false
- - name: region
- description: Onap cloud region
- type: string
- short_option: y
- long_option: region
- is_optional: false
-
-results:
- direction: landscape
- attributes:
- - name: tenant-id
- description: Onap tenant-id
- scope: short
- type: string
- - name: tenant-name
- description: Onap tenant name
- scope: short
- type: string
- - name: resource-version
- description: Onap tenant resource version
- scope: short
- type: string
-http:
- service:
- auth: basic
- mode: direct
- request:
- uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud}/${region}/tenants
- method: GET
- success_codes:
- - 200
- result_map:
- tenant-id: $b{$.tenant.[*].tenant-id}
- tenant-name: $b{$.tenant.[*].tenant-name}
- resource-version: $b{$.tenant.[*].resource-version}
- sample_response:
- body: '{"tenant":[{"tenant-id":"26ab7af6-96cc-4c4e-814a-e533af4ef9f6","tenant-name":"test","resource-version":"1504091074807","relationship-list":{"relationship":[{"related-to":"service-subscription","related-link":"/aai/v11/business/customers/customer/customer-2/service-subscriptions/service-subscription/vTest","relationship-data":[{"relationship-key":"customer.global-customer-id","relationship-value":"customer-2"},{"relationship-key":"service-subscription.service-type","relationship-value":"vTest"}]}]}}]}'
-
-
-
-
diff --git a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json
deleted file mode 100644
index 223ebd26..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml
deleted file mode 100644
index 3d032ec8..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-open_cli_sample_version: 1.0
-name: cloud-create
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json
deleted file mode 100644
index 85094a9d..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml
deleted file mode 100644
index 711f1410..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-open_cli_sample_version: 1.0
-name: cloud-delete
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json
deleted file mode 100644
index 2e5b1db0..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml
deleted file mode 100644
index d16c858d..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-open_cli_sample_version: 1.0
-name: cloud-list
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-moco.json
deleted file mode 100644
index 18bb05d7..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-sample.yaml
deleted file mode 100644
index f1530e30..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-create-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-open_cli_sample_version: 1.0
-name: customer-create
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-moco.json
deleted file mode 100644
index 26e8a918..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-sample.yaml
deleted file mode 100644
index 6633f356..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-delete-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-open_cli_sample_version: 1.0
-name: customer-delete
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-moco.json
deleted file mode 100644
index f7737271..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-sample.yaml
deleted file mode 100644
index 023a6209..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-list-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-open_cli_sample_version: 1.0
-name: customer-list
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-moco.json
deleted file mode 100644
index 242db8c1..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-sample.yaml
deleted file mode 100644
index 50fab324..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/customer/customer-show-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-open_cli_sample_version: 1.0
-name: customer-show
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-moco.json
deleted file mode 100644
index 639f3581..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml
deleted file mode 100644
index 0af19bb5..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-name: ems-register
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json
deleted file mode 100644
index 9adbf83d..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml
deleted file mode 100644
index f0d210e7..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-name: ems-unregister
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-moco.json
deleted file mode 100644
index b3b4738c..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml
deleted file mode 100644
index 79558757..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-open_cli_sample_version: 1.0
-name: ems-list
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-moco.json
deleted file mode 100644
index b6ac827d..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml
deleted file mode 100644
index e4355b1b..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-open_cli_sample_version: 1.0
-name: ems-show
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-moco.json
deleted file mode 100644
index 01ff5088..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml
deleted file mode 100644
index a2f9b009..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-create-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-name: vim-register
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-moco.json
deleted file mode 100644
index 4b5f43d3..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml
deleted file mode 100644
index e325d4c4..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-delete-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-name: vim-unregister
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-moco.json
deleted file mode 100644
index c9d425b3..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml
deleted file mode 100644
index fcb44ee6..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vim/vim-list-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-open_cli_sample_version: 1.0
-name: vim-list
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-moco.json
deleted file mode 100644
index b5091ecc..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml
deleted file mode 100644
index b9d8ab10..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-name: vnfm-register
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-moco.json
deleted file mode 100644
index 01248fc7..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml
deleted file mode 100644
index 8ed8159d..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-name: vnfm-unregister
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-moco.json
deleted file mode 100644
index 246f2dd2..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml
deleted file mode 100644
index 5ea9cfd0..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-open_cli_sample_version: 1.0
-name: vnfm-list
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-moco.json
deleted file mode 100644
index 1b34db2f..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml
deleted file mode 100644
index 76acd620..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,22 +0,0 @@
-open_cli_sample_version: 1.0
-name: vnfm-show
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-moco.json
deleted file mode 100644
index e9a1d529..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-sample.yaml
deleted file mode 100644
index 4ff87fbf..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/service-list-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-open_cli_sample_version: 1.0
-name: service-list
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-moco.json
deleted file mode 100644
index 096b5992..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml
deleted file mode 100644
index 46877883..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-list-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-open_cli_sample_version: 1.0
-name: vf-list
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-moco.json
deleted file mode 100644
index 3d697e03..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml
deleted file mode 100644
index 97b12cd8..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-instance/vf-show-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-open_cli_sample_version: 1.0
-name: vf-show
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-moco.json
deleted file mode 100644
index d41ec6e3..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml
deleted file mode 100644
index 33cb278a..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-create-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-name: service-type-create
-version: onap-amsterdam
-samples:
- sample1:
- name: service-type-create
- input: --service-type test
- moco: service-type-create-schema-1.1-moco.json
- output:
diff --git a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-moco.json
deleted file mode 100644
index 682d32f1..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml
deleted file mode 100644
index a95f289d..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-delete-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-name: service-type-delete
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-moco.json
deleted file mode 100644
index 337d445e..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml
deleted file mode 100644
index 59affec0..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/service-type/service-type-list-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,24 +0,0 @@
-open_cli_sample_version: 1.0
-name: service-type-list
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-moco.json
deleted file mode 100644
index 0839ead0..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml
deleted file mode 100644
index f817e377..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-name: subscription-create
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-moco.json
deleted file mode 100644
index 302ea818..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml
deleted file mode 100644
index da9b6491..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-name: subscription-delete
-version: onap-amsterdam
-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-moco.json b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-moco.json
deleted file mode 100644
index 9565db34..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-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/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml
deleted file mode 100644
index 5739cc82..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-open_cli_sample_version: 1.0
-name: subscription-list
-version: onap-amsterdam
-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 |
- +--------------+------------------+
diff --git a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-create-sample-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-create-sample-1.1.yaml
deleted file mode 100644
index 64cb9853..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-create-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-open_cli_sample_version: 1.0
-
-name: tenant-create
-version: onap-amsterdam
-samples:
- sample1:
- name: Create a tenant under given cloud region
- input: -h https://locahost:8443 -u AAI -p AAI -x abc-xyz -y ABCXYZ25 -z 8bcf4466-b092-473f-889b-7f40efb5a323 -r tenant-3
diff --git a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-delete-sample-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-delete-sample-1.1.yaml
deleted file mode 100644
index 3da7762a..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-delete-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-open_cli_sample_version: 1.0
-
-name: tenant-delete
-version: onap-amsterdam
-samples:
- sample1:
- name: Delete the tenant under given cloud region
- input: -h https://locahost:8443 -u AAI -p AAI -x abc-xyz -y ABCXYZ25 -z 8bcf4466-b092-473f-889b-7f40efb5a323 -r 1504258015611
diff --git a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-list-sample-1.1.yaml b/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-list-sample-1.1.yaml
deleted file mode 100644
index 36730547..00000000
--- a/plugins/onap-amsterdam/features/aai/src/test/resources/open-cli-sample/tenant/tenant-list-sample-1.1.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-open_cli_sample_version: 1.0
-
-name: tenant-list
-version: onap-amsterdam
-samples:
- sample1:
- name: List the tenant under given cloud region in onap
- input: -h https://locahost:8443 -u AAI -p AAI -x abc-xyz -y ABCXYZ25
- output: |
- +--------------------------------------+--------------+------------------+
- |tenant-id |tenant-name |resource-version |
- +--------------------------------------+--------------+------------------+
- |8bcf4466-b092-473f-889b-7f40efb5a323 |tenant-3 |1504258015611 |
- +--------------------------------------+--------------+------------------+
-