Add vnfm show command

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

8 files changed, 136 insertions, 41 deletions

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
index e2710986..e8529722 100644
--- 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
@@ -72,11 +72,11 @@ parameters:
     type: string
     short_option: z
     long_option: certificate-url
-    is_optional: false
+    is_optional: true
 
 http:
   request:
-    uri: /aai/v11/external-system/esr-vnfm-list/esr-vnfm/{vnfm-id}
+    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:
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
index f9cfda11..3c99c048 100644
--- 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
@@ -19,14 +19,19 @@ parameters:
     short_option: x
     long_option:  vnfm-id
     is_optional: false
-
+  - name: resource-version
+    description: Onap vim resource version
+    type: string
+    short_option: y
+    long_option: resource-version
+    is_optional: true
 http:
   request:
-    uri: /aai/v11/external-system/esr-vnfm-list/esr-vnfm/{vnfm-id}
+    uri: /aai/v11/external-system/esr-vnfm-list/esr-vnfm/${vnfm-id}?resource-version=${resource-version}
     method: DELETE
 
   success_codes:
-    - 201
+    - 204
     - 404
 
   sample_response:
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
index c9d7304d..4318dce7 100644
--- 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
@@ -23,30 +23,6 @@ results:
       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
@@ -63,18 +39,10 @@ http:
   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
+    vnfm-id: $b{$.esr-vnfm.[*].vnfm-id}
+    vim-id: $b{$.esr-vnfm.[*].vim-id}
+    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/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml b/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml
new file mode 100644
index 00000000..e447ec56
--- /dev/null
+++ b/plugins/aai/src/main/resources/onap-cli-schema/esr/vnfm/vnfm-show-schema-1.1.yaml
@@ -0,0 +1,67 @@
+open_cli_schema_version: 1.0
+
+name: vnfm-show
+
+description: Show the 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
+
+results:
+  direction: portrait
+  attributes:
+    - 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
+
+http:
+  request:
+    uri: /aai/v11/external-system/esr-vnfm-list/esr-vnfm/${vnfm-id}/esr-system-info-list/esr-system-info/${vnfm-id}
+    method: GET
+
+  success_codes:
+    - 200
+  result_map:
+    name: $b{$.system-name}
+    type: $b{$.type}
+    vendor: $b{$.vendor}
+    version: $b{$.version}
+    url: $b{$.service-url}
+    username: $b{$.user-name}
+
+  sample_response:
+    body: ''
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-create-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-create-sample-1.1.yaml
new file mode 100644
index 00000000..54944d41
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-create-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: vnfm-register
+version: onap-1.1
+samples:
+    sample1:
+        name: Create a vnfm
+        input: -x f962fa1e-d439-4b02-a122-cc38fd0da07c  -y f962fa1e-d439-4b02-a122-cc38fd0da07c -b vnfm-2 -c OpenStack -e HW -q 1.0 -g http://locahost -i user -j password -d
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-delete-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-delete-sample-1.1.yaml
new file mode 100644
index 00000000..c6a79730
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-delete-sample-1.1.yaml
@@ -0,0 +1,8 @@
+onap_cli_sample_version: 1.0
+
+name: vnfm-unregister
+version: onap-1.1
+samples:
+    sample1:
+        name: Delete the vnfm
+        input: -x f962fa1e-d439-4b02-a122-cc38fd0da07c  -y 1505298922586
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-sample-1.1.yaml
new file mode 100644
index 00000000..e3a080ed
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-list-sample-1.1.yaml
@@ -0,0 +1,16 @@
+onap_cli_sample_version: 1.0
+
+name: vnfm-list
+version: onap-1.1
+samples:
+    sample1:
+        name: List all vnfm
+        output: |
+            +--------------------------------------+--------------------------------------+------------------------------------+------------------+
+            |vnfm-id                               |vim-id                                |certificate-url                     |resource-version  |
+            +--------------------------------------+--------------------------------------+------------------------------------+------------------+
+            |f962fa1e-d439-4b02-a122-cc38fd0da07c  |f962fa1e-d439-4b02-a122-cc38fd0da07c  |                                    |1505299563540     |
+            +--------------------------------------+--------------------------------------+------------------------------------+------------------+
+            |htipl913-vnfm-id-val-44685            |example-vim-id-val-36801              |example-certificate-url-val-70931   |1505283495503     |
+            +--------------------------------------+--------------------------------------+------------------------------------+------------------+
+            
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-sample-1.1.yaml
new file mode 100644
index 00000000..35c38d2b
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/esr/vnfm/vnfm-show-sample-1.1.yaml
@@ -0,0 +1,23 @@
+onap_cli_sample_version: 1.0
+
+name: vnfm-show
+version: onap-1.1
+samples:
+    sample1:
+        name: Show the vnfm
+        input: -x f962fa1e-d439-4b02-a122-cc38fd0da07c
+        output: |
+            +----------+------------------+
+            |property  |value             |
+            +----------+------------------+
+            |name      |vnfm-2            |
+            +----------+------------------+
+            |type      |OpenStack         |
+            +----------+------------------+
+            |vendor    |HW                |
+            +----------+------------------+
+            |version   |1.0               |
+            +----------+------------------+
+            |url       |http://locahost   |
+            +----------+------------------+
+