Merge changes I3bc55b53,Iff6d1f16,I19bdb8a1,Ia90bd215,I84533921

* changes:
  Remove the stale samples for cloud commands
  Add samples for cloud-delete
  Add samples for cloud-list
  Add samples for cloud-create command
  Fix the sample file name align with schema

9 files changed, 112 insertions, 34 deletions

diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-sample-1.1.yaml
deleted file mode 100644
index 6a5c55c0..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: cloud-create
-version: onap-1.1
-samples:
-    sample1:
-        name: Create a cloud region in onap
-        input: -h https://locahost:8443 -u AAI -p AAI  -x abc-xyz -y ABCXYZ25
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json
new file mode 100644
index 00000000..223ebd26
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json
@@ -0,0 +1,24 @@
+[ {
+  "request" : {
+    "method" : "put",
+    "uri" : "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "onap-cli",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-63eebfa7-ebdb-4707-9208-a159d2f53c6e",
+      "Content-Type" : "application/json"
+    },
+    "json" : {
+      "sriov-automation" : false,
+      "cloud-region-id" : "bangalore",
+      "cloud-owner" : "huawei-cloud",
+      "new-attribute-for-demo" : "blah",
+      "number-attribute-for-demo" : 1
+    }
+  },
+  "response" : {
+    "status" : 201,
+    "json" : null
+  }
+} ]
\ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml
new file mode 100644
index 00000000..ad3a521e
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml
@@ -0,0 +1,10 @@
+onap_cli_sample_version: 1.0
+name: cloud-create
+version: onap-1.1
+samples:
+  sample1:
+    name: cloud-create
+    input: --cloud-name huawei-cloud --region-name bangalore
+    moco: cloud-create-schema-1.1-moco.json
+    ouput: |
+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-sample-1.1.yaml
deleted file mode 100644
index c84b8eca..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-sample-1.1.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: cloud-delete
-version: onap-1.1
-samples:
-    sample1:
-        name: Delete the cloud region in onap
-        input: -h https://locahost:8443 -u AAI -p AAI  -x abc-xyz -y ABCXYZ25 -z 1504257554519
\ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json
new file mode 100644
index 00000000..85094a9d
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json
@@ -0,0 +1,18 @@
+[ {
+  "request" : {
+    "method" : "delete",
+    "uri" : "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud-test/bangalore-test",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "onap-cli",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-2d7993c7-9355-435a-a0d7-2f8aa02bf9a6",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 204,
+    "json" : null
+  }
+} ]
\ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml
new file mode 100644
index 00000000..57dbc878
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml
@@ -0,0 +1,10 @@
+onap_cli_sample_version: 1.0
+name: cloud-delete
+version: onap-1.1
+samples:
+  sample1:
+    name: cloud-delete
+    input: --cloud-name huawei-cloud-test --region-name bangalore-test --resource-version 1509027982352
+    moco: cloud-delete-schema-1.1-moco.json
+    ouput: |
+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample-1.1.yaml b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample-1.1.yaml
deleted file mode 100644
index ada90903..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-sample-1.1.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-onap_cli_sample_version: 1.0
-
-name: cloud-list
-version: onap-1.1
-samples:
-    sample1:
-        name: List the configured clouds in onap
-        input: -h https://locahost:8443 -u AAI -p AAI
-        output: |
-            +--------------------------------+------------------------------------+------------------+
-            |cloud                           |region                              |resource-version  |
-            +--------------------------------+------------------------------------+------------------+
-            |example-cloud-owner-val-44086   |example-cloud-region-id-val-67393   |1503503677953     |
-            +--------------------------------+------------------------------------+------------------+
-            |att-aic                         |AAIAIC25                            |1503380675        |
-            +--------------------------------+------------------------------------+------------------+
-            |abc-xyz                         |ABCXYZ25                            |1504257554519     |
-            +--------------------------------+------------------------------------+------------------+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json
new file mode 100644
index 00000000..2e5b1db0
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json
@@ -0,0 +1,34 @@
+[ {
+  "request" : {
+    "method" : "get",
+    "uri" : "/aai/v11/cloud-infrastructure/cloud-regions",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "onap-cli",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-77c08aa0-662e-4d32-9206-bd569c3bf61b",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 200,
+    "json" : {
+      "cloud-region" : [ {
+        "cloud-owner" : "huawei-cloud",
+        "cloud-region-id" : "bangalore",
+        "sriov-automation" : false,
+        "resource-version" : "1509027332165"
+      }, {
+        "cloud-owner" : "Rackspace",
+        "cloud-region-id" : "RegionOne",
+        "cloud-type" : "SharedNode",
+        "owner-defined-type" : "OwnerType",
+        "cloud-region-version" : "v1",
+        "cloud-zone" : "CloudZone",
+        "sriov-automation" : false,
+        "resource-version" : "1508827902543"
+      } ]
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml
new file mode 100644
index 00000000..e527ea8b
--- /dev/null
+++ b/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml
@@ -0,0 +1,16 @@
+onap_cli_sample_version: 1.0
+name: cloud-list
+version: onap-1.1
+samples:
+  sample1:
+    name: cloud-list
+    input:
+    moco: cloud-list-schema-1.1-moco.json
+    ouput: |
+      +--------------+------------+------------------+
+      |cloud         |region      |resource-version  |
+      +--------------+------------+------------------+
+      |huawei-cloud  |bangalore   |1509027332165     |
+      +--------------+------------+------------------+
+      |Rackspace     |RegionOne   |1508827902543     |
+      +--------------+------------+------------------+