Merges from 1.1.0

Issue-Id: CLI-66

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

8 files changed, 0 insertions, 150 deletions

diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-moco.json
deleted file mode 100644
index 18bb05d7..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-moco.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[ {
-  "request" : {
-    "method" : "put",
-    "uri" : "/aai/v11/business/customers/customer/test",
-    "headers" : {
-      "Authorization" : "Basic QUFJOkFBSQ==",
-      "X-FromAppId" : "onap-cli",
-      "Accept" : "application/json",
-      "X-TransactionId" : "req-9ad55bff-efbb-4306-bc8a-b76687e8e065",
-      "Content-Type" : "application/json"
-    },
-    "json" : {
-      "global-customer-id" : "test",
-      "subscriber-name" : "test",
-      "subscriber-type" : "INFRA"
-    }
-  },
-  "response" : {
-    "status" : 201,
-    "json" : null
-  }
-} ]
\ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-sample.yaml
deleted file mode 100644
index 72273417..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-create-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-onap_cli_sample_version: 1.0
-name: customer-create
-version: onap-1.1
-samples:
-  sample1:
-    name: customer-create
-    input: --customer-name test --subscriber-name test
-    moco: customer-create-schema-1.1-moco.json
-    output: |
-
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-moco.json
deleted file mode 100644
index 26e8a918..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-moco.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[ {
-  "request" : {
-    "method" : "delete",
-    "uri" : "/aai/v11/business/customers/customer/test",
-    "headers" : {
-      "Authorization" : "Basic QUFJOkFBSQ==",
-      "X-FromAppId" : "onap-cli",
-      "Accept" : "application/json",
-      "X-TransactionId" : "req-5f5bb7d0-5d03-42a3-a24f-fd8d125a7a8e",
-      "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/customer/customer-delete-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-sample.yaml
deleted file mode 100644
index 7e6f0dcb..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-delete-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-onap_cli_sample_version: 1.0
-name: customer-delete
-version: onap-1.1
-samples:
-  sample1:
-    name: customer-delete
-    input: --customer-name test --resource-version 1509029022293
-    moco: customer-delete-schema-1.1-moco.json
-    output: |
-
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-moco.json
deleted file mode 100644
index f7737271..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-moco.json
+++ /dev/null
@@ -1,35 +0,0 @@
-[ {
-  "request" : {
-    "method" : "get",
-    "uri" : "/aai/v11/business/customers",
-    "headers" : {
-      "Authorization" : "Basic QUFJOkFBSQ==",
-      "X-FromAppId" : "onap-cli",
-      "Accept" : "application/json",
-      "X-TransactionId" : "req-f56d4034-1ee8-469c-848a-8b9cd1afa19b",
-      "Content-Type" : "application/json"
-    },
-    "json" : null
-  },
-  "response" : {
-    "status" : 200,
-    "json" : {
-      "customer" : [ {
-        "global-customer-id" : "test",
-        "subscriber-name" : "test",
-        "subscriber-type" : "INFRA",
-        "resource-version" : "1509029022293"
-      }, {
-        "global-customer-id" : "kanag",
-        "subscriber-name" : "kanag",
-        "subscriber-type" : "INFRA",
-        "resource-version" : "1509029007060"
-      }, {
-        "global-customer-id" : "Demonstration",
-        "subscriber-name" : "Demonstration",
-        "subscriber-type" : "INFRA",
-        "resource-version" : "1508827908763"
-      } ]
-    }
-  }
-} ]
\ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-sample.yaml
deleted file mode 100644
index 7ff64210..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-list-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-onap_cli_sample_version: 1.0
-name: customer-list
-version: onap-1.1
-samples:
-  sample1:
-    name: customer-list
-    input:
-    moco: customer-list-schema-1.1-moco.json
-    output: |
-      +----------------+------------------+
-      |name            |resource-version  |
-      +----------------+------------------+
-      |test            |1509029022293     |
-      +----------------+------------------+
-      |kanag           |1509029007060     |
-      +----------------+------------------+
-      |Demonstration   |1508827908763     |
-      +----------------+------------------+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-moco.json
deleted file mode 100644
index 242db8c1..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-moco.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[ {
-  "request" : {
-    "method" : "get",
-    "uri" : "/aai/v11/business/customers/customer/kanag",
-    "headers" : {
-      "Authorization" : "Basic QUFJOkFBSQ==",
-      "X-FromAppId" : "onap-cli",
-      "Accept" : "application/json",
-      "X-TransactionId" : "req-95e5eac5-6839-49f3-8f9e-786789e69c67",
-      "Content-Type" : "application/json"
-    },
-    "json" : null
-  },
-  "response" : {
-    "status" : 200,
-    "json" : {
-      "global-customer-id" : "kanag",
-      "subscriber-name" : "kanag",
-      "subscriber-type" : "INFRA",
-      "resource-version" : "1509029007060"
-    }
-  }
-} ]
\ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-sample.yaml
deleted file mode 100644
index 1669ffd2..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/customer/customer-show-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-onap_cli_sample_version: 1.0
-name: customer-show
-version: onap-1.1
-samples:
-  sample1:
-    name: customer-show
-    input: --customer-name kanag --long
-    moco: customer-show-schema-1.1-moco.json
-    output: |
-      +--------+------------------+------------------+------------------+
-      |name    |subscriber-name   |resource-version  |subscriber-type   |
-      +--------+------------------+------------------+------------------+
-      |kanag   |kanag             |1509029007060     |INFRA             |
-      +--------+------------------+------------------+------------------+