Merge changes Ic38bf4d4,Ife8e618b,I99e0cf1e,I696e4e14,Idc93bd06, ...

* changes:
  Migrate MSB commands to onap-1.1 version
  Add service context in set and unset
  Fix to consider 404 for delete success code
  Add ESR SDNC commands
  Add ESR VNFM commands
  Add ESR EMS commands
  Add ESR VIM commands

22 files changed, 867 insertions, 10 deletions

diff --git a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java
index ec735cfb..d850199d 100644
--- a/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java
+++ b/framework/src/main/java/org/onap/cli/fw/utils/OnapCommandUtils.java
@@ -988,7 +988,9 @@ public class OnapCommandUtils {
         for (Object successCode : requestSuccessCodes) {
             Integer code = (Integer) successCode;
             if (code < 200 || code >= 300) {
-                errorList.add(HTTP_SUCCESS_CODE_INVALID);
+                if ( code != 404) {
+                    errorList.add(HTTP_SUCCESS_CODE_INVALID);
+                }
             }
         }
 
diff --git a/main/src/main/java/org/onap/cli/main/OnapCli.java b/main/src/main/java/org/onap/cli/main/OnapCli.java
index 0920f84b..f689830a 100644
--- a/main/src/main/java/org/onap/cli/main/OnapCli.java
+++ b/main/src/main/java/org/onap/cli/main/OnapCli.java
@@ -308,7 +308,11 @@ public class OnapCli {
                 }
 
                 for (OnapCommandParameter param: cmd.getParameters()) {
-                    if (OnapCommandRegistrar.getRegistrar().getParamCache().containsKey(param.getLongOption())) {
+                    if (OnapCommandRegistrar.getRegistrar().getParamCache().containsKey(
+                            cmd.getService().getName() + ":" + param.getLongOption())) {
+                        param.setValue(OnapCommandRegistrar.getRegistrar().getParamCache().get(
+                                cmd.getService().getName() + ":" + param.getLongOption()));
+                    } else if (OnapCommandRegistrar.getRegistrar().getParamCache().containsKey(param.getLongOption())) {
                         param.setValue(OnapCommandRegistrar.getRegistrar().getParamCache().get(param.getLongOption()));
                     }
                 }
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-create-schema-1.1.yaml
new file mode 100644
index 00000000..e0acf3b1
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-create-schema-1.1.yaml
@@ -0,0 +1,79 @@
+onap_cmd_schema_version: 1.0
+
+name: ems-register
+
+description: Register a EMS in Onap
+
+version: onap-1.1
+
+service:
+  name: aai
+  version: v11
+  auth: basic
+  mode: direct
+
+parameters:
+  - name: ems-id
+    description: Onap EMS unique id
+    type: uuid
+    short_option: z
+    long_option:  ems-id
+    is_optional: false
+  - name: name
+    description: Onap EMS name
+    type: string
+    short_option: b
+    long_option:  name
+    is_optional: false
+  - name: type
+    description: Onap EMS type
+    type: string
+    short_option: c
+    long_option:  type
+    is_optional: false
+  - name: vendor
+    description: Onap EMS vendor
+    type: string
+    short_option: e
+    long_option:  vendor
+    is_optional: false
+  - name: ems-version
+    description: Onap EMS version
+    type: string
+    short_option: q
+    long_option:  ems-version
+    is_optional: false
+  - name: url
+    description: Onap EMS URL
+    type: string
+    short_option: g
+    long_option:  url
+    is_optional: false
+  - name: username
+    description: Onap EMS username
+    type: string
+    short_option: i
+    long_option:  username
+    is_optional: false
+  - name: password
+    description: Onap EMS password
+    type: string
+    short_option: j
+    long_option:  password
+    is_optional: false
+  - name: remote-path
+    description: Onap EMS remote-path
+    type: string
+    short_option: x
+    long_option: remote-path
+    is_optional: false
+
+http:
+  request:
+    uri: /aai/v11/external-system/esr-ems-list/esr-ems/{ems-id}
+    method: PUT
+    body: '{"ems-id":"${ems-id}","passive":true,"remote-path":"${remote-path}","esr-system-info-list":{"esr-system-info":[{"esr-system-info-id":"${ems-id}","system-name":"${name}","type":"${type}","vendor":"${vendor}","version":"${ems-version}","service-url":"${url}","user-name":"${username}","password":"${password}","system-type":"ems","protocal":"","ssl-cacert":"","ssl-insecure":"","ip-address":"","port":"","cloud-domain":"","default-tenant":""}]}}'
+  success_codes:
+    - 201
+  sample_response:
+    body: ''
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
new file mode 100644
index 00000000..bb8521a8
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-delete-schema-1.1.yaml
@@ -0,0 +1,33 @@
+onap_cmd_schema_version: 1.0
+
+name: ems-unregister
+
+description: Un-register a EMS in Onap
+
+version: onap-1.1
+
+service:
+  name: aai
+  version: v11
+  auth: basic
+  mode: direct
+
+parameters:
+  - name: ems-id
+    description: Onap EMS unique id
+    type: uuid
+    short_option: x
+    long_option:  ems-id
+    is_optional: false
+
+http:
+  request:
+    uri: /aai/v11/external-system/esr-ems-list/esr-ems/{ems-id}
+    method: DELETE
+
+  success_codes:
+    - 201
+    - 404
+
+  sample_response:
+    body: ''
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-list-schema-1.1.yaml
new file mode 100644
index 00000000..4756c1d5
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/ems/ems-list-schema-1.1.yaml
@@ -0,0 +1,75 @@
+onap_cmd_schema_version: 1.0
+
+name: ems-list
+
+description: List the configured ems
+
+version: onap-1.1
+
+service:
+  name: aai
+  version: v11
+  auth: basic
+  mode: direct
+
+results:
+  direction: landscape
+  attributes:
+    - name: ems-id
+      description: Onap ems id
+      scope: short
+      type: string
+    - name: name
+      description: Onap ems name
+      scope: short
+      type: string
+    - name: type
+      description: Onap ems type
+      scope: short
+      type: string
+    - name: vendor
+      description: Onap ems vendor
+      scope: short
+      type: string
+    - name: version
+      description: Onap ems version
+      scope: short
+      type: string
+    - name: url
+      description: Onap ems url
+      scope: short
+      type: string
+    - name: username
+      description: Onap ems username
+      scope: long
+      type: string
+    - name: remote-path
+      description: Onap ems remote-path
+      scope: short
+      type: string
+    - name: resource-version
+      description: Onap ems resource version
+      scope: short
+      type: string
+
+http:
+  request:
+    uri: /aai/v11/external-system/esr-ems-list
+    method: GET
+  success_codes:
+    - 200
+  result_map:
+    ems-id: $b{$.esr-ems.[*].ems-id
+    name: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].system-name
+    type: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].type
+    vendor: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].vendor
+    version: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].version
+    url: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].service-url
+    username: $b{$.esr-ems.[*].esr-system-info-list.esr-system-info.[0].user-name
+    remote-path: $b{$.esr-ems.[*].remote-path
+    resource-version: $b{$.esr-ems.[*].resource-version
+
+  sample_response:
+    body: '{"esr-ems":[{"ems-id":"example-ems-id-val-36878","passive":true,"remote-path":"example-remotepath-val-80493","esr-system-info-list":{"esr-system-info":[{"esr-system-info-id":"example-esr-system-info-id-val-44791","system-name":"example-system-name-val-48687","type":"example-type-val-95885","vendor":"example-vendor-val-41061","version":"example-version-val-38559","service-url":"example-service-url-val-2663","user-name":"example-user-name-val-26126","password":"example-password-val-33838","system-type":"ems","protocal":"","ssl-cacert":"","ssl-insecure":false,"ip-address":"","port":"","cloud-domain":"","default-tenant":""}]}}]}'
+
+
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
new file mode 100644
index 00000000..9aea8416
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-create-schema-1.1.yaml
@@ -0,0 +1,97 @@
+onap_cmd_schema_version: 1.0
+
+name: sdnc-register
+
+description: Register a SDNC in Onap
+
+version: onap-1.1
+
+service:
+  name: aai
+  version: v11
+  auth: basic
+  mode: direct
+
+parameters:
+  - name: location
+    description: Onap VIM unique id
+    type: uuid
+    short_option: x
+    long_option:  location
+    is_optional: false
+  - name: sdnc-id
+    description: Onap SDNC unique id
+    type: uuid
+    short_option: y
+    long_option:  sdnc-id
+    is_optional: false
+  - name: name
+    description: Onap SDNC name
+    type: string
+    short_option: b
+    long_option:  name
+    is_optional: false
+  - name: type
+    description: Onap SDNC type
+    type: string
+    short_option: c
+    long_option:  type
+    is_optional: false
+  - name: vendor
+    description: Onap SDNC vendor
+    type: string
+    short_option: e
+    long_option:  vendor
+    is_optional: false
+  - name: sdnc-version
+    description: Onap SDNC version
+    type: string
+    short_option: q
+    long_option:  sdnc-version
+    is_optional: false
+  - name: ip-address
+    description: Onap SDNC ip address
+    type: string
+    short_option: g
+    long_option:  ip-address
+    is_optional: false
+  - name: port
+    description: Onap SDNC port
+    type: string
+    short_option: k
+    long_option:  port
+    is_optional: false
+  - name: protocal
+    description: Onap SDNC protocal
+    type: string
+    short_option: r
+    long_option:  protocal
+    is_optional: false
+  - name: username
+    description: Onap SDNC username
+    type: string
+    short_option: i
+    long_option:  username
+    is_optional: false
+  - name: password
+    description: Onap SDNC password
+    type: string
+    short_option: j
+    long_option:  password
+    is_optional: false
+  - name: product-name
+    description: Onap SDNC product-name
+    type: string
+    short_option: z
+    long_option: product-name
+    is_optional: false
+
+http:
+  request:
+    uri: /aai/v11/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{sdnc-id}
+    method: PUT
+    body: '{"thirdparty-sdnc-id":"${sdnc-id}","location":"${location}","product-name":"${product-name}","esr-system-info-list":{"esr-system-info":[{"esr-system-info-id":"${sdnc-id}","system-name":"${name}","type":"${type}","vendor":"${vendor}","version":"${sdnc-version}","service-url":"","user-name":"${username}","password":"${password}","system-type":"sdnc","protocal":"${protocal}","ssl-cacert":"","ssl-insecure":"","ip-address":"${ip-address}","port":"${port}","cloud-domain":"","default-tenant":""}]}}'
+  success_codes:
+    - 201
+  sample_response:
+    body: ''
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
new file mode 100644
index 00000000..7a0e7fde
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-delete-schema-1.1.yaml
@@ -0,0 +1,33 @@
+onap_cmd_schema_version: 1.0
+
+name: sdnc-unregister
+
+description: Un-register a VNFM in Onap
+
+version: onap-1.1
+
+service:
+  name: aai
+  version: v11
+  auth: basic
+  mode: direct
+
+parameters:
+  - name: sdnc-id
+    description: Onap VNFM unique id
+    type: uuid
+    short_option: x
+    long_option:  sdnc-id
+    is_optional: false
+
+http:
+  request:
+    uri: /aai/v11/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/{sdnc-id}
+    method: DELETE
+
+  success_codes:
+    - 201
+    - 404
+
+  sample_response:
+    body: ''
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
new file mode 100644
index 00000000..50850fbc
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/sdnc/sdnc-list-schema-1.1.yaml
@@ -0,0 +1,90 @@
+onap_cmd_schema_version: 1.0
+
+name: sdnc-list
+
+description: List the configured sdnc
+
+version: onap-1.1
+
+service:
+  name: aai
+  version: v11
+  auth: basic
+  mode: direct
+
+results:
+  direction: landscape
+  attributes:
+    - name: sdnc-id
+      description: Onap sdnc id
+      scope: short
+      type: string
+    - name: location
+      description: Onap sdnc id
+      scope: short
+      type: string
+    - name: name
+      description: Onap sdnc name
+      scope: short
+      type: string
+    - name: type
+      description: Onap sdnc type
+      scope: short
+      type: string
+    - name: vendor
+      description: Onap sdnc vendor
+      scope: short
+      type: string
+    - name: version
+      description: Onap sdnc version
+      scope: short
+      type: string
+    - name: ip-address
+      description: Onap sdnc ip-address
+      scope: short
+      type: string
+    - name: port
+      description: Onap sdnc port
+      scope: short
+      type: string
+    - name: protocal
+      description: Onap sdnc protocal
+      scope: short
+      type: string
+    - name: username
+      description: Onap sdnc username
+      scope: long
+      type: string
+    - name: product-name
+      description: Onap sdnc product-name
+      scope: short
+      type: string
+    - name: resource-version
+      description: Onap sdnc resource version
+      scope: short
+      type: string
+
+http:
+  request:
+    uri: /aai/v11/external-system/esr-sdnc-list
+    method: GET
+  success_codes:
+    - 200
+  result_map:
+    sdnc-id: $b{$.esr-sdnc.[*].sdnc-id
+    location: $b{$.esr-sdnc.[*].location
+    name: $b{$.esr-sdnc.[*].esr-system-info-list.esr-system-info.[0].system-name
+    type: $b{$.esr-sdnc.[*].esr-system-info-list.esr-system-info.[0].type
+    vendor: $b{$.esr-sdnc.[*].esr-system-info-list.esr-system-info.[0].vendor
+    version: $b{$.esr-sdnc.[*].esr-system-info-list.esr-system-info.[0].version
+    ip-address: $b{$.esr-sdnc.[*].esr-system-info-list.esr-system-info.[0].ip-address
+    port: $b{$.esr-sdnc.[*].esr-system-info-list.esr-system-info.[0].port
+    protocal: $b{$.esr-sdnc.[*].esr-system-info-list.esr-system-info.[0].protocal
+    username: $b{$.esr-sdnc.[*].esr-system-info-list.esr-system-info.[0].user-name
+    product-name: $b{$.esr-sdnc.[*].product-name
+    resource-version: $b{$.esr-sdnc.[*].resource-version
+
+  sample_response:
+    body: '{"esr-sdnc":[{"sdnc-id":"example-sdnc-id-val-36878","location":"location","product-name":"example-remotepath-val-80493","esr-system-info-list":{"esr-system-info":[{"esr-system-info-id":"example-esr-system-info-id-val-44791","system-name":"example-system-name-val-48687","type":"example-type-val-95885","vendor":"example-vendor-val-41061","version":"example-version-val-38559","service-url":"example-service-url-val-2663","user-name":"example-user-name-val-26126","password":"example-password-val-33838","system-type":"sdnc","protocal":"","ssl-cacert":"","ssl-insecure":false,"ip-address":"","port":"","cloud-domain":"","default-tenant":""}]}}]}'
+
+
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-create-schema-1.1.yaml
new file mode 100644
index 00000000..3961a345
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-create-schema-1.1.yaml
@@ -0,0 +1,107 @@
+onap_cmd_schema_version: 1.0
+name: vim-register
+description: Register a VIM under a given cloud region in Onap
+version: onap-1.1
+service:
+  name: aai
+  version: v11
+  auth: basic
+  mode: direct
+
+parameters:
+  - name: cloud-name
+    description: Onap cloud name
+    type: string
+    short_option: x
+    long_option: cloud-name
+    is_optional: false
+  - name: region-name
+    description: Onap  region name
+    type: string
+    short_option: y
+    long_option:  region-name
+    is_optional: false
+  - name: vim-id
+    description: Onap VIM unique id
+    type: uuid
+    short_option: z
+    long_option:  vim-id
+    is_optional: false
+  - name: name
+    description: Onap VIM name
+    type: string
+    short_option: b
+    long_option:  name
+    is_optional: false
+  - name: type
+    description: Onap VIM type
+    type: string
+    short_option: c
+    long_option:  type
+    is_optional: false
+  - name: vendor
+    description: Onap VIM vendor
+    type: string
+    short_option: e
+    long_option:  vendor
+    is_optional: false
+  - name: vim-version
+    description: Onap VIM version
+    type: string
+    short_option: q
+    long_option:  vim-version
+    is_optional: false
+  - name: url
+    description: Onap VIM URL
+    type: string
+    short_option: g
+    long_option:  url
+    is_optional: false
+  - name: username
+    description: Onap VIM username
+    type: string
+    short_option: i
+    long_option:  username
+    is_optional: false
+  - name: password
+    description: Onap VIM password
+    type: string
+    short_option: j
+    long_option:  password
+    is_optional: false
+  - name: ssl-cacert
+    description: Onap VIM SSL certificate
+    type: text
+    short_option: k
+    long_option:  ssl-cacert
+    is_optional: true
+  - name: ssl-insecure
+    description: Onap VIM insecure
+    type: bool
+    short_option: l
+    long_option:  ssl-insecure
+    is_optional: true
+    default: false
+  - name: cloud-domain
+    description: Onap VIM cloud domain
+    type: string
+    short_option: n
+    long_option:  cloud-domain
+    is_optional: false
+    default: default
+  - name: default-tenant
+    description: Onap VIM default tenant
+    type: string
+    short_option: o
+    long_option:  default-tenant
+    is_optional: false
+
+http:
+  request:
+    uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name}/esr-system-info-list/esr-system-info/${vim-id}
+    method: PUT
+    body: '{"esr-system-info-id":"${vim-id}","system-name":"${name}","type":"${type}","vendor":"${vendor}","version":"${vim-version}","service-url":"${url}","user-name":"${username}","password":"${password}","system-type":"vim","protocal":"","ssl-cacert":"${ssl-cacert}","ssl-insecure":"${ssl-insecure}","ip-address":"","port":"","cloud-domain":"${cloud-domain}","default-tenant":"${default-tenant}"}'
+  success_codes:
+    - 201
+  sample_response:
+    body: ''
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
new file mode 100644
index 00000000..7035bf92
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-delete-schema-1.1.yaml
@@ -0,0 +1,45 @@
+onap_cmd_schema_version: 1.0
+
+name: vim-unregister
+
+description: Un-register a VIM under from cloud region in Onap
+
+version: onap-1.1
+
+service:
+  name: aai
+  version: v11
+  auth: basic
+  mode: direct
+
+parameters:
+  - name: cloud-name
+    description: Onap cloud name
+    type: string
+    short_option: x
+    long_option: cloud-name
+    is_optional: false
+  - name: region-name
+    description: Onap  region name
+    type: string
+    short_option: y
+    long_option:  region-name
+    is_optional: false
+  - name: vim-id
+    description: Onap VIM unique id
+    type: uuid
+    short_option: z
+    long_option:  vim-id
+    is_optional: false
+
+http:
+  request:
+    uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name}/esr-system-info-list/esr-system-info/${vim-id}
+    method: DELETE
+
+  success_codes:
+    - 201
+    - 404
+
+  sample_response:
+    body: ''
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-list-schema-1.1.yaml
new file mode 100644
index 00000000..0f8d76c0
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/vim/vim-list-schema-1.1.yaml
@@ -0,0 +1,94 @@
+onap_cmd_schema_version: 1.0
+
+name: vim-list
+
+description: List the configured vims
+
+version: onap-1.1
+
+service:
+  name: aai
+  version: v11
+  auth: basic
+  mode: direct
+
+parameters:
+  - name: cloud-name
+    description: Onap cloud name
+    type: string
+    short_option: x
+    long_option: cloud-name
+    is_optional: false
+  - name: region-name
+    description: Onap  region name
+    type: string
+    short_option: y
+    long_option:  region-name
+    is_optional: false
+
+results:
+  direction: landscape
+  attributes:
+    - name: vim-id
+      description: Onap vim id
+      scope: short
+      type: string
+    - name: name
+      description: Onap vim name
+      scope: short
+      type: string
+    - name: type
+      description: Onap vim type
+      scope: short
+      type: string
+    - name: vendor
+      description: Onap vim vendor
+      scope: short
+      type: string
+    - name: version
+      description: Onap vim version
+      scope: short
+      type: string
+    - name: url
+      description: Onap vim url
+      scope: short
+      type: string
+    - name: username
+      description: Onap vim username
+      scope: long
+      type: string
+    - name: cloud-domain
+      description: Onap vim cloud domain
+      scope: long
+      type: string
+    - name: default-tenant
+      description: Onap vim tenant
+      scope: short
+      type: string
+    - name: resource-version
+      description: Onap vim resource version
+      scope: short
+      type: string
+
+http:
+  request:
+    uri: /aai/v11/cloud-infrastructure/cloud-regions/cloud-region/${cloud-name}/${region-name}/esr-system-info-list
+    method: GET
+  success_codes:
+    - 200
+  result_map:
+    vim-id: $b{$.esr-system-info.[*].esr-system-info-id
+    name: $b{$.esr-system-info.[*].system-name
+    type: $b{$.esr-system-info.[*].type
+    vendor: $b{$.esr-system-info.[*].vendor
+    version: $b{$.esr-system-info.[*].version
+    url: $b{$.esr-system-info.[*].service-url
+    username: $b{$.esr-system-info.[*].user-name
+    cloud-domain: $b{$.esr-system-info.[*].cloud-domain
+    default-tenant: $b{$.esr-system-info.[*].default-tenant
+    resource-version: $b{$.esr-system-info.[*].resource-version
+
+  sample_response:
+    body: '{esr-system-info":[{"esr-system-info-id":"example-esr-system-info-id-val-62966","system-name":"example-system-name-val-76894","type":"example-type-val-32301","vendor":"example-vendor-val-38139","version":"example-version-val-42345","service-url":"example-service-url-val-33729","user-name":"example-user-name-val-32122","password":"example-password-val-56539","system-type":"example-system-type-val-80707","protocal":"example-protocal-val-30105","ssl-cacert":"example-ssl-cacert-val-52110","ssl-insecure":true,"ip-address":"example-ip-address-val-10140","port":"example-port-val-26369","cloud-domain":"example-cloud-domain-val-22303","default-tenant":"example-default-tenant-val-26326"}]}'
+
+
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
new file mode 100644
index 00000000..c1a58bd8
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-create-schema-1.1.yaml
@@ -0,0 +1,85 @@
+onap_cmd_schema_version: 1.0
+
+name: vnfm-register
+
+description: Register a VNFM in Onap
+
+version: onap-1.1
+
+service:
+  name: aai
+  version: v11
+  auth: basic
+  mode: direct
+
+parameters:
+  - name: vim-id
+    description: Onap VIM unique id
+    type: uuid
+    short_option: x
+    long_option:  vim-id
+    is_optional: false
+  - name: vnfm-id
+    description: Onap VNFM unique id
+    type: uuid
+    short_option: y
+    long_option:  vnfm-id
+    is_optional: false
+  - name: name
+    description: Onap VNFM name
+    type: string
+    short_option: b
+    long_option:  name
+    is_optional: false
+  - name: type
+    description: Onap VNFM type
+    type: string
+    short_option: c
+    long_option:  type
+    is_optional: false
+  - name: vendor
+    description: Onap VNFM vendor
+    type: string
+    short_option: e
+    long_option:  vendor
+    is_optional: false
+  - name: vnfm-version
+    description: Onap VNFM version
+    type: string
+    short_option: q
+    long_option:  vnfm-version
+    is_optional: false
+  - name: url
+    description: Onap VNFM URL
+    type: string
+    short_option: g
+    long_option:  url
+    is_optional: false
+  - name: username
+    description: Onap VNFM username
+    type: string
+    short_option: i
+    long_option:  username
+    is_optional: false
+  - name: password
+    description: Onap VNFM password
+    type: string
+    short_option: j
+    long_option:  password
+    is_optional: false
+  - name: certificate-url
+    description: Onap VNFM certificate-url
+    type: string
+    short_option: z
+    long_option: certificate-url
+    is_optional: false
+
+http:
+  request:
+    uri: /aai/v11/external-system/esr-vnfm-list/esr-vnfm/{vnfm-id}
+    method: PUT
+    body: '{"vnfm-id":"${vnfm-id}","vim-id":"${vim-id}","certificate-url":"${certificate-url}","esr-system-info-list":{"esr-system-info":[{"esr-system-info-id":"${vnfm-id}","system-name":"${name}","type":"${type}","vendor":"${vendor}","version":"${vnfm-version}","service-url":"${url}","user-name":"${username}","password":"${password}","system-type":"vnfm","protocal":"","ssl-cacert":"","ssl-insecure":"","ip-address":"","port":"","cloud-domain":"","default-tenant":""}]}}'
+  success_codes:
+    - 201
+  sample_response:
+    body: ''
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
new file mode 100644
index 00000000..7e45b177
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-delete-schema-1.1.yaml
@@ -0,0 +1,33 @@
+onap_cmd_schema_version: 1.0
+
+name: vnfm-unregister
+
+description: Un-register a VNFM in Onap
+
+version: onap-1.1
+
+service:
+  name: aai
+  version: v11
+  auth: basic
+  mode: direct
+
+parameters:
+  - name: vnfm-id
+    description: Onap VNFM unique id
+    type: uuid
+    short_option: x
+    long_option:  vnfm-id
+    is_optional: false
+
+http:
+  request:
+    uri: /aai/v11/external-system/esr-vnfm-list/esr-vnfm/{vnfm-id}
+    method: DELETE
+
+  success_codes:
+    - 201
+    - 404
+
+  sample_response:
+    body: ''
diff --git a/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
new file mode 100644
index 00000000..53d12876
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-list-schema-1.1.yaml
@@ -0,0 +1,80 @@
+onap_cmd_schema_version: 1.0
+
+name: vnfm-list
+
+description: List the configured vnfm
+
+version: onap-1.1
+
+service:
+  name: aai
+  version: v11
+  auth: basic
+  mode: direct
+
+results:
+  direction: landscape
+  attributes:
+    - name: vnfm-id
+      description: Onap vnfm id
+      scope: short
+      type: string
+    - name: vim-id
+      description: Onap vnfm id
+      scope: short
+      type: string
+    - name: name
+      description: Onap vnfm name
+      scope: short
+      type: string
+    - name: type
+      description: Onap vnfm type
+      scope: short
+      type: string
+    - name: vendor
+      description: Onap vnfm vendor
+      scope: short
+      type: string
+    - name: version
+      description: Onap vnfm version
+      scope: short
+      type: string
+    - name: url
+      description: Onap vnfm url
+      scope: short
+      type: string
+    - name: username
+      description: Onap vnfm username
+      scope: long
+      type: string
+    - name: certificate-url
+      description: Onap vnfm certificate-url
+      scope: short
+      type: string
+    - name: resource-version
+      description: Onap vnfm resource version
+      scope: short
+      type: string
+
+http:
+  request:
+    uri: /aai/v11/external-system/esr-vnfm-list
+    method: GET
+  success_codes:
+    - 200
+  result_map:
+    vnfm-id: $b{$.esr-vnfm.[*].vnfm-id
+    vim-id: $b{$.esr-vnfm.[*].vim-id
+    name: $b{$.esr-vnfm.[*].esr-system-info-list.esr-system-info.[0].system-name
+    type: $b{$.esr-vnfm.[*].esr-system-info-list.esr-system-info.[0].type
+    vendor: $b{$.esr-vnfm.[*].esr-system-info-list.esr-system-info.[0].vendor
+    version: $b{$.esr-vnfm.[*].esr-system-info-list.esr-system-info.[0].version
+    url: $b{$.esr-vnfm.[*].esr-system-info-list.esr-system-info.[0].service-url
+    username: $b{$.esr-vnfm.[*].esr-system-info-list.esr-system-info.[0].user-name
+    certificate-url: $b{$.esr-vnfm.[*].certificate-url
+    resource-version: $b{$.esr-vnfm.[*].resource-version
+
+  sample_response:
+    body: '{"esr-vnfm":[{"vnfm-id":"example-vnfm-id-val-36878","vim-id":"vim-id","certificate-url":"example-remotepath-val-80493","esr-system-info-list":{"esr-system-info":[{"esr-system-info-id":"example-esr-system-info-id-val-44791","system-name":"example-system-name-val-48687","type":"example-type-val-95885","vendor":"example-vendor-val-41061","version":"example-version-val-38559","service-url":"example-service-url-val-2663","user-name":"example-user-name-val-26126","password":"example-password-val-33838","system-type":"vnfm","protocal":"","ssl-cacert":"","ssl-insecure":false,"ip-address":"","port":"","cloud-domain":"","default-tenant":""}]}}]}'
+
+
diff --git a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java
index 4246d654..1ab3b97a 100644
--- a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java
+++ b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceCreateCommand.java
@@ -19,6 +19,6 @@ package org.onap.cli.cmd.cs.msb;
 import org.onap.cli.fw.OnapCommandSchema;
 import org.onap.cli.fw.cmd.OnapHttpCommand;
 
-@OnapCommandSchema(name = "microservice-create", version = "onap-1.0", schema = "microservice-create-schema.yaml")
+@OnapCommandSchema(name = "microservice-create", version = "onap-1.1", schema = "microservice-create-schema.yaml")
 public class OnapServiceCreateCommand extends OnapHttpCommand {
 }
diff --git a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java
index 5522723b..a7424fa0 100644
--- a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java
+++ b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceDeleteCommand.java
@@ -19,6 +19,6 @@ package org.onap.cli.cmd.cs.msb;
 import org.onap.cli.fw.OnapCommandSchema;
 import org.onap.cli.fw.cmd.OnapHttpCommand;
 
-@OnapCommandSchema(name = "microservice-delete", version = "onap-1.0", schema = "microservice-delete-schema.yaml")
+@OnapCommandSchema(name = "microservice-delete", version = "onap-1.1", schema = "microservice-delete-schema.yaml")
 public class OnapServiceDeleteCommand extends OnapHttpCommand {
 }
diff --git a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java
index fadbf020..221b4c0e 100644
--- a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java
+++ b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceListCommand.java
@@ -19,6 +19,6 @@ package org.onap.cli.cmd.cs.msb;
 import org.onap.cli.fw.OnapCommandSchema;
 import org.onap.cli.fw.cmd.OnapHttpCommand;
 
-@OnapCommandSchema(name = "microservice-list", version = "onap-1.0", schema = "microservice-list-schema.yaml")
+@OnapCommandSchema(name = "microservice-list", version = "onap-1.1", schema = "microservice-list-schema.yaml")
 public class OnapServiceListCommand extends OnapHttpCommand {
 }
diff --git a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java
index bef3af9b..40cb5315 100644
--- a/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java
+++ b/plugins/msb/src/main/java/org/onap/cli/cmd/cs/msb/OnapServiceShowCommand.java
@@ -19,6 +19,6 @@ package org.onap.cli.cmd.cs.msb;
 import org.onap.cli.fw.OnapCommandSchema;
 import org.onap.cli.fw.cmd.OnapHttpCommand;
 
-@OnapCommandSchema(name = "microservice-show", version = "onap-1.0", schema = "microservice-show-schema.yaml")
+@OnapCommandSchema(name = "microservice-show", version = "onap-1.1", schema = "microservice-show-schema.yaml")
 public class OnapServiceShowCommand extends OnapHttpCommand {
 }
diff --git a/plugins/msb/src/main/resources/onap-cli-schema/microservice-create-schema.yaml b/plugins/msb/src/main/resources/onap-cli-schema/microservice-create-schema.yaml
index 71f068c1..a568f350 100644
--- a/plugins/msb/src/main/resources/onap-cli-schema/microservice-create-schema.yaml
+++ b/plugins/msb/src/main/resources/onap-cli-schema/microservice-create-schema.yaml
@@ -1,7 +1,7 @@
 onap_cmd_schema_version: 1.0
 name: microservice-create
 description: Register microservice into Onap
-version: onap-1.0
+version: onap-1.1
 service:
   name: msb
   version: v1
diff --git a/plugins/msb/src/main/resources/onap-cli-schema/microservice-delete-schema.yaml b/plugins/msb/src/main/resources/onap-cli-schema/microservice-delete-schema.yaml
index af92172f..e53b617c 100644
--- a/plugins/msb/src/main/resources/onap-cli-schema/microservice-delete-schema.yaml
+++ b/plugins/msb/src/main/resources/onap-cli-schema/microservice-delete-schema.yaml
@@ -1,7 +1,7 @@
 onap_cmd_schema_version: 1.0
 name: microservice-delete
 description: Deletes the micro service from Onap
-version: onap-1.0
+version: onap-1.1
 service:
   name: msb
   version: v1
diff --git a/plugins/msb/src/main/resources/onap-cli-schema/microservice-list-schema.yaml b/plugins/msb/src/main/resources/onap-cli-schema/microservice-list-schema.yaml
index 1688ef24..f36a74d6 100644
--- a/plugins/msb/src/main/resources/onap-cli-schema/microservice-list-schema.yaml
+++ b/plugins/msb/src/main/resources/onap-cli-schema/microservice-list-schema.yaml
@@ -1,7 +1,7 @@
 onap_cmd_schema_version: 1.0
 name: microservice-list
 description: Lists the registetred micro services in Onap
-version: onap-1.0
+version: onap-1.1
 service:
   name: msb
   version: v1
diff --git a/plugins/msb/src/main/resources/onap-cli-schema/microservice-show-schema.yaml b/plugins/msb/src/main/resources/onap-cli-schema/microservice-show-schema.yaml
index 3173b779..956ef4a9 100644
--- a/plugins/msb/src/main/resources/onap-cli-schema/microservice-show-schema.yaml
+++ b/plugins/msb/src/main/resources/onap-cli-schema/microservice-show-schema.yaml
@@ -1,7 +1,7 @@
 onap_cmd_schema_version: 1.0
 name: microservice-show
 description: Details the registered microservice in Onap
-version: onap-1.0
+version: onap-1.1
 service:
   name: msb
   version: v1