Merges from 1.1.0

Issue-Id: CLI-66

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

6 files changed, 0 insertions, 112 deletions

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
deleted file mode 100644
index 223ebd26..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-moco.json
+++ /dev/null
@@ -1,24 +0,0 @@
-[ {
-  "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
deleted file mode 100644
index 9c64395d..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-create-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-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
-    output: |
-
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
deleted file mode 100644
index 85094a9d..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-moco.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[ {
-  "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
deleted file mode 100644
index a61523a3..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-delete-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-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
-    output: |
-
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
deleted file mode 100644
index 2e5b1db0..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-moco.json
+++ /dev/null
@@ -1,34 +0,0 @@
-[ {
-  "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
deleted file mode 100644
index 00342b23..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/cloud-region/cloud-list-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-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
-    output: |
-      +--------------+------------+------------------+
-      |cloud         |region      |resource-version  |
-      +--------------+------------+------------------+
-      |huawei-cloud  |bangalore   |1509027332165     |
-      +--------------+------------+------------------+
-      |Rackspace     |RegionOne   |1508827902543     |
-      +--------------+------------+------------------+