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, 164 deletions

diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-moco.json
deleted file mode 100644
index d14653f6..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-moco.json
+++ /dev/null
@@ -1,42 +0,0 @@
-[ {

-  "request" : {

-    "method" : "put",

-    "uri" : "/aai/v11/external-system/esr-ems-list/esr-ems/51a480ed-649c-4c47-a84b-f966dc4f9554",

-    "headers" : {

-      "Authorization" : "Basic QUFJOkFBSQ==",

-      "X-FromAppId" : "onap-cli",

-      "Accept" : "application/json",

-      "X-TransactionId" : "req-8552f11b-5e79-4d98-9e05-ccc4e66c42c0",

-      "Content-Type" : "application/json"

-    },

-    "json" : {

-      "ems-id" : "51a480ed-649c-4c47-a84b-f966dc4f9554",

-      "passive" : true,

-      "remote-path" : "sample",

-      "esr-system-info-list" : {

-        "esr-system-info" : [ {

-          "esr-system-info-id" : "51a480ed-649c-4c47-a84b-f966dc4f9554",

-          "system-name" : "ems1",

-          "type" : "ems",

-          "vendor" : "boco",

-          "version" : "1.0",

-          "service-url" : "http://10.0.0.1",

-          "user-name" : "admin",

-          "password" : "password",

-          "system-type" : "ems",

-          "protocal" : "",

-          "ssl-cacert" : "",

-          "ssl-insecure" : "",

-          "ip-address" : "",

-          "port" : "",

-          "cloud-domain" : "",

-          "default-tenant" : ""

-        } ]

-      }

-    }

-  },

-  "response" : {

-    "status" : 201,

-    "json" : null

-  }

-} ]
\ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml
deleted file mode 100644
index accd0567..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-create-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-onap_cli_sample_version: 1.0
-name: ems-register
-version: onap-1.1
-samples:
-  sample1:
-    name: ems-register
-    input: --name ems1 --type ems --vendor boco --ems-version 1.0 --url http://10.0.0.1 --username admin --password password --remote-path sample
-    moco: ems-create-schema-1.1-moco.json
-    output:
\ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json
deleted file mode 100644
index c5d12863..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-moco.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[ {

-  "request" : {

-    "method" : "delete",

-    "uri" : "/aai/v11/external-system/esr-ems-list/esr-ems/51a480ed-649c-4c47-a84b-f966dc4f9554",

-    "headers" : {

-      "Authorization" : "Basic QUFJOkFBSQ==",

-      "X-FromAppId" : "onap-cli",

-      "Accept" : "application/json",

-      "X-TransactionId" : "req-d9a77e12-34be-4d8f-b7da-c749dbc3fc8a",

-      "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/esr/ems/ems-delete-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml
deleted file mode 100644
index df4d080a..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-delete-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-onap_cli_sample_version: 1.0
-name: ems-unregister
-version: onap-1.1
-samples:
-  sample1:
-    name: ems-unregister
-    input: --ems-id 51a480ed-649c-4c47-a84b-f966dc4f9554 --resource-version 1509095358658
-    moco: ems-delete-schema-1.1-moco.json
-    output:
\ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-moco.json
deleted file mode 100644
index 4a2f1674..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-moco.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[ {

-  "request" : {

-    "method" : "get",

-    "uri" : "/aai/v11/external-system/esr-ems-list",

-    "headers" : {

-      "Authorization" : "Basic QUFJOkFBSQ==",

-      "X-FromAppId" : "onap-cli",

-      "Accept" : "application/json",

-      "X-TransactionId" : "req-ed3e792b-9436-4ddd-ba76-3684dca3e4cf",

-      "Content-Type" : "application/json"

-    },

-    "json" : null

-  },

-  "response" : {

-    "status" : 200,

-    "json" : {

-      "esr-ems" : [ {

-        "ems-id" : "51a480ed-649c-4c47-a84b-f966dc4f9554",

-        "resource-version" : "1509095358658"

-      } ]

-    }

-  }

-} ]
\ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml
deleted file mode 100644
index 174f4541..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-list-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-onap_cli_sample_version: 1.0
-name: ems-list
-version: onap-1.1
-samples:
-  sample1:
-    name: ems-list
-    input: 
-    moco: ems-list-schema-1.1-moco.json
-    output: |
-      +--------------------------------------+------------------+
-      |ems-id                                |resource-version  |
-      +--------------------------------------+------------------+
-      |51a480ed-649c-4c47-a84b-f966dc4f9554  |1509095358658     |
-      +--------------------------------------+------------------+
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-moco.json
deleted file mode 100644
index c9c09f97..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-moco.json
+++ /dev/null
@@ -1,35 +0,0 @@
-[ {

-  "request" : {

-    "method" : "get",

-    "uri" : "/aai/v11/external-system/esr-ems-list/esr-ems/51a480ed-649c-4c47-a84b-f966dc4f9554/esr-system-info-list/esr-system-info/51a480ed-649c-4c47-a84b-f966dc4f9554",

-    "headers" : {

-      "Authorization" : "Basic QUFJOkFBSQ==",

-      "X-FromAppId" : "onap-cli",

-      "Accept" : "application/json",

-      "X-TransactionId" : "req-369be4d7-7a6f-4e44-996e-1e65d8129cb4",

-      "Content-Type" : "application/json"

-    },

-    "json" : null

-  },

-  "response" : {

-    "status" : 200,

-    "json" : {

-      "esr-system-info-id" : "51a480ed-649c-4c47-a84b-f966dc4f9554",

-      "system-name" : "ems1",

-      "type" : "ems",

-      "vendor" : "boco",

-      "version" : "1.0",

-      "service-url" : "http://10.0.0.1",

-      "user-name" : "admin",

-      "password" : "password",

-      "system-type" : "ems",

-      "ssl-cacert" : "",

-      "ssl-insecure" : false,

-      "ip-address" : "",

-      "port" : "",

-      "cloud-domain" : "",

-      "default-tenant" : "",

-      "resource-version" : "1509095358847"

-    }

-  }

-} ]
\ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml
deleted file mode 100644
index 4601cdef..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/esr/ems/ems-show-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-onap_cli_sample_version: 1.0
-name: ems-show
-version: onap-1.1
-samples:
-  sample1:
-    name: ems-show
-    input: --ems-id 51a480ed-649c-4c47-a84b-f966dc4f9554
-    moco: ems-show-schema-1.1-moco.json
-    output: |
-      +------+------+--------+----------+------------------+
-      |name  |type  |vendor  |version   |url               |
-      +------+------+--------+----------+------------------+
-      |ems1  |ems   |boco    |1.0       |http://10.0.0.1   |
-      +------+------+--------+----------+------------------+