Re-org plugins into tree of product versions

Issue-Id: CLI-66

Change-Id: I2591bc380387200f727aae7e5db851a3c3a19fc3
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

44 files changed, 0 insertions, 2009 deletions

diff --git a/plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml
deleted file mode 100644
index 8657ae14..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-open_cli_schema_version: 1.0
-name: cloud-create
-description: Create a cloud region in Onap
-version: onap-1.1
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml
deleted file mode 100644
index 5575f7f7..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-open_cli_schema_version: 1.0
-name: cloud-delete
-description: Delete a cloud region from Onap
-version: onap-1.1
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
deleted file mode 100644
index c9fd5368..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
+++ /dev/null
@@ -1,57 +0,0 @@
-open_cli_schema_version: 1.0
-name: cloud-list
-description: List the configured clouds and Onap service subscriptions
-version: onap-1.1
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema.yaml b/plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema.yaml
deleted file mode 100644
index 10a7e954..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-open_cli_schema_version: 1.0
-name: cloud-list
-description: List the configured clouds and Onap service subscriptions
-version: onap-1.0
-service:
-  name: aai
-  version: v8
-  auth: basic
-  mode: direct
-
-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: short
-      type: string
-    - name: tenant-id
-      description: Onap cloud tenat id
-      scope: short
-      type: string
-    - name: customer
-      description: Onap cloud customer
-      scope: long
-      type: string
-    - name: service
-      description: Onap cloud service
-      scope: long
-      type: string
-http:
-  request:
-    uri: /aai/v8/cloud-infrastructure/cloud-regions
-    method: GET
-  success_codes:
-    - 200
-  result_map:
-    cloud: $b{cloud-region.[*].cloud-owner}
-    region: $b{cloud-region.[*].cloud-region-id}
-    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/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml
deleted file mode 100644
index 41c1515c..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-open_cli_schema_version: 1.0
-name: customer-create
-description: Create a customer in Onap
-version: onap-1.1
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/customer/customer-create-schema.yaml b/plugins/aai/src/main/resources/open-cli-schema/customer/customer-create-schema.yaml
deleted file mode 100644
index e79cd5e6..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-create-schema.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-open_cli_schema_version: 1.0
-name: customer-create
-description: Create a customer in Onap
-version: onap-1.0
-service:
-  name: aai
-  version: v8
-  auth: basic
-  mode: direct
-
-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:
-  request:
-    uri: /aai/v8/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/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml
deleted file mode 100644
index 673cb94a..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-open_cli_schema_version: 1.0
-name: customer-delete
-description: Delete a customer from Onap
-version: onap-1.1
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  request:
-    uri: /aai/v11/business/customers/customer/${customer-name}?resource-version=${resource-version}
-    method: DELETE
-  success_codes:
-    - 204
-    - 404
diff --git a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema.yaml b/plugins/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema.yaml
deleted file mode 100644
index 48455cdc..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema.yaml
+++ /dev/null
@@ -1,30 +0,0 @@
-open_cli_schema_version: 1.0
-name: customer-delete
-description: Delete a customer from Onap
-version: onap-1.0
-service:
-  name: aai
-  version: v8
-  auth: basic
-  mode: direct
-
-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:
-  request:
-    uri: /aai/v8/business/customers/customer/${customer-name}?resource-version=${resource-version}
-    method: DELETE
-  success_codes:
-    - 204
-    - 404
diff --git a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml
deleted file mode 100644
index 1e408f78..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-open_cli_schema_version: 1.0
-name: customer-list
-description: Lists the registetred customers in Onap
-version: onap-1.1
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-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:
-  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/aai/src/main/resources/open-cli-schema/customer/customer-list-schema.yaml b/plugins/aai/src/main/resources/open-cli-schema/customer/customer-list-schema.yaml
deleted file mode 100644
index 0866cfb4..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-list-schema.yaml
+++ /dev/null
@@ -1,31 +0,0 @@
-open_cli_schema_version: 1.0
-name: customer-list
-description: Lists the registetred customers in Onap
-version: onap-1.0
-service:
-  name: aai
-  version: v8
-  auth: basic
-  mode: direct
-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:
-  request:
-    uri: /aai/v8/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/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml
deleted file mode 100644
index f12e235a..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-open_cli_schema_version: 1.0
-name: customer-show
-description: Lists the registetred customers in Onap
-version: onap-1.1
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/customer/customer-show-schema.yaml b/plugins/aai/src/main/resources/open-cli-schema/customer/customer-show-schema.yaml
deleted file mode 100644
index bb37aa27..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/customer/customer-show-schema.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-open_cli_schema_version: 1.0
-name: customer-show
-description: Lists the registetred customers in Onap
-version: onap-1.0
-service:
-  name: aai
-  version: v8
-  auth: basic
-  mode: direct
-
-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:
-  request:
-    uri: /aai/v8/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/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml
deleted file mode 100644
index 2c6c0636..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml
+++ /dev/null
@@ -1,79 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: ems-register
-
-description: Register a EMS in Onap
-
-version: onap-1.1
-
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: ems-id
-    description: Onap EMS unique id
-    type: uuid
-    short_option: 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:
-  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/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
deleted file mode 100644
index c703c651..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: ems-unregister
-
-description: Un-register a EMS in Onap
-
-version: onap-1.1
-
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: ems-id
-    description: Onap EMS unique id
-    type: uuid
-    short_option: x
-    long_option:  ems-id
-    is_optional: false
-  - name: resource-version
-    description: Onap vim resource version
-    type: string
-    short_option: y
-    long_option: resource-version
-    is_optional: true
-http:
-  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/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml
deleted file mode 100644
index 7b8877bb..00000000
--- a/plugins/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
-
-version: onap-1.1
-
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml
deleted file mode 100644
index c03a75bd..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: ems-show
-
-description: Show the details of configured ems
-
-version: onap-1.1
-
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: ems-id
-    description: Onap EMS unique id
-    type: uuid
-    short_option: x
-    long_option:  ems-id
-    is_optional: false
-
-results:
-  direction: landscape
-  attributes:
-    - name: name
-      description: Onap ems name
-      scope: short
-      type: string
-    - name: type
-      description: Onap ems type
-      scope: short
-      type: string
-    - name: vendor
-      description: Onap ems vendor
-      scope: short
-      type: string
-    - name: version
-      description: Onap ems version
-      scope: short
-      type: string
-    - name: url
-      description: Onap ems url
-      scope: short
-      type: string
-    - name: username
-      description: Onap ems username
-      scope: long
-      type: string
-
-http:
-  request:
-    uri: /aai/v11/external-system/esr-ems-list/esr-ems/${ems-id}/esr-system-info-list/esr-system-info/${ems-id}
-    method: GET
-  success_codes:
-    - 200
-  result_map:
-    name: $b{$.system-name}
-    type: $b{$.type}
-    vendor: $b{$.vendor}
-    version: $b{$.version}
-    url: $b{$.service-url}
-    username: $b{$.user-name}
-
-  sample_response:
-    body: '{"esr-system-info-id":"example-esr-system-info-id-val-44791","system-name":"example-system-name-val-48687","type":"example-type-val-95885","vendor":"example-vendor-val-41061","version":"example-version-val-38559","service-url":"example-service-url-val-2663","user-name":"example-user-name-val-26126","password":"example-password-val-33838","system-type":"ems","protocal":"","ssl-cacert":"","ssl-insecure":false,"ip-address":"","port":"","cloud-domain":"","default-tenant":""}'
diff --git a/plugins/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
deleted file mode 100644
index fe0d22a8..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
+++ /dev/null
@@ -1,97 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: sdnc-register
-
-description: Register a SDNC in Onap
-
-version: onap-1.1
-
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
deleted file mode 100644
index eec0ca67..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: sdnc-unregister
-
-description: Un-register a VNFM in Onap
-
-version: onap-1.1
-
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-parameters:
-  - name: sdnc-id
-    description: Onap VNFM unique id
-    type: string
-    short_option: x
-    long_option:  sdnc-id
-    is_optional: false
-
-http:
-  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/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
deleted file mode 100644
index f84c480f..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: sdnc-list
-
-description: List the configured sdnc
-
-version: onap-1.1
-
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml
deleted file mode 100644
index d50acfb9..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-open_cli_schema_version: 1.0
-name: vim-register
-description: Register a VIM under a given cloud region in Onap
-version: onap-1.1
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
deleted file mode 100644
index ee74ead5..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: vim-unregister
-
-description: Un-register a VIM under from cloud region in Onap
-
-version: onap-1.1
-
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml
deleted file mode 100644
index 2af3474d..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml
+++ /dev/null
@@ -1,92 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: vim-list
-
-description: List the configured vims
-
-version: onap-1.1
-
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
deleted file mode 100644
index e8529722..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
+++ /dev/null
@@ -1,85 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: vnfm-register
-
-description: Register a VNFM in Onap
-
-version: onap-1.1
-
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
deleted file mode 100644
index 3c99c048..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: vnfm-unregister
-
-description: Un-register a VNFM in Onap
-
-version: onap-1.1
-
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
deleted file mode 100644
index 4318dce7..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: vnfm-list
-
-description: List the configured vnfm
-
-version: onap-1.1
-
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml
deleted file mode 100644
index e447ec56..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-open_cli_schema_version: 1.0
-
-name: vnfm-show
-
-description: Show the VNFM in Onap
-
-version: onap-1.1
-
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml
deleted file mode 100644
index ffd3a964..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-type-create
-description: Add a service type in Onap
-version: onap-1.1
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema.yaml b/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema.yaml
deleted file mode 100644
index f8a73841..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-type-create
-description: Add a service type in Onap
-version: onap-1.0
-service:
-  name: aai
-  version: v8
-  auth: basic
-  mode: direct
-
-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:
-  request:
-    uri: /aai/v8/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/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml
deleted file mode 100644
index c1745b13..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-type-delete
-description: Delete a service type from Onap
-version: onap-1.1
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema.yaml b/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema.yaml
deleted file mode 100644
index a2b438b6..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-type-delete
-description: Delete a service type from Onap
-version: onap-1.0
-service:
-  name: aai
-  version: v8
-  auth: basic
-  mode: direct
-
-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:
-  request:
-    uri: /aai/v8/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/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml
deleted file mode 100644
index dd769c2c..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-type-list
-description: List the service types configured in Onap
-version: onap-1.1
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema.yaml b/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema.yaml
deleted file mode 100644
index bdff43c3..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-type-list
-description: List the service types configured in Onap
-version: onap-1.0
-service:
-  name: aai
-  version: v8
-  auth: basic
-  mode: direct
-
-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:
-  request:
-    uri: /aai/v8/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/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml
deleted file mode 100644
index 1ed61eca..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml
+++ /dev/null
@@ -1,52 +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
-version: onap-1.1
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema.yaml b/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema.yaml
deleted file mode 100644
index a45f8cfd..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema.yaml
+++ /dev/null
@@ -1,63 +0,0 @@
-open_cli_schema_version: 1.0
-name: subscription-create
-description: Create a subscription for a customer in Onap
-version: onap-1.0
-service:
-  name: aai
-  version: v8
-  auth: basic
-  mode: direct
-
-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
-  - name: cloud-type
-    description: Onap cloud type (openstack, rackspace)
-    type: string
-    short_option: z
-    long_option: cloud-type
-    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
-  - name: resource-version
-    description: Onap subscription resource version. It is mandatory for existing customer to create a new subscription
-    type: string
-    short_option: g
-    long_option: resource-version
-    is_optional: true
-http:
-  request:
-    uri: /aai/v8/business/customers/customer/${customer-name}
-    method: PUT
-    body: '{"global-customer-id": "${customer-name}", "subscriber-name": "${subscriber-name}", "subscriber-type": "INFRA", "resource-version":"${resource-version}", "service-subscriptions":{"service-subscription":[{"relationship-list":{"relationship":[{"related-to":"tenant","relationship-data":[{"relationship-key":"cloud-region.cloud-owner","relationship-value":"${cloud-type}"},{"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/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml
deleted file mode 100644
index 18e83fdd..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-open_cli_schema_version: 1.0
-name: subscription-delete
-description: Delete the subscription for a given customer in Onap
-version: onap-1.1
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml
deleted file mode 100644
index a14d2da2..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml
+++ /dev/null
@@ -1,60 +0,0 @@
-open_cli_schema_version: 1.0
-name: subscription-list
-description: Lists the subscription for a given customer in Onap
-version: onap-1.1
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema.yaml b/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema.yaml
deleted file mode 100644
index 634c5cb2..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-open_cli_schema_version: 1.0
-name: subscription-list
-description: Lists the subscription for a given customer in Onap
-version: onap-1.0
-service:
-  name: aai
-  version: v8
-  auth: basic
-  mode: direct
-
-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
-
-http:
-  request:
-    uri: /aai/v8/business/customers/customer/${customer-name}
-    method: GET
-  success_codes:
-    - 200
-  result_map:
-    service-type: $b{$.service-subscriptions.service-subscription.[*].service-type}
-  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/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml
deleted file mode 100644
index 9bc22853..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-open_cli_schema_version: 1.0
-name: tenant-create
-description: Create a tenant under given cloud region in Onap
-version: onap-1.1
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml
deleted file mode 100644
index ece1bd5c..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-open_cli_schema_version: 1.0
-name: tenant-delete
-description: Delete tenant under given cloud region in Onap
-version: onap-1.1
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml b/plugins/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml
deleted file mode 100644
index 46f470da..00000000
--- a/plugins/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-open_cli_schema_version: 1.0
-name: tenant-list
-description: Lists the tenants under given cloud region in Onap
-version: onap-1.1
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
-
-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:
-  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/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample-1.0.yaml b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample-1.0.yaml
deleted file mode 100644
index 9b267481..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample-1.0.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: cloud-list
-version: onap-1.0
-samples:
-    sample1:
-        name: List the configured clouds in onap
-        input: -h https://locahost:8443 -u AAI -p AAI
-        output: |
-            +------------+------------+--------+----------------------------------+------------------------------------------------+----------+
-            |cloud       |region      |tenant  |tenant-id                         |customer                                        |service   |
-            +------------+------------+--------+----------------------------------+------------------------------------------------+----------+
-            |Rackspace   |RegionOne   |onap    |e69e6d64b44347509c3fc512391f34a6  |Demonstration                                   |vFW       |
-            +------------+------------+--------+----------------------------------+------------------------------------------------+----------+
-            |            |            |        |                                  |Demonstration123                                |vFW       |
-            +------------+------------+--------+----------------------------------+------------------------------------------------+----------+
-            |            |            |        |                                  |u2                                              |vFW       |
-            +------------+------------+--------+----------------------------------+------------------------------------------------+----------+
-            |            |            |        |                                  |DemoCust_7151e36a-1a57-4993-b513-54134f2b8f19   |vFW       |
-            +------------+------------+--------+----------------------------------+------------------------------------------------+----------+
-            |            |            |        |                                  |Demonstration                                   |vLB       |
-            +------------+------------+--------+----------------------------------+------------------------------------------------+----------+
-            |            |            |        |                                  |Linan                                           |vFW       |
-            +------------+------------+--------+----------------------------------+------------------------------------------------+----------+
-            |            |            |        |                                  |Linan                                           |vLB       |
-            +------------+------------+--------+----------------------------------+------------------------------------------------+----------+
-
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-create-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-create-sample-1.1.yaml
deleted file mode 100644
index 8a2da490..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-create-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: tenant-create
-version: onap-1.1
-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/aai/src/test/resources/onap-cli-sample/tenant/tenant-delete-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-delete-sample-1.1.yaml
deleted file mode 100644
index 44026ec3..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-delete-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: tenant-delete
-version: onap-1.1
-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/aai/src/test/resources/onap-cli-sample/tenant/tenant-list-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-list-sample-1.1.yaml
deleted file mode 100644
index 4348f6eb..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/tenant/tenant-list-sample-1.1.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: tenant-list
-version: onap-1.1
-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     |
-            +--------------------------------------+--------------+------------------+
-