Migrate plugins to use info section

Issue-Id: CLI-66

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

23 files changed, 188 insertions, 146 deletions

diff --git a/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-1-0.yaml b/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-1-0.yaml
index 1c95bf78..ce039496 100644
--- a/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-1-0.yaml
+++ b/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-1-0.yaml
@@ -4,14 +4,11 @@ name: basic-login
 
 description: ONAP basic login auth command
 
-version: onap-1.0
-
-type: auth
-
-service:
-  name: onap
-  version: v1
-  mode: direct
+info:
+  product: onap-1.0
+  service: basic-auth
+  type: auth
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 results:
   direction: portrait
diff --git a/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-0.yaml b/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-0.yaml
index 586258f2..02ae5b64 100644
--- a/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-0.yaml
+++ b/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-0.yaml
@@ -4,14 +4,12 @@ name: sdc-basic-login
 
 description: ONAP basic login auth command
 
-version: onap-1.0
 
-type: auth
-
-service:
-  name: onap
-  version: v1
-  mode: direct
+info:
+  product: onap-1.0
+  service: sdc-basic-auth
+  type: auth
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 results:
   direction: portrait
diff --git a/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-0.yaml b/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-0.yaml
index eb9dae8d..dee323da 100644
--- a/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-0.yaml
+++ b/plugins/onap-1.0/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-0.yaml
@@ -4,11 +4,8 @@ name: basic-logout
 
 description: ONAP basic logout auth command
 
-version: onap-1.0
-
-type: auth
-
-service:
-  name: onap
-  version: v1
-  mode: direct
\ No newline at end of file
+info:
+  product: onap-1.0
+  service: basic-auth
+  type: auth
+  author: ONAP CLI Team onap-discuss@lists.onap.org
diff --git a/plugins/onap-1.0/catalog/src/main/resources/open-cli-schema/catalog-onap-1-0.yaml b/plugins/onap-1.0/catalog/src/main/resources/open-cli-schema/catalog-onap-1-0.yaml
index 419f403b..89fde833 100644
--- a/plugins/onap-1.0/catalog/src/main/resources/open-cli-schema/catalog-onap-1-0.yaml
+++ b/plugins/onap-1.0/catalog/src/main/resources/open-cli-schema/catalog-onap-1-0.yaml
@@ -4,15 +4,11 @@ name: catalog
 
 description: ONAP catalog command to find the base path for service.
 
-version: onap-1.0
-
-type: catalog
-
-service:
-  name: msb
-  version: v1
-  mode: direct
-  auth: none
+info:
+  product: onap-1.0
+  service: msb
+  type: catalog
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: catalog-service-name
@@ -27,6 +23,7 @@ parameters:
     short_option: i
     long_option: catalog-service-version
     is_optional: false
+
 results:
   direction: portrait
   attributes:
@@ -40,7 +37,12 @@ results:
       scope: short
       type: string
       default_value: /
+
 http:
+
+  service:
+    mode: direct
+    auth: none
   request:
     uri: /services/${catalog-service-name}/version/${catalog-service-version}
     method: GET
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
index 10a7e954..f3e93e4d 100644
--- 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
@@ -1,12 +1,12 @@
 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
+
+info:
+  product: onap-1.0
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
 
 results:
   direction: landscape
@@ -36,6 +36,9 @@ results:
       scope: long
       type: string
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v8/cloud-infrastructure/cloud-regions
     method: GET
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
index e79cd5e6..304f5471 100644
--- 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
@@ -1,12 +1,12 @@
 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
+
+info:
+  product: onap-1.0
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
 
 parameters:
   - name: customer-name
@@ -23,6 +23,9 @@ parameters:
     is_optional: false
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v8/business/customers/customer/${customer-name}
     method: PUT
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
index 48455cdc..98e11b8e 100644
--- 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
@@ -1,12 +1,12 @@
 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
+
+info:
+  product: onap-1.0
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
 
 parameters:
   - name: customer-name
@@ -22,6 +22,9 @@ parameters:
     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
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
index 0866cfb4..dab97755 100644
--- 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
@@ -1,12 +1,12 @@
 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
+
+info:
+  product: onap-1.0
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
 results:
   direction: landscape
   attributes:
@@ -19,6 +19,9 @@ results:
       scope: short
       type: string
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v8/business/customers
     method: GET
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
index bb37aa27..45caad5d 100644
--- 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
@@ -1,12 +1,12 @@
 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
+
+info:
+  product: onap-1.0
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
 
 parameters:
   - name: customer-name
@@ -36,6 +36,9 @@ results:
       scope: long
       type: string
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v8/business/customers/customer/${customer-name}
     method: GET
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
index f8a73841..e5f398ed 100644
--- 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
@@ -1,12 +1,12 @@
 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
+
+info:
+  product: onap-1.0
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
 
 parameters:
   - name: service-type
@@ -23,6 +23,9 @@ parameters:
     is_optional: true
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v8/service-design-and-creation/services/service/${service-type-id}
     method: PUT
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
index a2b438b6..977e78ad 100644
--- 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
@@ -1,12 +1,12 @@
 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
+
+info:
+  product: onap-1.0
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
 
 parameters:
   - name: service-type-id
@@ -22,6 +22,9 @@ parameters:
     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:
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
index bdff43c3..c97ea77d 100644
--- 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
@@ -1,12 +1,12 @@
 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
+
+info:
+  product: onap-1.0
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
 
 results:
   direction: landscape
@@ -24,6 +24,9 @@ results:
       scope: short
       type: string
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v8/service-design-and-creation/services
     method: GET
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
index a45f8cfd..e6d059aa 100644
--- 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
@@ -1,12 +1,12 @@
 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
+
+info:
+  product: onap-1.0
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
 
 parameters:
   - name: customer-name
@@ -52,6 +52,9 @@ parameters:
     long_option: resource-version
     is_optional: true
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v8/business/customers/customer/${customer-name}
     method: PUT
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
index 634c5cb2..75b9b3a7 100644
--- 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
@@ -1,12 +1,12 @@
 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
+
+info:
+  product: onap-1.0
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
 
 parameters:
   - name: customer-name
@@ -25,6 +25,9 @@ results:
       type: string
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v8/business/customers/customer/${customer-name}
     method: GET
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
index 58a8681a..57085d54 100644
--- 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
@@ -1,12 +1,12 @@
 open_cli_schema_version: 1.0
 name: license-model-create
 description: Create License Model
-version: onap-1.0
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.0
+  service: sdc
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
 
 parameters:
   - name: vendor-name
@@ -29,6 +29,9 @@ results:
       scope: short
       type: string
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /onboarding-api/v1.0/vendor-license-models
     method: POST
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
index 8214c19c..fe950f32 100644
--- 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
@@ -1,12 +1,11 @@
 open_cli_schema_version: 1.0
 name: license-model-show
 description: Details of the License Model
-version: onap-1.0
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.0
+  service: sdc
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: license-model-id
@@ -36,6 +35,9 @@ results:
       scope: short
       type: string
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /onboarding-api/v1.0/vendor-software-products/${license-model-id}
     method: GET
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
index 4522b41d..a6c0b700 100644
--- 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
@@ -1,12 +1,11 @@
 open_cli_schema_version: 1.0
 name: vsp-checkin
 description: Checkin Vendor Software Product
-version: onap-1.0
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.0
+  service: sdc
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: vsp-id
@@ -16,6 +15,9 @@ parameters:
     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
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
index d790ce55..6e4b11b0 100644
--- 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
@@ -1,13 +1,11 @@
 open_cli_schema_version: 1.0
 name: vsp-checkout
 description: Checkout Vendor Software Product
-version: onap-1.1
 
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
+info:
+  product: onap-1.0
+  service: sdc
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: vsp-id
@@ -17,6 +15,9 @@ parameters:
     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
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
index 4ce83d4b..a50ef44b 100644
--- 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
@@ -1,12 +1,11 @@
 open_cli_schema_version: 1.0
 name: vsp-create
 description: Create Vendor Software Product
-version: onap-1.0
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.0
+  service: sdc
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: vsp-name
@@ -74,6 +73,9 @@ results:
       scope: short
       type: string
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /onboarding-api/v1.0/vendor-software-products
     method: POST
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
index f171b442..66892aaf 100644
--- 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
@@ -1,12 +1,11 @@
 open_cli_schema_version: 1.0
 name: vsp-list
 description: List of the Vendor Software Products
-version: onap-1.0
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.0
+  service: sdc
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 results:
   direction: landscape
@@ -20,6 +19,9 @@ results:
       scope: short
       type: string
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /onboarding-api/v1.0/vendor-software-products
     method: GET
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
index 47cc462e..35d776d5 100644
--- 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
@@ -1,12 +1,11 @@
 open_cli_schema_version: 1.0
 name: vsp-show
 description: Details of the Vendor Software Product
-version: onap-1.0
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.0
+  service: sdc
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: vsp-id
@@ -32,6 +31,9 @@ results:
       scope: short
       type: string
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}
     method: GET
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
index d5f1733f..4ad1cff4 100644
--- 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
@@ -1,12 +1,11 @@
 open_cli_schema_version: 1.0
 name: vsp-submit
 description: Submit Vendor Software Product
-version: onap-1.0
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.0
+  service: sdc
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: vsp-id
@@ -16,6 +15,9 @@ parameters:
     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
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
index 28d8c0a5..e54e1132 100644
--- 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
@@ -1,12 +1,11 @@
 open_cli_schema_version: 1.0
 name: vsp-upload
 description: Upload the CSAR file to VSP
-version: onap-1.0
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.0
+  service: sdc
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: vsp-id
@@ -22,6 +21,9 @@ parameters:
     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