Migrate plugins to use info section

Issue-Id: CLI-66

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

30 files changed, 228 insertions, 181 deletions

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