Migrate plugins to use info section

Issue-Id: CLI-66

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

78 files changed, 619 insertions, 456 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
diff --git a/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-1-1.yaml b/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-1-1.yaml
index 8a7f14d3..50fa1aff 100644
--- a/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-1-1.yaml
+++ b/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-1-1.yaml
@@ -4,14 +4,11 @@ name: basic-login
 
 description: ONAP basic login auth command
 
-version: onap-1.1
-
-type: auth
-
-service:
-  name: onap
-  version: v1
-  mode: direct
+info:
+  product: onap-1.1
+  service: basic-auth
+  type: auth
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 results:
   direction: portrait
diff --git a/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-1.yaml b/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-1.yaml
index 2dba0c11..7208537c 100644
--- a/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-1.yaml
+++ b/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-login-onap-sdc-1-1.yaml
@@ -4,14 +4,13 @@ name: sdc-basic-login
 
 description: ONAP basic login auth command
 
-version: onap-1.1
 
-type: auth
+info:
+  product: onap-1.1
+  service: sdc-basic-auth
+  type: auth
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
-service:
-  name: onap
-  version: v1
-  mode: direct
 
 results:
   direction: portrait
diff --git a/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-1.yaml b/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-1.yaml
index fa32b8b9..02b0308a 100644
--- a/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-1.yaml
+++ b/plugins/onap-1.1/auth/src/main/resources/open-cli-schema/basic-logout-onap-1-1.yaml
@@ -4,11 +4,8 @@ name: basic-logout
 
 description: ONAP basic logout auth command
 
-version: onap-1.1
-
-type: auth
-
-service:
-  name: onap
-  version: v1
-  mode: direct
\ No newline at end of file
+info:
+  product: onap-1.1
+  service: basic-auth
+  type: auth
+  author: ONAP CLI Team onap-discuss@lists.onap.org
diff --git a/plugins/onap-1.1/catalog/src/main/resources/open-cli-schema/catalog-onap-1_1.yaml b/plugins/onap-1.1/catalog/src/main/resources/open-cli-schema/catalog-onap-1_1.yaml
index 27deedef..5ab44e32 100644
--- a/plugins/onap-1.1/catalog/src/main/resources/open-cli-schema/catalog-onap-1_1.yaml
+++ b/plugins/onap-1.1/catalog/src/main/resources/open-cli-schema/catalog-onap-1_1.yaml
@@ -4,15 +4,13 @@ name: catalog
 
 description: ONAP catalog command to find the base path for service.
 
-version: onap-1.1
 
-type: catalog
+info:
+  product: onap-1.1
+  service: msb
+  type: catalog
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
-service:
-  name: msb
-  version: v1
-  mode: direct
-  auth: none
 
 parameters:
   - name: catalog-service-name
@@ -41,6 +39,9 @@ results:
       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.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml
index 8657ae14..13e1dd43 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-create-schema-1.1.yaml
@@ -1,12 +1,12 @@
 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
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
 
 parameters:
   - name: cloud-name
@@ -23,6 +23,9 @@ parameters:
     is_optional: false
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name}
     method: PUT
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml
index 5575f7f7..7d61b659 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-delete-schema-1.1.yaml
@@ -1,12 +1,11 @@
 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
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: cloud-name
@@ -28,6 +27,9 @@ parameters:
     long_option: resource-version
     is_optional: true
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name}?resource-version=${resource-version}
     method: DELETE
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
index c9fd5368..7ff00647 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/cloud-region/cloud-list-schema-1.1.yaml
@@ -1,12 +1,11 @@
 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
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 results:
   direction: landscape
@@ -40,6 +39,9 @@ results:
       scope: short
       type: string
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/cloud-infrastructure/cloud-regions
     method: GET
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml
index 41c1515c..9d3bdf50 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-create-schema-1.1.yaml
@@ -1,12 +1,11 @@
 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
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: customer-name
@@ -23,6 +22,9 @@ parameters:
     is_optional: false
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/business/customers/customer/${customer-name}
     method: PUT
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml
index 673cb94a..5f9d0edc 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-delete-schema-1.1.yaml
@@ -1,12 +1,11 @@
 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
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: customer-name
@@ -22,6 +21,9 @@ parameters:
     long_option: resource-version
     is_optional: true
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/business/customers/customer/${customer-name}?resource-version=${resource-version}
     method: DELETE
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml
index 1e408f78..3dc1f509 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-list-schema-1.1.yaml
@@ -1,12 +1,12 @@
 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
+
+info:
+  product: onap-1.1
+  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/v11/business/customers
     method: GET
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml
index f12e235a..8779ce2a 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/customer/customer-show-schema-1.1.yaml
@@ -1,12 +1,11 @@
 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
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: customer-name
@@ -36,6 +35,9 @@ results:
       scope: long
       type: string
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/business/customers/customer/${customer-name}
     method: GET
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml
index 2c6c0636..a343a634 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-create-schema-1.1.yaml
@@ -4,13 +4,11 @@ name: ems-register
 
 description: Register a EMS in Onap
 
-version: onap-1.1
 
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: ems-id
@@ -69,6 +67,9 @@ parameters:
     is_optional: false
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/external-system/esr-ems-list/esr-ems/${ems-id}
     method: PUT
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
index c703c651..ee89030b 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
@@ -4,13 +4,11 @@ name: ems-unregister
 
 description: Un-register a EMS in Onap
 
-version: onap-1.1
 
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: ems-id
@@ -26,6 +24,9 @@ parameters:
     long_option: resource-version
     is_optional: true
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/external-system/esr-ems-list/esr-ems/${ems-id}?resource-version=${resource-version}
     method: DELETE
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml
index 7b8877bb..f4c6114e 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-list-schema-1.1.yaml
@@ -4,13 +4,10 @@ name: ems-list
 
 description: List the configured ems
 
-version: onap-1.1
-
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 results:
   direction: landscape
@@ -25,6 +22,9 @@ results:
       type: string
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/external-system/esr-ems-list
     method: GET
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml
index c03a75bd..fbcd6470 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/ems/ems-show-schema-1.1.yaml
@@ -4,13 +4,11 @@ name: ems-show
 
 description: Show the details of configured ems
 
-version: onap-1.1
 
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: ems-id
@@ -49,6 +47,9 @@ results:
       type: string
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/external-system/esr-ems-list/esr-ems/${ems-id}/esr-system-info-list/esr-system-info/${ems-id}
     method: GET
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
index fe0d22a8..422b20e3 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
@@ -4,13 +4,11 @@ name: sdnc-register
 
 description: Register a SDNC in Onap
 
-version: onap-1.1
 
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: location
@@ -87,6 +85,9 @@ parameters:
     is_optional: false
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/${sdnc-id}
     method: PUT
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
index eec0ca67..2a3e9f8d 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
@@ -4,13 +4,11 @@ name: sdnc-unregister
 
 description: Un-register a VNFM in Onap
 
-version: onap-1.1
 
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: sdnc-id
@@ -21,6 +19,9 @@ parameters:
     is_optional: false
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/${sdnc-id}
     method: DELETE
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
index f84c480f..3f7f999d 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
@@ -4,13 +4,11 @@ name: sdnc-list
 
 description: List the configured sdnc
 
-version: onap-1.1
 
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 results:
   direction: landscape
@@ -25,6 +23,9 @@ results:
       type: string
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/external-system/esr-sdnc-list
     method: GET
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml
index d50acfb9..02859d93 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-create-schema-1.1.yaml
@@ -1,12 +1,11 @@
 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
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: cloud-name
@@ -97,6 +96,9 @@ parameters:
     is_optional: false
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name}/esr-system-info-list/esr-system-info/${vim-id}
     method: PUT
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
index ee74ead5..a958e12b 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
@@ -4,13 +4,11 @@ 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
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: cloud-name
@@ -39,6 +37,9 @@ parameters:
     is_optional: true
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name}/esr-system-info-list/esr-system-info/${vim-id}?resource-version=${resource-version}
     method: DELETE
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml
index 2af3474d..c946db86 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vim/vim-list-schema-1.1.yaml
@@ -4,13 +4,11 @@ name: vim-list
 
 description: List the configured vims
 
-version: onap-1.1
 
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: cloud-name
@@ -71,6 +69,9 @@ results:
       type: string
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name}/esr-system-info-list
     method: GET
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
index e8529722..37c2dd96 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
@@ -4,13 +4,11 @@ name: vnfm-register
 
 description: Register a VNFM in Onap
 
-version: onap-1.1
 
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: vim-id
@@ -75,6 +73,9 @@ parameters:
     is_optional: true
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/external-system/esr-vnfm-list/esr-vnfm/${vnfm-id}
     method: PUT
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
index 3c99c048..2792d1fc 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
@@ -4,13 +4,11 @@ name: vnfm-unregister
 
 description: Un-register a VNFM in Onap
 
-version: onap-1.1
 
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: vnfm-id
@@ -26,6 +24,9 @@ parameters:
     long_option: resource-version
     is_optional: true
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/external-system/esr-vnfm-list/esr-vnfm/${vnfm-id}?resource-version=${resource-version}
     method: DELETE
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
index 4318dce7..bce4e1bb 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
@@ -4,13 +4,11 @@ name: vnfm-list
 
 description: List the configured vnfm
 
-version: onap-1.1
 
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 results:
   direction: landscape
@@ -33,6 +31,9 @@ results:
       type: string
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/external-system/esr-vnfm-list
     method: GET
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml
index e447ec56..1a42e683 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml
@@ -4,13 +4,11 @@ name: vnfm-show
 
 description: Show the VNFM in Onap
 
-version: onap-1.1
 
-service:
-  name: aai
-  version: v11
-  auth: basic
-  mode: direct
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: vnfm-id
@@ -49,6 +47,9 @@ results:
       type: string
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/external-system/esr-vnfm-list/esr-vnfm/${vnfm-id}/esr-system-info-list/esr-system-info/${vnfm-id}
     method: GET
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml
index ffd3a964..80d6a8c8 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-create-schema-1.1.yaml
@@ -1,13 +1,11 @@
 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
 
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 parameters:
   - name: service-type
     description: Onap service type
@@ -23,6 +21,9 @@ parameters:
     is_optional: true
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/service-design-and-creation/services/service/${service-type-id}
     method: PUT
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml
index c1745b13..2b5c923f 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-delete-schema-1.1.yaml
@@ -1,12 +1,11 @@
 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
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: service-type-id
@@ -22,6 +21,9 @@ parameters:
     long_option: resource-version
     is_optional: true
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/service-design-and-creation/services/service/${service-type-id}?resource-version=${resource-version}
     queries:
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml
index dd769c2c..05b83174 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/service-type/service-type-list-schema-1.1.yaml
@@ -1,12 +1,11 @@
 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
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 results:
   direction: landscape
@@ -24,6 +23,9 @@ results:
       scope: short
       type: string
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/service-design-and-creation/services
     method: GET
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml
index 1ed61eca..0a501e20 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-create-schema-1.1.yaml
@@ -1,12 +1,11 @@
 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
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: customer-name
@@ -41,6 +40,9 @@ parameters:
     is_optional: false
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/business/customers/customer/${customer-name}/service-subscriptions/service-subscription/${service-type}
     method: PUT
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml
index 18e83fdd..a6df7b39 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-delete-schema-1.1.yaml
@@ -1,12 +1,11 @@
 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
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: customer-name
@@ -28,6 +27,9 @@ parameters:
     long_option: resource-version
     is_optional: true
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11//business/customers/customer/${customer-name}/service-subscriptions/service-subscription/${service-type}?resource-version=${resource-version}
     method: DELETE
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml
index a14d2da2..03cb0f4d 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/subscription/subscription-list-schema-1.1.yaml
@@ -1,12 +1,11 @@
 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
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: customer-name
@@ -40,6 +39,9 @@ results:
       scope: long
       type: string
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/business/customers/customer/${customer-name}/service-subscriptions
     method: GET
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml
index 9bc22853..8b7f2368 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-create-schema-1.1.yaml
@@ -1,12 +1,11 @@
 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
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: cloud
@@ -35,6 +34,9 @@ parameters:
     is_optional: false
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud}/${region}/tenants/tenant/${tenant-id}
     method: PUT
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml
index ece1bd5c..ea27c670 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-delete-schema-1.1.yaml
@@ -1,12 +1,11 @@
 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
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: cloud
@@ -35,6 +34,9 @@ parameters:
     is_optional: true
 
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud}/${region}/tenants/tenant/${tenant-id}?resource-version=${resource-version}
     method: DELETE
diff --git a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml
index 46f470da..d5e99d92 100644
--- a/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/aai/src/main/resources/open-cli-schema/tenant/tenant-list-schema-1.1.yaml
@@ -1,12 +1,11 @@
 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
+
+info:
+  product: onap-1.1
+  service: aai
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: cloud
@@ -38,6 +37,9 @@ results:
       scope: short
       type: string
 http:
+  service:
+    auth: basic
+    mode: direct
   request:
     uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud}/${region}/tenants
     method: GET
diff --git a/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml b/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml
index 79afd2c7..560fde38 100644
--- a/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml
+++ b/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml
@@ -1,11 +1,11 @@
 open_cli_schema_version: 1.0
 name: microservice-create
 description: Register microservice into Onap
-version: onap-1.1
-service:
-  name: msb
-  version: v1
-  auth: none
+
+info:
+  product: onap-1.1
+  service: msb
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: service-name
@@ -81,6 +81,9 @@ results:
       scope: long
       type: string
 http:
+  service:
+    auth: none
+    mode: direct
   request:
     uri: /services
     method: POST
diff --git a/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-delete-schema.yaml b/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-delete-schema.yaml
index 82eabf95..28fe2094 100644
--- a/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-delete-schema.yaml
+++ b/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-delete-schema.yaml
@@ -1,11 +1,11 @@
 open_cli_schema_version: 1.0
 name: microservice-delete
 description: Deletes the micro service from Onap
-version: onap-1.1
-service:
-  name: msb
-  version: v1
-  auth: none
+
+info:
+  product: onap-1.1
+  service: msb
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: service-name
@@ -33,6 +33,9 @@ parameters:
     long_option: node-port
     is_optional: false
 http:
+  service:
+    auth: none
+    mode: direct
   request:
     uri: /services/${service-name}/version/${service-version}/nodes/${node-ip}/${node-port}
     method: DELETE
diff --git a/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-list-schema.yaml b/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-list-schema.yaml
index 52014c9b..e355e2cc 100644
--- a/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-list-schema.yaml
+++ b/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-list-schema.yaml
@@ -1,11 +1,13 @@
 open_cli_schema_version: 1.0
 name: microservice-list
 description: Lists the registetred micro services in Onap
-version: onap-1.1
-service:
-  name: msb
-  version: v1
-  auth: none
+
+
+info:
+  product: onap-1.1
+  service: msb
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
 results:
   direction: landscape
   attributes:
@@ -38,6 +40,9 @@ results:
       scope: long
       type: string
 http:
+  service:
+    auth: none
+    mode: direct
   request:
     uri: /services
     method: GET
diff --git a/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-show-schema.yaml b/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-show-schema.yaml
index a9e1cced..d3d1d08a 100644
--- a/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-show-schema.yaml
+++ b/plugins/onap-1.1/features/msb/src/main/resources/open-cli-schema/microservice-show-schema.yaml
@@ -1,11 +1,12 @@
 open_cli_schema_version: 1.0
 name: microservice-show
 description: Details the registered microservice in Onap
-version: onap-1.1
-service:
-  name: msb
-  version: v1
-  auth: none
+
+info:
+  product: onap-1.1
+  service: msb
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+
 parameters:
   - name: service-name
     description: Onap service name
@@ -51,6 +52,9 @@ results:
       scope: long
       type: string
 http:
+  service:
+    auth: none
+    mode: direct
   request:
     uri: /services/${service-name}/version/${service-version}
     method: GET
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml
index a6b844cb..d107846d 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml
+++ b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-create-schema.yaml
@@ -1,12 +1,11 @@
 open_cli_schema_version: 1.0
 name: license-model-create
 description: Create License Model
-version: onap-1.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.1
+  service: sdc
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: vendor-name
@@ -29,6 +28,9 @@ results:
       scope: short
       type: string
 http:
+  service:
+    auth: none
+    mode: direct
   request:
     uri: /onboarding-api/v1.0/vendor-license-models
     method: POST
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml
index c0ae3e07..4d1d8a9d 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/license-models/license-model-show-schema.yaml
+++ b/plugins/onap-1.1/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.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.1
+  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: none
+    mode: direct
   request:
     uri: /onboarding-api/v1.0/vendor-software-products/${license-model-id}
     method: GET
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml
index ce6aef09..acb6a076 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkin-schema.yaml
+++ b/plugins/onap-1.1/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.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.1
+  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: none
+    mode: direct
   request:
     uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/actions
     method: PUT
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml
index d790ce55..033b9374 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-checkout-schema.yaml
+++ b/plugins/onap-1.1/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.1
+  service: sdc
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: vsp-id
@@ -17,6 +15,12 @@ parameters:
     long_option: vsp-id
     is_optional: false
 http:
+  service:
+    auth: none
+    mode: direct
+  service:
+    auth: none
+    mode: direct
   request:
     uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/actions
     method: PUT
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml
index 4b3da1d0..690ecabf 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-create-schema.yaml
+++ b/plugins/onap-1.1/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.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.1
+  service: sdc
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: vsp-name
@@ -67,6 +66,9 @@ results:
       scope: short
       type: string
 http:
+  service:
+    auth: none
+    mode: direct
   request:
     uri: /onboarding-api/v1.0/vendor-software-products
     method: POST
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml
index 24212102..77fda362 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-list-schema.yaml
+++ b/plugins/onap-1.1/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.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.1
+  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: none
+    mode: direct
   request:
     uri: /onboarding-api/v1.0/vendor-software-products
     method: GET
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml
index bb3cde39..9310275d 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-show-schema.yaml
+++ b/plugins/onap-1.1/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.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.1
+  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: none
+    mode: direct
   request:
     uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}
     method: GET
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml
index 13170725..029fd123 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-submit-schema.yaml
+++ b/plugins/onap-1.1/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.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.1
+  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: none
+    mode: directs
   request:
     uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/actions
     method: PUT
diff --git a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml b/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml
index c868d3d7..fda1144f 100644
--- a/plugins/onap-1.1/features/sdc/src/main/resources/open-cli-schema/vsp/vsp-upload-schema.yaml
+++ b/plugins/onap-1.1/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.1
-service:
-  name: sdc
-  version: v1.0
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.1
+  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: none
+    mode: direct
   request:
     uri: /onboarding-api/v1.0/vendor-software-products/${vsp-id}/upload
     method: POST
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml
index 96b7e036..94f2e4a4 100644
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-create-schema-1.1.yaml
@@ -1,12 +1,20 @@
 open_cli_schema_version: 1.0
 name: service-create
 description: Create a service instance using MSO
+<<<<<<< cf220435576757be81a477d68413c0dabc592478
 version: onap-1.1
 service:
   name: so
   version: v3
   auth: basic
   mode: direct
+=======
+
+info:
+  product: onap-1.1
+  service: so
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+>>>>>>> Migrate plugins to use info section
 
 parameters:
   - name: cloud-region
@@ -80,6 +88,9 @@ results:
 
 
 http:
+  service:
+    auth: none
+    mode: direct
   request:
     uri: /ecomp/mso/infra/serviceInstances/v3
     method: POST
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml
index 7ae110ed..93f2a1ed 100644
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/service-delete-schema-1.1.yaml
@@ -1,12 +1,25 @@
 open_cli_schema_version: 1.0
 name: service-delete
+<<<<<<< a936ccab2b00d462f0b1f3e8318004f0414f07ef
 description: Delete service instance (experimental)
+=======
+<<<<<<< cf220435576757be81a477d68413c0dabc592478
+description: Delete service instance
+>>>>>>> Migrate plugins to use info section
 version: onap-1.1
 service:
   name: so
   version: v3
   auth: basic
   mode: direct
+=======
+description: Delete a service instance
+
+info:
+  product: onap-1.1
+  service: so
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+>>>>>>> Migrate plugins to use info section
 
 parameters:
   - name: service-id
@@ -59,6 +72,9 @@ parameters:
     is_optional: false
 
 http:
+  service:
+    auth: none
+    mode: direct
   request:
     uri: /ecomp/mso/infra/serviceInstances/v3/${service-id}
     method: DELETE
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml
index 170ba845..43e68059 100644
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-create-schema-1.1.yaml
@@ -1,12 +1,11 @@
 open_cli_schema_version: 1.0
 name: vf-module-create
 description: Create a VF Module
-version: onap-1.1
-service:
-  name: mso
-  version: v2
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.1
+  service: so
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: lcp-cloudregion-id
@@ -61,6 +60,9 @@ results:
       scope: short
 
 http:
+  service:
+    auth: none
+    mode: direct
   request:
     uri: ecomp/mso/infra/serviceInstances/v2/${service-instance-id}/vnfs/${vnf-instance-id}/vfModules
     method: PUT
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml
index 37754087..7c910539 100644
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vf-module-delete-schema-1.1.yaml
@@ -1,12 +1,24 @@
 open_cli_schema_version: 1.0
 name: vfmodule-delete
+<<<<<<< a936ccab2b00d462f0b1f3e8318004f0414f07ef
 description: delete a VF module (experimental)
+=======
+description: delete a VF module
+<<<<<<< e22e4b6be3fe804a926136cf9ffd03341920ff50
+>>>>>>> Migrate plugins to use info section
 version: onap-1.1
 service:
   name: so
   version: v3
   auth: basic
   mode: direct
+=======
+
+info:
+  product: onap-1.1
+  service: so
+  author: ONAP CLI Team onap-discuss@lists.onap.org
+>>>>>>> Migrate plugins to use info section
 
 parameters:
   - name: vfmodule-id
@@ -59,6 +71,9 @@ parameters:
     is_optional: false
 
 http:
+  service:
+    auth: none
+    mode: direct
   request:
     uri: /ecomp/mso/infra/serviceInstances/v3/${service-id}/vnfs/${vf-id}/vfModules/${vfmodule-id}
     method: DELETE
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-create-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-create-schema-1.1.yaml
index 899be1bb..18df0c95 100644
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-create-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-create-schema-1.1.yaml
@@ -1,12 +1,11 @@
 open_cli_schema_version: 1.0
 name: vnf-create
 description: Create a VNF
-version: onap-1.1
-service:
-  name: mso
-  version: v2
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.1
+  service: so
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: lcp-cloudregion-id
@@ -61,6 +60,9 @@ results:
       scope: short
 
 http:
+  service:
+    auth: none
+    mode: direct
   request:
     uri: ecomp/mso/infra/serviceInstances/v2/${service-instance-id}/vnfs
     method: PUT
diff --git a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-delete-schema-1.1.yaml b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-delete-schema-1.1.yaml
index 08134f88..0c07ccbd 100644
--- a/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-delete-schema-1.1.yaml
+++ b/plugins/onap-1.1/features/so/src/main/resources/open-cli-schema/services/vnf-delete-schema-1.1.yaml
@@ -1,12 +1,11 @@
 open_cli_schema_version: 1.0
 name: vnf-delete
 description: delete a VNF
-version: onap-1.1
-service:
-  name: mso
-  version: v2
-  auth: basic
-  mode: direct
+
+info:
+  product: onap-1.1
+  service: so
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
   - name: vnf-instance-id
@@ -35,6 +34,9 @@ parameters:
     is_optional: false
 
 http:
+  service:
+    auth: none
+    mode: direct
   request:
     uri: ecomp/mso/infra/serviceInstances/v2/${service-instance-id}/vnfs
     method: DELETE
diff --git a/plugins/sample/src/main/resources/open-cli-schema/hello-world-http.yaml b/plugins/sample/src/main/resources/open-cli-schema/hello-world-http.yaml
index 31e98776..e23b9594 100644
--- a/plugins/sample/src/main/resources/open-cli-schema/hello-world-http.yaml
+++ b/plugins/sample/src/main/resources/open-cli-schema/hello-world-http.yaml
@@ -5,8 +5,9 @@ name: hello-world-http
 description: First cmd hello world using http runing under lighttpd in cli at http://<cli-ip>:8080/version.json
 
 info:
-  product: sample
+  product: sample-1.0
   service: hello-world
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
     - name: name
@@ -31,6 +32,7 @@ http:
         version: 1.0.0
         auth: none
         mode: direct
+
     request:
         uri: /version.json
         method: GET
diff --git a/plugins/sample/src/main/resources/open-cli-schema/hello-world.yaml b/plugins/sample/src/main/resources/open-cli-schema/hello-world.yaml
index c294792c..fddb8c4c 100644
--- a/plugins/sample/src/main/resources/open-cli-schema/hello-world.yaml
+++ b/plugins/sample/src/main/resources/open-cli-schema/hello-world.yaml
@@ -5,14 +5,9 @@ name: hello-world
 description: First cmd hello world
 
 info:
-  product: sample
+  product: sample-1.0
   service: hello-world
-
-service:
-    name: sample-service
-    version: 1.0.0
-    auth: none
-    mode: direct
+  author: ONAP CLI Team onap-discuss@lists.onap.org
 
 parameters:
     - name: name