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

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

-  "request" : {

-    "method" : "put",

-    "uri" : "/aai/v11/business/customers/customer/kanag/service-subscriptions/service-subscription/vFW-kanag",

-    "headers" : {

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

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

-      "Accept" : "application/json",

-      "X-TransactionId" : "req-2f281cd8-98da-4cb5-899e-294d9bf7b03d",

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

-    },

-    "json" : {

-      "relationship-list" : {

-        "relationship" : [ {

-          "related-to" : "tenant",

-          "relationship-data" : [ {

-            "relationship-key" : "cloud-region.cloud-owner",

-            "relationship-value" : "huawei-cloud"

-          }, {

-            "relationship-key" : "cloud-region.cloud-region-id",

-            "relationship-value" : "bangalore"

-          }, {

-            "relationship-key" : "tenant.tenant-id",

-            "relationship-value" : "e18173e6-6a13-4614-a13c-3859e7321103"

-          } ]

-        } ]

-      },

-      "service-type" : "vFW-kanag"

-    }

-  },

-  "response" : {

-    "status" : 201,

-    "json" : null

-  }

-} ]
\ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml
deleted file mode 100644
index facdcc77..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-create-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-onap_cli_sample_version: 1.0
-name: subscription-create
-version: onap-1.1
-samples:
-  sample1:
-    name: subscription-create
-    input: --customer-name kanag --cloud-name huawei-cloud --cloud-region bangalore --cloud-tenant-id e18173e6-6a13-4614-a13c-3859e7321103 --service-type vFW-kanag
-    moco: subscription-create-schema-1.1-moco.json
-    output:
\ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-moco.json
deleted file mode 100644
index bcbd8451..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-moco.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[ {

-  "request" : {

-    "method" : "delete",

-    "uri" : "/aai/v11//business/customers/customer/kanag/service-subscriptions/service-subscription/vFW-kanag",

-    "headers" : {

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

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

-      "Accept" : "application/json",

-      "X-TransactionId" : "req-64fc35d5-c804-4e92-befd-0c695a77e12d",

-      "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/subscription/subscription-delete-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml
deleted file mode 100644
index f4b16b54..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-delete-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-onap_cli_sample_version: 1.0
-name: subscription-delete
-version: onap-1.1
-samples:
-  sample1:
-    name: subscription-delete
-    input: --customer-name kanag --service-type vFW-kanag --resource-version 1509079144326
-    moco: subscription-delete-schema-1.1-moco.json
-    output:
\ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-moco.json b/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-moco.json
deleted file mode 100644
index a70ce4e0..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-moco.json
+++ /dev/null
@@ -1,43 +0,0 @@
-[ {

-  "request" : {

-    "method" : "get",

-    "uri" : "/aai/v11/business/customers/customer/kanag/service-subscriptions",

-    "headers" : {

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

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

-      "Accept" : "application/json",

-      "X-TransactionId" : "req-fd86411d-c6ea-4af5-a4f8-2296587b832b",

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

-    },

-    "json" : null

-  },

-  "response" : {

-    "status" : 200,

-    "json" : {

-      "service-subscription" : [ {

-        "service-type" : "vFW-kanag",

-        "resource-version" : "1509079144326",

-        "relationship-list" : {

-          "relationship" : [ {

-            "related-to" : "tenant",

-            "related-link" : "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/tenants/tenant/e18173e6-6a13-4614-a13c-3859e7321103",

-            "relationship-data" : [ {

-              "relationship-key" : "cloud-region.cloud-owner",

-              "relationship-value" : "huawei-cloud"

-            }, {

-              "relationship-key" : "cloud-region.cloud-region-id",

-              "relationship-value" : "bangalore"

-            }, {

-              "relationship-key" : "tenant.tenant-id",

-              "relationship-value" : "e18173e6-6a13-4614-a13c-3859e7321103"

-            } ],

-            "related-to-property" : [ {

-              "property-key" : "tenant.tenant-name",

-              "property-value" : "kanag-tenant"

-            } ]

-          } ]

-        }

-      } ]

-    }

-  }

-} ]
\ No newline at end of file
diff --git a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml b/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml
deleted file mode 100644
index eb823673..00000000
--- a/plugins/aai/src/test/resources/onap-cli-sample/subscription/subscription-list-schema-1.1-sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-onap_cli_sample_version: 1.0
-name: subscription-list
-version: onap-1.1
-samples:
-  sample1:
-    name: subscription-list
-    input: --customer-name kanag
-    moco: subscription-list-schema-1.1-moco.json
-    output: |
-      +--------------+------------------+
-      |service-type  |resource-version  |
-      +--------------+------------------+
-      |vFW-kanag     |1509079144326     |
-      +--------------+------------------+