From 11f11fc85edc7b3b060549f5b1516e0805d9b372 Mon Sep 17 00:00:00 2001
From: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
Date: Fri, 28 Sep 2018 10:52:14 +0530
Subject: Casablanca: AAI business

Issue-ID: CLI-122

Change-Id: I4dc3cdb431753e1b42b56fd14e59f8311235cad4
Signed-off-by: Kanagaraj Manickam k00365106 <kanagaraj.manickam@huawei.com>
---
 .../customer-create-schema-casablanca-moco.json    | 22 ++++++++++++++
 .../customer-create-schema-casablanca-sample.yaml  |  9 ++++++
 .../customer-delete-schema-casablanca-moco.json    | 18 +++++++++++
 .../customer-delete-schema-casablanca-sample.yaml  |  9 ++++++
 .../customer-list-schema-casablanca-moco.json      | 35 ++++++++++++++++++++++
 .../customer-list-schema-casablanca-sample.yaml    | 18 +++++++++++
 .../customer-show-schema-casablanca-moco.json      | 23 ++++++++++++++
 .../customer-show-schema-casablanca-sample.yaml    | 14 +++++++++
 ...service-type-create-schema-casablanca-moco.json | 21 +++++++++++++
 ...rvice-type-create-schema-casablanca-sample.yaml |  9 ++++++
 ...service-type-delete-schema-casablanca-moco.json | 18 +++++++++++
 ...rvice-type-delete-schema-casablanca-sample.yaml |  9 ++++++
 .../service-type-list-schema-casablanca-moco.json  | 24 +++++++++++++++
 ...service-type-list-schema-casablanca-sample.yaml |  9 ++++++
 ...subscription-create-schema-casablanca-moco.json | 20 +++++++++++++
 ...bscription-create-schema-casablanca-sample.yaml |  9 ++++++
 ...subscription-delete-schema-casablanca-moco.json | 18 +++++++++++
 ...bscription-delete-schema-casablanca-sample.yaml |  9 ++++++
 .../subscription-list-schema-casablanca-moco.json  | 23 ++++++++++++++
 ...subscription-list-schema-casablanca-sample.yaml | 14 +++++++++
 .../customer-create-schema-casablanca-moco.json    | 22 --------------
 .../customer-create-schema-casablanca-sample.yaml  |  9 ------
 .../customer-delete-schema-casablanca-moco.json    | 18 -----------
 .../customer-delete-schema-casablanca-sample.yaml  |  9 ------
 .../customer-list-schema-casablanca-moco.json      | 35 ----------------------
 .../customer-list-schema-casablanca-sample.yaml    | 18 -----------
 .../customer-show-schema-casablanca-moco.json      | 23 --------------
 .../customer-show-schema-casablanca-sample.yaml    | 14 ---------
 ...service-type-create-schema-casablanca-moco.json | 21 -------------
 ...rvice-type-create-schema-casablanca-sample.yaml |  9 ------
 ...service-type-delete-schema-casablanca-moco.json | 18 -----------
 ...rvice-type-delete-schema-casablanca-sample.yaml |  9 ------
 .../service-type-list-schema-casablanca-moco.json  | 24 ---------------
 ...service-type-list-schema-casablanca-sample.yaml |  9 ------
 ...subscription-create-schema-casablanca-moco.json | 20 -------------
 ...bscription-create-schema-casablanca-sample.yaml |  9 ------
 ...subscription-delete-schema-casablanca-moco.json | 18 -----------
 ...bscription-delete-schema-casablanca-sample.yaml |  9 ------
 .../subscription-list-schema-casablanca-moco.json  | 23 --------------
 ...subscription-list-schema-casablanca-sample.yaml | 14 ---------
 40 files changed, 331 insertions(+), 331 deletions(-)
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-casablanca-moco.json
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-casablanca-sample.yaml
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-delete-schema-casablanca-moco.json
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-delete-schema-casablanca-sample.yaml
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-list-schema-casablanca-moco.json
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-list-schema-casablanca-sample.yaml
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-show-schema-casablanca-moco.json
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-show-schema-casablanca-sample.yaml
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-casablanca-moco.json
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-casablanca-sample.yaml
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-delete-schema-casablanca-moco.json
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-delete-schema-casablanca-sample.yaml
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-list-schema-casablanca-moco.json
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-list-schema-casablanca-sample.yaml
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-casablanca-moco.json
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-casablanca-sample.yaml
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-delete-schema-casablanca-moco.json
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-delete-schema-casablanca-sample.yaml
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-list-schema-casablanca-moco.json
 create mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-list-schema-casablanca-sample.yaml
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-create-schema-casablanca-moco.json
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-create-schema-casablanca-sample.yaml
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-delete-schema-casablanca-moco.json
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-delete-schema-casablanca-sample.yaml
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-list-schema-casablanca-moco.json
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-list-schema-casablanca-sample.yaml
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-show-schema-casablanca-moco.json
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-show-schema-casablanca-sample.yaml
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-create-schema-casablanca-moco.json
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-create-schema-casablanca-sample.yaml
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-delete-schema-casablanca-moco.json
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-delete-schema-casablanca-sample.yaml
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-list-schema-casablanca-moco.json
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-list-schema-casablanca-sample.yaml
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-create-schema-casablanca-moco.json
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-create-schema-casablanca-sample.yaml
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-delete-schema-casablanca-moco.json
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-delete-schema-casablanca-sample.yaml
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-list-schema-casablanca-moco.json
 delete mode 100644 products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-list-schema-casablanca-sample.yaml

(limited to 'products/onap-casablanca/features/aai/src/main/resources/open-cli-sample')

diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-casablanca-moco.json
new file mode 100644
index 00000000..7ca8a6b7
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-casablanca-moco.json
@@ -0,0 +1,22 @@
+[ {
+  "request" : {
+    "method" : "put",
+    "uri" : "/aai/v13/business/customers/customer/mrkanag",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-5dc2d328-9cc0-4297-8d6c-2108ee9c9036",
+      "Content-Type" : "application/json"
+    },
+    "json" : {
+      "global-customer-id" : "mrkanag",
+      "subscriber-name" : "mrkanag",
+      "subscriber-type" : "INFRA"
+    }
+  },
+  "response" : {
+    "status" : 201,
+    "json" : null
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-casablanca-sample.yaml
new file mode 100644
index 00000000..5764a36c
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-casablanca-sample.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+name: customer-create
+version: onap-casablanca
+samples:
+  sample1:
+    name: customer-create
+    input: --customer-name mrkanag --subscriber-name mrkanag -d
+    moco: customer-create-schema-casablanca-moco.json
+    output:
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-delete-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-delete-schema-casablanca-moco.json
new file mode 100644
index 00000000..5caefa73
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-delete-schema-casablanca-moco.json
@@ -0,0 +1,18 @@
+[ {
+  "request" : {
+    "method" : "delete",
+    "uri" : "/aai/v13/business/customers/customer/mrkanag",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-491247e3-a6c7-4c4a-8af5-a98c85442307",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 204,
+    "json" : null
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-delete-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-delete-schema-casablanca-sample.yaml
new file mode 100644
index 00000000..221f2a62
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-delete-schema-casablanca-sample.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+name: customer-delete
+version: onap-casablanca
+samples:
+  sample1:
+    name: customer-delete
+    input: --customer-id mrkanag --resource-version 1538105836430 -d
+    moco: customer-delete-schema-casablanca-moco.json
+    output:
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-list-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-list-schema-casablanca-moco.json
new file mode 100644
index 00000000..be7ab31e
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-list-schema-casablanca-moco.json
@@ -0,0 +1,35 @@
+[ {
+  "request" : {
+    "method" : "get",
+    "uri" : "/aai/v13/business/customers",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-6e5c21be-a7a2-459d-8765-99f7663cdce9",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 200,
+    "json" : {
+      "customer" : [ {
+        "global-customer-id" : "Customer1",
+        "subscriber-name" : "Customer1",
+        "subscriber-type" : "BSS",
+        "resource-version" : "1535520279641"
+      }, {
+        "global-customer-id" : "generic",
+        "subscriber-name" : "generic",
+        "subscriber-type" : "BSS",
+        "resource-version" : "1535628858377"
+      }, {
+        "global-customer-id" : "mrkanag",
+        "subscriber-name" : "mrkanag",
+        "subscriber-type" : "INFRA",
+        "resource-version" : "1538105836430"
+      } ]
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-list-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-list-schema-casablanca-sample.yaml
new file mode 100644
index 00000000..66520916
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-list-schema-casablanca-sample.yaml
@@ -0,0 +1,18 @@
+open_cli_sample_version: 1.0
+name: customer-list
+version: onap-casablanca
+samples:
+  sample1:
+    name: customer-list
+    input: 
+    moco: customer-list-schema-casablanca-moco.json
+    output: |
+      +------------+------------------+
+      |name        |resource-version  |
+      +------------+------------------+
+      |Customer1   |1535520279641     |
+      +------------+------------------+
+      |generic     |1535628858377     |
+      +------------+------------------+
+      |mrkanag     |1538105836430     |
+      +------------+------------------+
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-show-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-show-schema-casablanca-moco.json
new file mode 100644
index 00000000..0919a999
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-show-schema-casablanca-moco.json
@@ -0,0 +1,23 @@
+[ {
+  "request" : {
+    "method" : "get",
+    "uri" : "/aai/v13/business/customers/customer/mrkanag",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-04a4060f-b2ac-4cb5-97fb-2ec535599434",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 200,
+    "json" : {
+      "global-customer-id" : "mrkanag",
+      "subscriber-name" : "mrkanag",
+      "subscriber-type" : "INFRA",
+      "resource-version" : "1538105836430"
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-show-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-show-schema-casablanca-sample.yaml
new file mode 100644
index 00000000..aa38612d
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-show-schema-casablanca-sample.yaml
@@ -0,0 +1,14 @@
+open_cli_sample_version: 1.0
+name: customer-show
+version: onap-casablanca
+samples:
+  sample1:
+    name: customer-show
+    input: --customer-name mrkanag --long
+    moco: customer-show-schema-casablanca-moco.json
+    output: |
+      +----------+------------------+------------------+------------------+
+      |name      |subscriber-name   |resource-version  |subscriber-type   |
+      +----------+------------------+------------------+------------------+
+      |mrkanag   |mrkanag           |1538105836430     |INFRA             |
+      +----------+------------------+------------------+------------------+
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-casablanca-moco.json
new file mode 100644
index 00000000..c1382f2b
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-casablanca-moco.json
@@ -0,0 +1,21 @@
+[ {
+  "request" : {
+    "method" : "put",
+    "uri" : "/aai/v13/service-design-and-creation/services/service/a6402d68-0784-4972-aa99-c20caa46f459",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-11ae6b5e-d3f7-49d7-9192-2dcadb69d445",
+      "Content-Type" : "application/json"
+    },
+    "json" : {
+      "service-description" : "vfw-in",
+      "service-id" : "a6402d68-0784-4972-aa99-c20caa46f459"
+    }
+  },
+  "response" : {
+    "status" : 201,
+    "json" : null
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-casablanca-sample.yaml
new file mode 100644
index 00000000..db0bfada
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-casablanca-sample.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+name: service-type-create
+version: onap-casablanca
+samples:
+  sample1:
+    name: service-type-create
+    input: --service-type vfw-in -d
+    moco: service-type-create-schema-casablanca-moco.json
+    output:
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-delete-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-delete-schema-casablanca-moco.json
new file mode 100644
index 00000000..8aa6d794
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-delete-schema-casablanca-moco.json
@@ -0,0 +1,18 @@
+[ {
+  "request" : {
+    "method" : "delete",
+    "uri" : "/aai/v13/service-design-and-creation/services/service/a6402d68-0784-4972-aa99-c20caa46f459",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-a45a6df7-0763-44ab-990f-cc506da567ab",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 204,
+    "json" : null
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-delete-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-delete-schema-casablanca-sample.yaml
new file mode 100644
index 00000000..17b067f5
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-delete-schema-casablanca-sample.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+name: service-type-delete
+version: onap-casablanca
+samples:
+  sample1:
+    name: service-type-delete
+    input: --service-type-id a6402d68-0784-4972-aa99-c20caa46f459 --resource-version 1538109817240 -d
+    moco: service-type-delete-schema-casablanca-moco.json
+    output:
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-list-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-list-schema-casablanca-moco.json
new file mode 100644
index 00000000..89b813ec
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-list-schema-casablanca-moco.json
@@ -0,0 +1,24 @@
+[ {
+  "request" : {
+    "method" : "get",
+    "uri" : "/aai/v13/service-design-and-creation/services",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-e3ff2ec6-e10b-42a9-8d3e-0a29996b9fa8",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 200,
+    "json" : {
+      "service" : [ {
+        "service-id" : "a6402d68-0784-4972-aa99-c20caa46f459",
+        "service-description" : "vfw-in",
+        "resource-version" : "1538109817240"
+      } ]
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-list-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-list-schema-casablanca-sample.yaml
new file mode 100644
index 00000000..fe831ed9
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-list-schema-casablanca-sample.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+name: service-type-list
+version: onap-casablanca
+samples:
+  sample1:
+    name: service-type-list
+    input: -d
+    moco: service-type-list-schema-casablanca-moco.json
+    output: |
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-casablanca-moco.json
new file mode 100644
index 00000000..52dfd8fb
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-casablanca-moco.json
@@ -0,0 +1,20 @@
+[ {
+  "request" : {
+    "method" : "put",
+    "uri" : "/aai/v13/business/customers/customer/mrkanag/service-subscriptions/service-subscription/vfw-in",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-c2045a35-97a4-4ace-a7df-4db031ba0da9",
+      "Content-Type" : "application/json"
+    },
+    "json" : {
+      "service-type" : "vfw-in"
+    }
+  },
+  "response" : {
+    "status" : 201,
+    "json" : null
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-casablanca-sample.yaml
new file mode 100644
index 00000000..5e4d97cf
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-casablanca-sample.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+name: subscription-create
+version: onap-casablanca
+samples:
+  sample1:
+    name: subscription-create
+    input: --customer-name mrkanag --service-type vfw-in -d
+    moco: subscription-create-schema-casablanca-moco.json
+    output:
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-delete-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-delete-schema-casablanca-moco.json
new file mode 100644
index 00000000..2dd49b18
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-delete-schema-casablanca-moco.json
@@ -0,0 +1,18 @@
+[ {
+  "request" : {
+    "method" : "delete",
+    "uri" : "/aai/v13/business/customers/customer/mrkanag/service-subscriptions/service-subscription/vfw-in",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-944713a2-16f1-4dc7-b4fa-913b041d0db8",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 204,
+    "json" : null
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-delete-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-delete-schema-casablanca-sample.yaml
new file mode 100644
index 00000000..f4d76164
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-delete-schema-casablanca-sample.yaml
@@ -0,0 +1,9 @@
+open_cli_sample_version: 1.0
+name: subscription-delete
+version: onap-casablanca
+samples:
+  sample1:
+    name: subscription-delete
+    input: --customer-name mrkanag --service-type vfw-in --resource-version 1538111525606 -d
+    moco: subscription-delete-schema-casablanca-moco.json
+    output:
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-list-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-list-schema-casablanca-moco.json
new file mode 100644
index 00000000..8dcf7a24
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-list-schema-casablanca-moco.json
@@ -0,0 +1,23 @@
+[ {
+  "request" : {
+    "method" : "get",
+    "uri" : "/aai/v13/business/customers/customer/mrkanag/service-subscriptions",
+    "headers" : {
+      "Authorization" : "Basic QUFJOkFBSQ==",
+      "X-FromAppId" : "ONAP CLI",
+      "Accept" : "application/json",
+      "X-TransactionId" : "req-aa70d08c-0e55-422a-be1e-eede28708f70",
+      "Content-Type" : "application/json"
+    },
+    "json" : null
+  },
+  "response" : {
+    "status" : 200,
+    "json" : {
+      "service-subscription" : [ {
+        "service-type" : "vfw-in",
+        "resource-version" : "1538111525606"
+      } ]
+    }
+  }
+} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-list-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-list-schema-casablanca-sample.yaml
new file mode 100644
index 00000000..7303ca23
--- /dev/null
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-list-schema-casablanca-sample.yaml
@@ -0,0 +1,14 @@
+open_cli_sample_version: 1.0
+name: subscription-list
+version: onap-casablanca
+samples:
+  sample1:
+    name: subscription-list
+    input: --customer-name mrkanag
+    moco: subscription-list-schema-casablanca-moco.json
+    output: |
+      +--------------+------------------+
+      |service-type  |resource-version  |
+      +--------------+------------------+
+      |vfw-in        |1538111525606     |
+      +--------------+------------------+
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-create-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-create-schema-casablanca-moco.json
deleted file mode 100644
index 7ca8a6b7..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-create-schema-casablanca-moco.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[ {
-  "request" : {
-    "method" : "put",
-    "uri" : "/aai/v13/business/customers/customer/mrkanag",
-    "headers" : {
-      "Authorization" : "Basic QUFJOkFBSQ==",
-      "X-FromAppId" : "ONAP CLI",
-      "Accept" : "application/json",
-      "X-TransactionId" : "req-5dc2d328-9cc0-4297-8d6c-2108ee9c9036",
-      "Content-Type" : "application/json"
-    },
-    "json" : {
-      "global-customer-id" : "mrkanag",
-      "subscriber-name" : "mrkanag",
-      "subscriber-type" : "INFRA"
-    }
-  },
-  "response" : {
-    "status" : 201,
-    "json" : null
-  }
-} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-create-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-create-schema-casablanca-sample.yaml
deleted file mode 100644
index 5764a36c..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-create-schema-casablanca-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-name: customer-create
-version: onap-casablanca
-samples:
-  sample1:
-    name: customer-create
-    input: --customer-name mrkanag --subscriber-name mrkanag -d
-    moco: customer-create-schema-casablanca-moco.json
-    output:
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-delete-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-delete-schema-casablanca-moco.json
deleted file mode 100644
index 5caefa73..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-delete-schema-casablanca-moco.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[ {
-  "request" : {
-    "method" : "delete",
-    "uri" : "/aai/v13/business/customers/customer/mrkanag",
-    "headers" : {
-      "Authorization" : "Basic QUFJOkFBSQ==",
-      "X-FromAppId" : "ONAP CLI",
-      "Accept" : "application/json",
-      "X-TransactionId" : "req-491247e3-a6c7-4c4a-8af5-a98c85442307",
-      "Content-Type" : "application/json"
-    },
-    "json" : null
-  },
-  "response" : {
-    "status" : 204,
-    "json" : null
-  }
-} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-delete-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-delete-schema-casablanca-sample.yaml
deleted file mode 100644
index 221f2a62..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-delete-schema-casablanca-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-name: customer-delete
-version: onap-casablanca
-samples:
-  sample1:
-    name: customer-delete
-    input: --customer-id mrkanag --resource-version 1538105836430 -d
-    moco: customer-delete-schema-casablanca-moco.json
-    output:
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-list-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-list-schema-casablanca-moco.json
deleted file mode 100644
index be7ab31e..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-list-schema-casablanca-moco.json
+++ /dev/null
@@ -1,35 +0,0 @@
-[ {
-  "request" : {
-    "method" : "get",
-    "uri" : "/aai/v13/business/customers",
-    "headers" : {
-      "Authorization" : "Basic QUFJOkFBSQ==",
-      "X-FromAppId" : "ONAP CLI",
-      "Accept" : "application/json",
-      "X-TransactionId" : "req-6e5c21be-a7a2-459d-8765-99f7663cdce9",
-      "Content-Type" : "application/json"
-    },
-    "json" : null
-  },
-  "response" : {
-    "status" : 200,
-    "json" : {
-      "customer" : [ {
-        "global-customer-id" : "Customer1",
-        "subscriber-name" : "Customer1",
-        "subscriber-type" : "BSS",
-        "resource-version" : "1535520279641"
-      }, {
-        "global-customer-id" : "generic",
-        "subscriber-name" : "generic",
-        "subscriber-type" : "BSS",
-        "resource-version" : "1535628858377"
-      }, {
-        "global-customer-id" : "mrkanag",
-        "subscriber-name" : "mrkanag",
-        "subscriber-type" : "INFRA",
-        "resource-version" : "1538105836430"
-      } ]
-    }
-  }
-} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-list-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-list-schema-casablanca-sample.yaml
deleted file mode 100644
index 66520916..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-list-schema-casablanca-sample.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-open_cli_sample_version: 1.0
-name: customer-list
-version: onap-casablanca
-samples:
-  sample1:
-    name: customer-list
-    input: 
-    moco: customer-list-schema-casablanca-moco.json
-    output: |
-      +------------+------------------+
-      |name        |resource-version  |
-      +------------+------------------+
-      |Customer1   |1535520279641     |
-      +------------+------------------+
-      |generic     |1535628858377     |
-      +------------+------------------+
-      |mrkanag     |1538105836430     |
-      +------------+------------------+
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-show-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-show-schema-casablanca-moco.json
deleted file mode 100644
index 0919a999..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-show-schema-casablanca-moco.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[ {
-  "request" : {
-    "method" : "get",
-    "uri" : "/aai/v13/business/customers/customer/mrkanag",
-    "headers" : {
-      "Authorization" : "Basic QUFJOkFBSQ==",
-      "X-FromAppId" : "ONAP CLI",
-      "Accept" : "application/json",
-      "X-TransactionId" : "req-04a4060f-b2ac-4cb5-97fb-2ec535599434",
-      "Content-Type" : "application/json"
-    },
-    "json" : null
-  },
-  "response" : {
-    "status" : 200,
-    "json" : {
-      "global-customer-id" : "mrkanag",
-      "subscriber-name" : "mrkanag",
-      "subscriber-type" : "INFRA",
-      "resource-version" : "1538105836430"
-    }
-  }
-} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-show-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-show-schema-casablanca-sample.yaml
deleted file mode 100644
index aa38612d..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/customer/customer-show-schema-casablanca-sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-open_cli_sample_version: 1.0
-name: customer-show
-version: onap-casablanca
-samples:
-  sample1:
-    name: customer-show
-    input: --customer-name mrkanag --long
-    moco: customer-show-schema-casablanca-moco.json
-    output: |
-      +----------+------------------+------------------+------------------+
-      |name      |subscriber-name   |resource-version  |subscriber-type   |
-      +----------+------------------+------------------+------------------+
-      |mrkanag   |mrkanag           |1538105836430     |INFRA             |
-      +----------+------------------+------------------+------------------+
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-create-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-create-schema-casablanca-moco.json
deleted file mode 100644
index c1382f2b..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-create-schema-casablanca-moco.json
+++ /dev/null
@@ -1,21 +0,0 @@
-[ {
-  "request" : {
-    "method" : "put",
-    "uri" : "/aai/v13/service-design-and-creation/services/service/a6402d68-0784-4972-aa99-c20caa46f459",
-    "headers" : {
-      "Authorization" : "Basic QUFJOkFBSQ==",
-      "X-FromAppId" : "ONAP CLI",
-      "Accept" : "application/json",
-      "X-TransactionId" : "req-11ae6b5e-d3f7-49d7-9192-2dcadb69d445",
-      "Content-Type" : "application/json"
-    },
-    "json" : {
-      "service-description" : "vfw-in",
-      "service-id" : "a6402d68-0784-4972-aa99-c20caa46f459"
-    }
-  },
-  "response" : {
-    "status" : 201,
-    "json" : null
-  }
-} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-create-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-create-schema-casablanca-sample.yaml
deleted file mode 100644
index db0bfada..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-create-schema-casablanca-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-name: service-type-create
-version: onap-casablanca
-samples:
-  sample1:
-    name: service-type-create
-    input: --service-type vfw-in -d
-    moco: service-type-create-schema-casablanca-moco.json
-    output:
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-delete-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-delete-schema-casablanca-moco.json
deleted file mode 100644
index 8aa6d794..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-delete-schema-casablanca-moco.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[ {
-  "request" : {
-    "method" : "delete",
-    "uri" : "/aai/v13/service-design-and-creation/services/service/a6402d68-0784-4972-aa99-c20caa46f459",
-    "headers" : {
-      "Authorization" : "Basic QUFJOkFBSQ==",
-      "X-FromAppId" : "ONAP CLI",
-      "Accept" : "application/json",
-      "X-TransactionId" : "req-a45a6df7-0763-44ab-990f-cc506da567ab",
-      "Content-Type" : "application/json"
-    },
-    "json" : null
-  },
-  "response" : {
-    "status" : 204,
-    "json" : null
-  }
-} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-delete-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-delete-schema-casablanca-sample.yaml
deleted file mode 100644
index 17b067f5..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-delete-schema-casablanca-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-name: service-type-delete
-version: onap-casablanca
-samples:
-  sample1:
-    name: service-type-delete
-    input: --service-type-id a6402d68-0784-4972-aa99-c20caa46f459 --resource-version 1538109817240 -d
-    moco: service-type-delete-schema-casablanca-moco.json
-    output:
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-list-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-list-schema-casablanca-moco.json
deleted file mode 100644
index 89b813ec..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-list-schema-casablanca-moco.json
+++ /dev/null
@@ -1,24 +0,0 @@
-[ {
-  "request" : {
-    "method" : "get",
-    "uri" : "/aai/v13/service-design-and-creation/services",
-    "headers" : {
-      "Authorization" : "Basic QUFJOkFBSQ==",
-      "X-FromAppId" : "ONAP CLI",
-      "Accept" : "application/json",
-      "X-TransactionId" : "req-e3ff2ec6-e10b-42a9-8d3e-0a29996b9fa8",
-      "Content-Type" : "application/json"
-    },
-    "json" : null
-  },
-  "response" : {
-    "status" : 200,
-    "json" : {
-      "service" : [ {
-        "service-id" : "a6402d68-0784-4972-aa99-c20caa46f459",
-        "service-description" : "vfw-in",
-        "resource-version" : "1538109817240"
-      } ]
-    }
-  }
-} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-list-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-list-schema-casablanca-sample.yaml
deleted file mode 100644
index fe831ed9..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/service-type/service-type-list-schema-casablanca-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-name: service-type-list
-version: onap-casablanca
-samples:
-  sample1:
-    name: service-type-list
-    input: -d
-    moco: service-type-list-schema-casablanca-moco.json
-    output: |
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-create-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-create-schema-casablanca-moco.json
deleted file mode 100644
index 52dfd8fb..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-create-schema-casablanca-moco.json
+++ /dev/null
@@ -1,20 +0,0 @@
-[ {
-  "request" : {
-    "method" : "put",
-    "uri" : "/aai/v13/business/customers/customer/mrkanag/service-subscriptions/service-subscription/vfw-in",
-    "headers" : {
-      "Authorization" : "Basic QUFJOkFBSQ==",
-      "X-FromAppId" : "ONAP CLI",
-      "Accept" : "application/json",
-      "X-TransactionId" : "req-c2045a35-97a4-4ace-a7df-4db031ba0da9",
-      "Content-Type" : "application/json"
-    },
-    "json" : {
-      "service-type" : "vfw-in"
-    }
-  },
-  "response" : {
-    "status" : 201,
-    "json" : null
-  }
-} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-create-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-create-schema-casablanca-sample.yaml
deleted file mode 100644
index 5e4d97cf..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-create-schema-casablanca-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-name: subscription-create
-version: onap-casablanca
-samples:
-  sample1:
-    name: subscription-create
-    input: --customer-name mrkanag --service-type vfw-in -d
-    moco: subscription-create-schema-casablanca-moco.json
-    output:
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-delete-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-delete-schema-casablanca-moco.json
deleted file mode 100644
index 2dd49b18..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-delete-schema-casablanca-moco.json
+++ /dev/null
@@ -1,18 +0,0 @@
-[ {
-  "request" : {
-    "method" : "delete",
-    "uri" : "/aai/v13/business/customers/customer/mrkanag/service-subscriptions/service-subscription/vfw-in",
-    "headers" : {
-      "Authorization" : "Basic QUFJOkFBSQ==",
-      "X-FromAppId" : "ONAP CLI",
-      "Accept" : "application/json",
-      "X-TransactionId" : "req-944713a2-16f1-4dc7-b4fa-913b041d0db8",
-      "Content-Type" : "application/json"
-    },
-    "json" : null
-  },
-  "response" : {
-    "status" : 204,
-    "json" : null
-  }
-} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-delete-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-delete-schema-casablanca-sample.yaml
deleted file mode 100644
index f4d76164..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-delete-schema-casablanca-sample.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-open_cli_sample_version: 1.0
-name: subscription-delete
-version: onap-casablanca
-samples:
-  sample1:
-    name: subscription-delete
-    input: --customer-name mrkanag --service-type vfw-in --resource-version 1538111525606 -d
-    moco: subscription-delete-schema-casablanca-moco.json
-    output:
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-list-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-list-schema-casablanca-moco.json
deleted file mode 100644
index 8dcf7a24..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-list-schema-casablanca-moco.json
+++ /dev/null
@@ -1,23 +0,0 @@
-[ {
-  "request" : {
-    "method" : "get",
-    "uri" : "/aai/v13/business/customers/customer/mrkanag/service-subscriptions",
-    "headers" : {
-      "Authorization" : "Basic QUFJOkFBSQ==",
-      "X-FromAppId" : "ONAP CLI",
-      "Accept" : "application/json",
-      "X-TransactionId" : "req-aa70d08c-0e55-422a-be1e-eede28708f70",
-      "Content-Type" : "application/json"
-    },
-    "json" : null
-  },
-  "response" : {
-    "status" : 200,
-    "json" : {
-      "service-subscription" : [ {
-        "service-type" : "vfw-in",
-        "resource-version" : "1538111525606"
-      } ]
-    }
-  }
-} ]
\ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-list-schema-casablanca-sample.yaml b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-list-schema-casablanca-sample.yaml
deleted file mode 100644
index 7303ca23..00000000
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/subscription/subscription-list-schema-casablanca-sample.yaml
+++ /dev/null
@@ -1,14 +0,0 @@
-open_cli_sample_version: 1.0
-name: subscription-list
-version: onap-casablanca
-samples:
-  sample1:
-    name: subscription-list
-    input: --customer-name mrkanag
-    moco: subscription-list-schema-casablanca-moco.json
-    output: |
-      +--------------+------------------+
-      |service-type  |resource-version  |
-      +--------------+------------------+
-      |vfw-in        |1538111525606     |
-      +--------------+------------------+
-- 
cgit 1.2.3-korg