cloud-create updates

Change-Id: I4689bdd91a25ef357872eeadea30ce3659b3aa4e
Issue-ID: CLI-166
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>

3 files changed, 28 insertions, 46 deletions

diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-dublin-moco.json b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-dublin-moco.json
index 6e679b4c..30569cd7 100644
--- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-dublin-moco.json
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-dublin-moco.json
@@ -1,35 +1,35 @@
 [ {
   "request" : {
     "method" : "put",
-    "uri" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/ONAP-POD-01-Rail-07",
+    "uri" : "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/OCOMP/RegionOVP",
     "headers" : {
       "Authorization" : "Basic QUFJOkFBSQ==",
       "X-FromAppId" : "ONAP CLI",
       "Accept" : "application/json",
-      "X-TransactionId" : "req-a0eb1dc2-626d-4b89-8c46-a6cb341d2810",
+      "X-TransactionId" : "req-0ebe379c-6ccd-4821-afaa-05e277ec3161",
       "Content-Type" : "application/json"
     },
     "json" : {
-      "cloud-owner" : "CloudOwner",
-      "cloud-region-id" : "ONAP-POD-01-Rail-07",
-      "cloud-type" : "openstack",
-      "owner-defined-type" : "t1",
-      "cloud-region-version" : "titanium_cloud",
-      "complex-name" : "clli3",
-      "cloud-zone" : "CloudZone",
+      "cloud-owner" : "OCOMP",
+      "cloud-region-id" : "RegionOVP",
+      "cloud-type" : "OpenStack",
+      "owner-defined-type" : "ocomp",
+      "cloud-region-version" : "ocata",
+      "complex-name" : "ocomp-region",
+      "cloud-zone" : "az1",
       "sriov-automation" : "false",
-      "identity-url" : "url",
-      "cloud-extra-info" : "{\"openstack-region-id\":\"ONAP-POD-01-Rail-07\"}",
+      "identity-url" : "http://10.12.11.1:5000/v3",
+      "cloud-extra-info" : "{\"openstack-region-id\":\"RegionOVP\"}",
       "esr-system-info-list" : {
         "esr-system-info" : [ {
-          "esr-system-info-id" : "5c85ce1f-aa78-4ebf-8d6f-4b62773e9bce",
+          "esr-system-info-id" : "OCOMP",
           "service-url" : "http://10.12.11.1:5000/v3",
-          "user-name" : "cloud_username",
-          "password" : "cloud_password",
+          "user-name" : "admin",
+          "password" : "password",
           "system-type" : "VIM",
           "ssl-insecure" : "true",
           "cloud-domain" : "Default",
-          "default-tenant" : "Integration-HPA",
+          "default-tenant" : "ocomp",
           "system-status" : "active"
         } ]
       }
@@ -39,4 +39,4 @@
     "status" : 201,
     "json" : null
   }
-} ]
+} ]
\ No newline at end of file
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-dublin-sample.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-dublin-sample.yaml
index 9948815e..51e747c7 100644
--- a/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-dublin-sample.yaml
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-dublin-sample.yaml
@@ -1,22 +1,10 @@
-# Copyright © Intel Corporation 2019
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
 open_cli_sample_version: 1.0
 name: cloud-create
 version: onap-dublin
 samples:
   sample1:
     name: cloud-create
-    input: -e 5c85ce1f-aa78-4ebf-8d6f-4b62773e9bce -b cloud_username -I {\"openstack-region-id\":\"ONAP-POD-01-Rail-07\"} -x CloudOwner -y ONAP-POD-01-Rail-07 -j cloud_password -w titanium_cloud -l Integration-HPA -url http://10.12.11.1:5000/v3 -n clli3 -q openstack -r t1 -Q VIM -i url -g CloudZone -z true -k active -c Default
+    input: --format json --username admin --complex-name ocomp-region --system-status active --ssl-insecure true --cloud-owner OCOMP --region-name RegionOVP --cloud-zone az1 --identity-url http://10.12.11.1:5000/v3 --system-type VIM --owner-type ocomp --cloud-domain Default --esr-id OCOMP --default-tenant ocomp --password password --service-url http://10.12.11.1:5000/v3 --cloud-type OpenStack --cloud-region-version ocata
     moco: cloud-create-schema-dublin-moco.json
-    output:
+    output: |
+      [{}]
diff --git a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-dublin.yaml b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-dublin.yaml
index ad56e529..d57a1b2b 100644
--- a/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-dublin.yaml
+++ b/products/onap-dublin/features/aai/src/main/resources/open-cli-schema/infra/cloud/cloud-create-schema-dublin.yaml
@@ -41,7 +41,7 @@ parameters:
     short_option: q
     long_option:  cloud-type
     is_optional: false
-  - name: owner-defined-type
+  - name: owner-type
     description: owner defined type
     type: string
     short_option: r
@@ -77,14 +77,14 @@ parameters:
     short_option: S
     long_option:  sriov-automation
     is_optional: true
-    default: false
+    default_value: false
   - name: identity-url
     description: Onap identity-url, updated by multicloud if multicloud is used
     type: string
     short_option: i
     long_option:  identity-url
     is_optional: false
-  - name: esr-system-info-id
+  - name: esr-id
     description: id for esr system (arbitrary UUID e.g 5c85ce1f-aa78-4ebf-8d6f-4b62773e9bc8)
     type: uuid
     short_option: e
@@ -96,11 +96,11 @@ parameters:
     short_option: url
     long_option:  service-url
     is_optional: false
-  - name: user-name
+  - name: username
     description: cloud user name
     type: string
     short_option: b
-    long_option:  user-name
+    long_option:  username
     is_optional: false
   - name: password
     description: cloud password
@@ -138,12 +138,6 @@ parameters:
     short_option: k
     long_option:  system-status
     is_optional: false
-  - name: cloud-extra-info
-    description: extra info to register cloud , generally string with region id e.g {\"openstack-region-id\":\"region-id\"}, enter as {\\"openstack-region-id\\":\\"ONAP-POD-01-Rail-07\\"} with CLI
-    type: string
-    short_option: I
-    long_option:  extra-info
-    is_optional: false
 
 http:
   service:
@@ -156,19 +150,19 @@ http:
                 "cloud-owner": "${cloud-owner}",
                 "cloud-region-id": "${region-name}",
                 "cloud-type": "${cloud-type}",
-                "owner-defined-type": "${owner-defined-type}",
+                "owner-defined-type": "${owner-type}",
                 "cloud-region-version": "${cloud-region-version}",
                 "complex-name":"${complex-name}",
                 "cloud-zone": "${cloud-zone}",
                 "sriov-automation": "${sriov-automation}",
                 "identity-url": "${identity-url}",
-                "cloud-extra-info":"${cloud-extra-info}",
+                "cloud-extra-info":"{\"openstack-region-id\":\"${region-name}\"}",
                 "esr-system-info-list": {
                 "esr-system-info":[
                  {
-                      "esr-system-info-id":"${esr-system-info-id}",
+                      "esr-system-info-id":"${esr-id}",
                       "service-url": "${service-url}",
-                      "user-name":"${user-name}",
+                      "user-name":"${username}",
                       "password":"${password}",
                       "system-type": "${system-type}",
                       "ssl-insecure": "${ssl-insecure}",