Rename product names to use amsterdam

Issue-ID: CLI-66

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

30 files changed, 0 insertions, 1076 deletions

diff --git a/plugins/onap-1.0/features/aai/pom.xml b/plugins/onap-1.0/features/aai/pom.xml
deleted file mode 100644
index 587d554b..00000000
--- a/plugins/onap-1.0/features/aai/pom.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Copyright 2017 Huawei Technologies Co., Ltd.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-         http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.cli</groupId>
-        <artifactId>cli-plugins-onap-1.0-features</artifactId>
-        <version>2.0.0</version>
-    </parent>
-
-    <artifactId>cli-plugins-onap-1.0-features-aai</artifactId>
-    <name>cli/plugins/onap-1.0/features/aai</name>
-    <packaging>jar</packaging>
-    <build>
-        <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema.yaml
deleted file mode 100644
index f3e93e4d..00000000
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-open_cli_schema_version: 1.0
-name: cloud-list
-description: List the configured clouds and Onap service subscriptions
-
-info:
-  product: onap-1.0
-  service: aai
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-
-results:
-  direction: landscape
-  attributes:
-    - name: cloud
-      description: Onap cloud
-      scope: short
-      type: string
-    - name: region
-      description: Onap cloud region
-      scope: short
-      type: string
-    - name: tenant
-      description: Onap cloud tenat
-      scope: 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:
-  service:
-    auth: basic
-    mode: direct
-  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/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema.yaml
deleted file mode 100644
index 304f5471..00000000
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-open_cli_schema_version: 1.0
-name: customer-create
-description: Create a customer in Onap
-
-info:
-  product: onap-1.0
-  service: aai
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-
-parameters:
-  - name: customer-name
-    description: Onap customer name
-    type: string
-    short_option: x
-    long_option: customer-name
-    is_optional: false
-  - name: subscriber-name
-    description: Onap subscriber name
-    type: string
-    short_option: y
-    long_option: subscriber-name
-    is_optional: false
-
-http:
-  service:
-    auth: basic
-    mode: direct
-  request:
-    uri: /aai/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/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema.yaml
deleted file mode 100644
index 98e11b8e..00000000
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema.yaml
+++ /dev/null
@@ -1,33 +0,0 @@
-open_cli_schema_version: 1.0
-name: customer-delete
-description: Delete a customer from Onap
-
-info:
-  product: onap-1.0
-  service: aai
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-
-parameters:
-  - name: customer-name
-    description: Onap customer name
-    type: string
-    short_option: x
-    long_option: customer-name
-    is_optional: false
-  - name: resource-version
-    description: Onap customer resource version
-    type: uuid
-    short_option: y
-    long_option: resource-version
-    is_optional: true
-http:
-  service:
-    auth: basic
-    mode: direct
-  request:
-    uri: /aai/v8/business/customers/customer/${customer-name}?resource-version=${resource-version}
-    method: DELETE
-  success_codes:
-    - 204
-    - 404
diff --git a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema.yaml
deleted file mode 100644
index dab97755..00000000
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-open_cli_schema_version: 1.0
-name: customer-list
-description: Lists the registetred customers in Onap
-
-info:
-  product: onap-1.0
-  service: aai
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-results:
-  direction: landscape
-  attributes:
-    - name: name
-      description: Onap customer name
-      scope: short
-      type: string
-    - name: resource-version
-      description: Onap customer resource version
-      scope: short
-      type: string
-http:
-  service:
-    auth: basic
-    mode: direct
-  request:
-    uri: /aai/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/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema.yaml
deleted file mode 100644
index 45caad5d..00000000
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema.yaml
+++ /dev/null
@@ -1,53 +0,0 @@
-open_cli_schema_version: 1.0
-name: customer-show
-description: Lists the registetred customers in Onap
-
-info:
-  product: onap-1.0
-  service: aai
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-
-parameters:
-  - name: customer-name
-    description: Onap customer name
-    type: string
-    short_option: x
-    long_option: customer-name
-    is_optional: false
-
-results:
-  direction: landscape
-  attributes:
-    - name: name
-      description: Onap customer name
-      scope: short
-      type: string
-    - name: subscriber-name
-      description: Onap subscriber name
-      scope: short
-      type: string
-    - name: resource-version
-      description: Onap subscriber resource version
-      scope: long
-      type: string
-    - name: subscriber-type
-      description: Onap subscriber type
-      scope: long
-      type: string
-http:
-  service:
-    auth: basic
-    mode: direct
-  request:
-    uri: /aai/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/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema.yaml
deleted file mode 100644
index e5f398ed..00000000
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema.yaml
+++ /dev/null
@@ -1,36 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-type-create
-description: Add a service type in Onap
-
-info:
-  product: onap-1.0
-  service: aai
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-
-parameters:
-  - name: service-type
-    description: Onap service type
-    type: string
-    short_option: x
-    long_option: service-type
-    is_optional: false
-  - name: service-type-id
-    description: Onap service type uuid
-    type: uuid
-    short_option: y
-    long_option: service-type-id
-    is_optional: true
-
-http:
-  service:
-    auth: basic
-    mode: direct
-  request:
-    uri: /aai/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/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema.yaml
deleted file mode 100644
index 977e78ad..00000000
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-type-delete
-description: Delete a service type from Onap
-
-info:
-  product: onap-1.0
-  service: aai
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-
-parameters:
-  - name: service-type-id
-    description: Onap service type uuid
-    type: uuid
-    short_option: x
-    long_option: service-type-id
-    is_optional: true
-  - name: resource-version
-    description: Onap service resource version
-    type: uuid
-    short_option: y
-    long_option: resource-version
-    is_optional: true
-http:
-  service:
-    auth: basic
-    mode: direct
-  request:
-    uri: /aai/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/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema.yaml
deleted file mode 100644
index c97ea77d..00000000
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-open_cli_schema_version: 1.0
-name: service-type-list
-description: List the service types configured in Onap
-
-info:
-  product: onap-1.0
-  service: aai
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-
-results:
-  direction: landscape
-  attributes:
-    - name: service-type-id
-      description: Onap cloud service
-      scope: short
-      type: string
-    - name: service-type
-      description: Onap cloud service
-      scope: short
-      type: string
-    - name: resource-version
-      description: Onap cloud service resource version
-      scope: short
-      type: string
-http:
-  service:
-    auth: basic
-    mode: direct
-  request:
-    uri: /aai/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/onap-1.0/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema.yaml
deleted file mode 100644
index e6d059aa..00000000
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema.yaml
+++ /dev/null
@@ -1,66 +0,0 @@
-open_cli_schema_version: 1.0
-name: subscription-create
-description: Create a subscription for a customer in Onap
-
-info:
-  product: onap-1.0
-  service: aai
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-
-parameters:
-  - name: customer-name
-    description: Onap customer name
-    type: string
-    short_option: x
-    long_option: customer-name
-    is_optional: false
-  - name: subscriber-name
-    description: Onap subscriber name
-    type: string
-    short_option: y
-    long_option: subscriber-name
-    is_optional: false
-  - 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:
-  service:
-    auth: basic
-    mode: direct
-  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/onap-1.0/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema.yaml b/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema.yaml
deleted file mode 100644
index 75b9b3a7..00000000
--- a/plugins/onap-1.0/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema.yaml
+++ /dev/null
@@ -1,43 +0,0 @@
-open_cli_schema_version: 1.0
-name: subscription-list
-description: Lists the subscription for a given customer in Onap
-
-info:
-  product: onap-1.0
-  service: aai
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-
-parameters:
-  - name: customer-name
-    description: Onap customer name
-    type: string
-    short_option: x
-    long_option: customer-name
-    is_optional: false
-
-results:
-  direction: landscape
-  attributes:
-    - name: service-type
-      description: Onap service type
-      scope: short
-      type: string
-
-http:
-  service:
-    auth: basic
-    mode: direct
-  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/onap-1.0/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml b/plugins/onap-1.0/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml
deleted file mode 100644
index b448c8cc..00000000
--- a/plugins/onap-1.0/features/aai/src/test/resources/open-cli-sample/cloud-region/cloud-list-sample-1.0.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-open_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/onap-1.0/features/pom.xml b/plugins/onap-1.0/features/pom.xml
deleted file mode 100644
index 0dfd033e..00000000
--- a/plugins/onap-1.0/features/pom.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Copyright 2017 Huawei Technologies Co., Ltd.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-         http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.cli</groupId>
-        <artifactId>cli-plugins-onap-1.0</artifactId>
-        <version>2.0.0</version>
-    </parent>
-
-    <artifactId>cli-plugins-onap-1.0-features</artifactId>
-    <name>cli/plugins/onap-1.0/features</name>
-    <packaging>pom</packaging>
-    
-    <modules>
-        <module>aai</module>
-        <module>sdc</module>
-    </modules>
-    
-     <build>
-         <pluginManagement>
-            <plugins>
-                <plugin>
-                  <groupId>org.apache.maven.plugins</groupId>
-                  <artifactId>maven-dependency-plugin</artifactId>
-                  <executions>
-                    <execution>
-                      <id>copy-artifact</id>
-                      <phase>package</phase>
-                      <goals>
-                        <goal>copy</goal>
-                      </goals>
-                      <configuration>
-                        <artifactItems>
-                            <artifactItem>
-                              <groupId>${project.groupId}</groupId>
-                              <artifactId>${project.artifactId}</artifactId>
-                              <version>${project.version}</version>
-                              <type>${project.packaging}</type>
-                            </artifactItem>
-                        </artifactItems>
-                        <!-- copy to plugin dependencies -->
-                        <outputDirectory>../../../../plugins/target/lib</outputDirectory>
-                      </configuration>
-                    </execution>
-                  </executions>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-    </build>
-</project>
diff --git a/plugins/onap-1.0/features/sdc/pom.xml b/plugins/onap-1.0/features/sdc/pom.xml
deleted file mode 100644
index 275cae52..00000000
--- a/plugins/onap-1.0/features/sdc/pom.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
- -->
-
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
-         http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-
-    <parent>
-        <groupId>org.onap.cli</groupId>
-        <artifactId>cli-plugins-onap-1.0-features</artifactId>
-        <version>2.0.0</version>
-    </parent>
-
-    <artifactId>cli-plugins-onap-1.0-features-sdc</artifactId>
-    <name>cli/plugins/onap-1.0/features/sdc</name>
-    <packaging>jar</packaging>
-    <build>
-        <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-              <artifactId>maven-dependency-plugin</artifactId>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml
deleted file mode 100644
index 57085d54..00000000
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml
+++ /dev/null
@@ -1,44 +0,0 @@
-open_cli_schema_version: 1.0
-name: license-model-create
-description: Create License Model
-
-info:
-  product: onap-1.0
-  service: sdc
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-
-parameters:
-  - name: vendor-name
-    description: vendor name
-    type: string
-    short_option: x
-    long_option: vendor-name
-    is_optional: false
-  - name: license-model-description
-    description: Description for License Model
-    type: string
-    short_option: y
-    long_option: license-model-description
-    is_optional: true
-results:
-  direction: portrait
-  attributes:
-    - name: ID
-      description: License Model ID
-      scope: short
-      type: string
-http:
-  service:
-    auth: basic
-    mode: direct
-  request:
-    uri: /onboarding-api/v1.0/vendor-license-models
-    method: POST
-    body: '{"vendorName": "${vendor-name}", "description": "${license-model-description}",  "iconRef": "icon"}'
-  success_codes:
-    - 200
-  result_map:
-    ID: $b{$.value}
-  sample_response:
-    body: '{"value":"2DEB6CB4B082415BB7A697C9CD1273BA"}'
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml
deleted file mode 100644
index fe950f32..00000000
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml
+++ /dev/null
@@ -1,52 +0,0 @@
-open_cli_schema_version: 1.0
-name: license-model-show
-description: Details of the License Model
-
-info:
-  product: onap-1.0
-  service: sdc
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
-  - name: license-model-id
-    description: Onap License Model ID
-    type: string
-    short_option: x
-    long_option: license-model-id
-    is_optional: false
-
-results:
-  direction: landscape
-  attributes:
-    - name: name
-      description: License Model  Name
-      scope: short
-      type: string
-    - name: ID
-      description: License Model ID
-      scope: short
-      type: string
-    - name: description
-      description: Description for the License Model
-      scope: short
-      type: string
-    - name: status
-      description: Status of the License Model
-      scope: short
-      type: string
-http:
-  service:
-    auth: basic
-    mode: direct
-  request:
-    uri: /onboarding-api/v1.0/vendor-software-products/${license-model-id}
-    method: GET
-  success_codes:
-    - 200
-  result_map:
-    name: $b{$.vendorName}
-    ID: $b{$.id}
-    description: $b{$.description}
-    status: $b{$.status}
-  sample_response:
-    body: '{"vendorName": "5aa8a88c","description": "vendor license model","iconRef": "icon","id": "109F0F948B974D998D89893A1BD39D4A","version": "0.1","status": "Locked","lockingUser": "cs0008","viewableVersions": ["0.1"]}'
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml
deleted file mode 100644
index a6c0b700..00000000
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-checkin
-description: Checkin Vendor Software Product
-
-info:
-  product: onap-1.0
-  service: sdc
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
-  - name: vsp-id
-    description: Onap VSP ID
-    type: string
-    short_option: x
-    long_option: vsp-id
-    is_optional: false
-http:
-  service:
-    auth: basic
-    mode: direct
-  request:
-    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/actions
-    method: PUT
-    body: '{"action": "Checkin"}'
-  success_codes:
-    - 201
-    - 200
-  sample_response:
-    body: ''
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml
deleted file mode 100644
index 6e4b11b0..00000000
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-checkout
-description: Checkout Vendor Software Product
-
-info:
-  product: onap-1.0
-  service: sdc
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
-  - name: vsp-id
-    description: Onap VSP ID
-    type: string
-    short_option: x
-    long_option: vsp-id
-    is_optional: false
-http:
-  service:
-    auth: basic
-    mode: direct
-  request:
-    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/actions
-    method: PUT
-    body: '{"action": "Checkout"}'
-  success_codes:
-    - 201
-    - 200
-  sample_response:
-    body: ''
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml
deleted file mode 100644
index a50ef44b..00000000
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml
+++ /dev/null
@@ -1,88 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-create
-description: Create Vendor Software Product
-
-info:
-  product: onap-1.0
-  service: sdc
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
-  - name: vsp-name
-    description: Onap VSP Name
-    type: string
-    short_option: x
-    long_option: vsp-name
-    is_optional: false
-  - name: vsp-description
-    description: Description for VSP
-    type: string
-    short_option: y
-    long_option: vsp-description
-    is_optional: true
-  - name: vsp-category
-    description: Category of the VSP
-    type: string
-    short_option: b
-    long_option: vsp-category
-    is_optional: true
-    default_value: resourceNewCategory.generic
-  - name: vsp-subcategory
-    description: Sub Category of VSP
-    type: string
-    short_option: c
-    long_option: vsp-subcategory
-    is_optional: true
-    default_value: resourceNewCategory.generic.abstract
-  - name: vlm-version
-    description: License version
-    type: string
-    short_option: e
-    long_option: vlm-version
-    is_optional: true
-    default_value: 1.0
-  - name: vlm-vendor
-    description: License Model Name
-    type: string
-    short_option: g
-    long_option: vlm-vendor
-    is_optional: false
-  - name: vlm-id
-    description: License Model ID
-    type: string
-    short_option: i
-    long_option: vlm-id
-    is_optional: false
-  - name: vlm-agreement-id
-    description: License Agreement ID
-    type: string
-    short_option: j
-    long_option: vlm-agreement-id
-    is_optional: false
-  - name: vlm-feature-group-id
-    description: Feature Group ID
-    type: string
-    short_option: k
-    long_option: vlm-feature-group-id
-    is_optional: false
-results:
-  direction: portrait
-  attributes:
-    - name: ID
-      description: VSP ID
-      scope: short
-      type: string
-http:
-  service:
-    auth: basic
-    mode: direct
-  request:
-    uri: /onboarding-api/v1.0/vendor-software-products
-    method: POST
-    body: '{"name": "${vsp-name}", "description": "${vsp-description}",  "category": "${vsp-category}",  "subCategory": "${vsp-subcategory}",  "licensingVersion": "${vlm-version}",  "vendorName": "${vlm-vendor}",  "vendorId": "${vlm-id}",  "icon": "icon",  "licensingData": { "licenseAgreement": "${vlm-agreement-id}",    "featureGroups": [ "${vlm-feature-group-id}"  ]}}'
-  success_codes:
-    - 200
-  result_map:
-    ID: $b{$.vspId}
-  sample_response:
-    body: '{"vspId":"2DEB6CB4B082415BB7A697C9CD1273BA"}'
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml
deleted file mode 100644
index 66892aaf..00000000
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml
+++ /dev/null
@@ -1,34 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-list
-description: List of the Vendor Software Products
-
-info:
-  product: onap-1.0
-  service: sdc
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-results:
-  direction: landscape
-  attributes:
-    - name: ID
-      description: VSP ID
-      scope: short
-      type: string
-    - name: name
-      description: VSP Name
-      scope: short
-      type: string
-http:
-  service:
-    auth: basic
-    mode: direct
-  request:
-    uri: /onboarding-api/v1.0/vendor-software-products
-    method: GET
-  success_codes:
-    - 200
-  result_map:
-    name: $b{results.[*].name}
-    ID: $b{results.[*].id}
-  sample_response:
-    body: '{"results":[{"name":"test-vsp1","description":"vendor software product","category":"resourceNewCategory.generic","subCategory":"resourceNewCategory.generic.abstract","vendorName":"5aa8a88c","vendorId":"DBB202617952486691C1E35C9621CD4E","licensingVersion":"1.0","licensingData":{"licenseAgreement":"E19DBDDB137B494385F9535325BFD585","featureGroups":["94835F096DAF4ED78781A394A4F22AD1"]},"id":"354BF3E32E494EAFBB15037CFAB262FF","version":"0.1","viewableVersions":["0.1"],"status":"Locked","lockingUser":"cs0008"},{"name":"test-vsp","description":"vendor software product","category":"resourceNewCategory.generic","subCategory":"resourceNewCategory.generic.abstract","vendorName":"5aa8a88c","vendorId":"DBB202617952486691C1E35C9621CD4E","licensingVersion":"1.0","licensingData":{"licenseAgreement":"E19DBDDB137B494385F9535325BFD585","featureGroups":["94835F096DAF4ED78781A394A4F22AD1"]},"id":"2DEB6CB4B082415BB7A697C9CD1273BA","version":"1.0","viewableVersions":["1.0"],"finalVersions":["1.0"],"status":"Final"}],"listCount":2}'
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml
deleted file mode 100644
index 35d776d5..00000000
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-show
-description: Details of the Vendor Software Product
-
-info:
-  product: onap-1.0
-  service: sdc
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
-  - name: vsp-id
-    description: Onap VSP ID
-    type: string
-    short_option: x
-    long_option: vsp-id
-    is_optional: false
-
-results:
-  direction: landscape
-  attributes:
-    - name: name
-      description: VSP Name
-      scope: short
-      type: string
-    - name: ID
-      description: VSP ID
-      scope: short
-      type: string
-    - name: description
-      description: Description for the VSP
-      scope: short
-      type: string
-http:
-  service:
-    auth: basic
-    mode: direct
-  request:
-    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}
-    method: GET
-  success_codes:
-    - 200
-  result_map:
-    name: $b{$.name}
-    ID: $b{$.id}
-    description: $b{$.description}
-  sample_response:
-    body: '{"name":"test-vsp1","description":"vendor software product","category":"resourceNewCategory.generic","subCategory":"resourceNewCategory.generic.abstract","vendorName":"5aa8a88c","vendorId":"DBB202617952486691C1E35C9621CD4E","licensingVersion":"1.0","licensingData":{"licenseAgreement":"E19DBDDB137B494385F9535325BFD585","featureGroups":["94835F096DAF4ED78781A394A4F22AD1"]},"id":"354BF3E32E494EAFBB15037CFAB262FF","version":"0.1","viewableVersions":["0.1"],"status":"Locked","lockingUser":"cs0008"}'
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml
deleted file mode 100644
index 4ad1cff4..00000000
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml
+++ /dev/null
@@ -1,29 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-submit
-description: Submit Vendor Software Product
-
-info:
-  product: onap-1.0
-  service: sdc
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
-  - name: vsp-id
-    description: Onap VSP ID
-    type: string
-    short_option: x
-    long_option: vsp-id
-    is_optional: false
-http:
-  service:
-    auth: basic
-    mode: direct
-  request:
-    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/actions
-    method: PUT
-    body: '{"action": "Submit"}'
-  success_codes:
-    - 201
-    - 200
-  sample_response:
-    body: ''
diff --git a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml b/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml
deleted file mode 100644
index e54e1132..00000000
--- a/plugins/onap-1.0/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-open_cli_schema_version: 1.0
-name: vsp-upload
-description: Upload the CSAR file to VSP
-
-info:
-  product: onap-1.0
-  service: sdc
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
-  - name: vsp-id
-    description: Onap VSP ID
-    type: string
-    short_option: x
-    long_option: vsp-id
-    is_optional: false
-  - name: vsp-file
-    description: CSAR File path
-    type: binary
-    short_option: y
-    long_option: vsp-file
-    is_optional: false
-http:
-  service:
-    auth: basic
-    mode: direct
-  request:
-    uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/upload
-    method: POST
-    body: ${vsp-file}
-    multipart_entity_name: upload
-  success_codes:
-    - 200
-  sample_response:
-    body: ''
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml
deleted file mode 100644
index 9dfe035f..00000000
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkin-sample.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-open_cli_sample_version: 1.0
-
-name: vsp-checkin
-version: onap-1.0
-samples:
-    sample1:
-        name: Checkin the Vendor Software Product
-        input: --host-username cs0008 --host-password demo123456!  --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml
deleted file mode 100644
index 32f2de93..00000000
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-checkout-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-
-name: vsp-checkout
-version: onap-1.1
-
-samples:
-    sample1:
-        name: Checkout the Vendor Software Product
-        input: --host-username cs0008 --host-password demo123456!  --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml
deleted file mode 100644
index 3b4ce7b5..00000000
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-create-sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-open_cli_sample_version: 1.0
-
-name: vsp-create
-version: onap-1.0
-samples:
-    sample1:
-        name: Create the Vendor Software Product
-        input: --host-username cs0008 --host-password demo123456! --host-url http://locahost:8080 --vsp-name demo-vsp2 --vsp-vendor-name 5aa8a88c --vsp-vendor-id DBB202617952486691C1E35C9    621CD4E --license-agreement-id E19DBDDB137B494385F9535325BFD585 --feature-group-id 94835F096DAF4ED78781A394A4F22AD1
-        output: |
-           +----------+----------------------------------+
-           |property  |value                             |
-           +----------+----------------------------------+
-           |ID        |6897DFFF8E864F84AD17A34B7FB936A3  |
-           +----------+----------------------------------+
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml
deleted file mode 100644
index f1fff560..00000000
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-list-sample.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-open_cli_sample_version: 1.0
-
-name: vsp-list
-version: onap-1.0
-samples:
-    sample1:
-        name: List Vendor Software Products
-        input: --host-username cs0008 --host-password demo123456!  --host-url http://localhost:8080
-        output: |
-           +----------------------------------+------------+
-           |ID                                |name        |
-           +----------------------------------+------------+
-           |E563CB23A6BE49AF9A84CF579DAFB929  |demo-vsp2   |
-           +----------------------------------+------------+
-           |79E62AA736C34E359B869E757D3DDBBE  |demo-vsp1   |
-           +----------------------------------+------------+
-           |928B828EE3CC46B99B92D7B9A2AB2118  |demo-vsp    |
-           +----------------------------------+------------+
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml
deleted file mode 100644
index 880608c5..00000000
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-show-sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-open_cli_sample_version: 1.0
-
-name: vsp-show
-version: onap-1.0
-samples:
-    sample1:
-        name: Show the details of Vendor Software Products
-        input: --host-username cs0008 --host-password demo123456!  --host-url http://localhost:8080 --vsp-id 2DEB6CB4B082415BB7A697C9CD1273BA
-        output: |
-           +----------+----------------------------------+--------------------------+
-           |name      |ID                                |description               |
-           +----------+----------------------------------+--------------------------+
-           |test-vsp  |2DEB6CB4B082415BB7A697C9CD1273BA  |vendor software product   |
-           +----------+----------------------------------+--------------------------+
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml
deleted file mode 100644
index 4f4e15c0..00000000
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-submit-sample.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-open_cli_sample_version: 1.0
-
-name: vsp-submit
-version: onap-1.0
-samples:
-    sample1:
-        name: Submit the Vendor Software Product
-        input: --host-username cs0008 --host-password demo123456!  --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929
diff --git a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml b/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml
deleted file mode 100644
index d3fc41be..00000000
--- a/plugins/onap-1.0/features/sdc/src/test/resources/open-cli-sample/vsp/vsp-upload-sample.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-open_cli_sample_version: 1.0
-
-name: vsp-upload
-version: onap-1.0
-samples:
-    sample1:
-        name: upload the zip file to Vendor Software Product
-        input: --host-username cs0008 --host-password demo123456! --host-url http://localhost:8080 --vsp-id E563CB23A6BE49AF9A84CF579DAFB929  --vsp-file /home/user/vFW.zip