summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--framework/pom.xml4
-rw-r--r--framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java2
-rw-r--r--products/onap-casablanca/catalog/src/main/resources/open-cli-sample/catalog-schema-moco.json58
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-casablanca-moco.json42
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-delete-schema-casablanca-moco.json34
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-list-schema-casablanca-moco.json68
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-show-schema-casablanca-moco.json44
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-create-schema-casablanca-moco.json40
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-delete-schema-casablanca-moco.json34
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/service-type/service-type-list-schema-casablanca-moco.json46
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-create-schema-casablanca-moco.json38
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-delete-schema-casablanca-moco.json34
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/subscription/subscription-list-schema-casablanca-moco.json44
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-create-schema-casablanca-moco.json82
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-delete-schema-casablanca-moco.json34
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-list-schema-casablanca-moco.json44
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-show-schema-casablanca-moco.json68
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/sdnc/sdnc-create-schema-casablanca-moco.json82
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/sdnc/sdnc-delete-schema-casablanca-moco.json50
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/sdnc/sdnc-list-schema-casablanca-moco.json48
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-create-schema-beijing-moco.json68
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-delete-schema-casablanca-moco.json34
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-list-schema-casablanca-moco.json72
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-casablanca-moco.json82
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-casablanca-moco.json34
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-casablanca-moco.json48
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-casablanca-moco.json68
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-casablanca-moco.json46
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-delete-schema-casablanca-moco.json34
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-list-schema-casablanca-moco.json48
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-create-schema-casablanca-moco.json40
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-delete-schema-casablanca-moco.json34
-rw-r--r--products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-list-schema-casablanca-moco.json46
-rw-r--r--products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-casablanca-moco.json56
-rw-r--r--products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-create-schema-casablanca-moco.json60
-rw-r--r--products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-casablanca-moco.json58
-rw-r--r--products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-casablanca-moco.json52
-rw-r--r--products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-key-group-create-schema-casablanca-moco.json48
-rw-r--r--products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-submit-schema-casablanca-moco.json40
-rw-r--r--products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-casablanca-moco.json80
-rw-r--r--products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-list-schema-casablanca-moco.json114
-rw-r--r--products/onap-casablanca/features/vnfsdk/src/main/resources/open-cli-sample/vnftest-list-moco.json56
-rw-r--r--products/onap-casablanca/features/vnfsdk/src/main/resources/open-cli-sample/vnftest-run-moco.json44
-rw-r--r--products/onap-dublin/catalog/src/main/resources/open-cli-sample/catalog-schema-moco.json58
-rw-r--r--products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-commit-schema-dublin-moco.json46
-rw-r--r--profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java2
-rw-r--r--validate/validation/pom.xml2
47 files changed, 1133 insertions, 1133 deletions
diff --git a/framework/pom.xml b/framework/pom.xml
index 080bcab8..8f6aaffe 100644
--- a/framework/pom.xml
+++ b/framework/pom.xml
@@ -70,7 +70,7 @@
<version>1.3</version>
</dependency>
<!-- Change version from 1.9 to 1.13 due to "sonatype-2012-
- 0050" for commons-codec -->
+ 0050" for commons-codec -->
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
@@ -82,7 +82,7 @@
<version>1.3.2</version>
</dependency>
<!-- Change version from 3.2.9 to 5.1.2 due to "sonatype-2015-
- 0327" for spring-core -->
+ 0327" for spring-core -->
<dependency>
<groupId>org.springframework</groupId>
<artifactId>spring-core</artifactId>
diff --git a/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java b/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java
index e40dfdf4..9c31747b 100644
--- a/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java
+++ b/framework/src/test/java/org/onap/cli/fw/utils/OnapCommandUtilsTest.java
@@ -517,6 +517,6 @@ public class OnapCommandUtilsTest {
@Test
public void testMd5(){
- assertNotNull(OnapCommandUtils.md5("a"));
+ assertNotNull(OnapCommandUtils.md5("a"));
}
}
diff --git a/products/onap-casablanca/catalog/src/main/resources/open-cli-sample/catalog-schema-moco.json b/products/onap-casablanca/catalog/src/main/resources/open-cli-sample/catalog-schema-moco.json
index 8ed762b3..7284c8cd 100644
--- a/products/onap-casablanca/catalog/src/main/resources/open-cli-sample/catalog-schema-moco.json
+++ b/products/onap-casablanca/catalog/src/main/resources/open-cli-sample/catalog-schema-moco.json
@@ -11,34 +11,34 @@
"response" : {
"status" : 200,
"json" : {
- "serviceName": "so",
- "version": "v1",
- "url": "/ecomp/mso/infra",
- "protocol": "REST",
- "visualRange": "1",
- "lb_policy": "",
- "publish_port": "",
- "namespace": "",
- "network_plane_type": "",
- "host": "",
- "path": "",
- "enable_ssl": false,
- "nodes": [
- {
- "ip": "10.0.5.1",
- "port": "8080",
- "checkType": "",
- "checkUrl": "",
- "tls_skip_verify": true,
- "ha_role": "",
- "nodeId": "_v1_so_10.0.5.1_8080",
- "status": "passing"
- }
- ],
- "metadata": [],
- "labels": [],
- "status": "1",
- "is_manual": false
- }
+ "serviceName": "so",
+ "version": "v1",
+ "url": "/ecomp/mso/infra",
+ "protocol": "REST",
+ "visualRange": "1",
+ "lb_policy": "",
+ "publish_port": "",
+ "namespace": "",
+ "network_plane_type": "",
+ "host": "",
+ "path": "",
+ "enable_ssl": false,
+ "nodes": [
+ {
+ "ip": "10.0.5.1",
+ "port": "8080",
+ "checkType": "",
+ "checkUrl": "",
+ "tls_skip_verify": true,
+ "ha_role": "",
+ "nodeId": "_v1_so_10.0.5.1_8080",
+ "status": "passing"
+ }
+ ],
+ "metadata": [],
+ "labels": [],
+ "status": "1",
+ "is_manual": false
+ }
}
} ] \ 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-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/business/customer/customer-create-schema-casablanca-moco.json
index 7ca8a6b7..3f69e29f 100644
--- 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
@@ -1,22 +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
- }
+[ {
+ "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-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
index 5caefa73..a90e63ef 100644
--- 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
@@ -1,18 +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
- }
+[ {
+ "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-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
index be7ab31e..05f599de 100644
--- 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
@@ -1,35 +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"
- } ]
- }
- }
+[ {
+ "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-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
index 0919a999..a2b66331 100644
--- 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
@@ -1,23 +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"
- }
- }
+[ {
+ "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/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
index c1382f2b..65930ab7 100644
--- 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
@@ -1,21 +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
- }
+[ {
+ "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-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
index 8aa6d794..2c1894ec 100644
--- 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
@@ -1,18 +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
- }
+[ {
+ "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-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
index 89b813ec..f53e90f0 100644
--- 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
@@ -1,24 +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"
- } ]
- }
- }
+[ {
+ "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/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
index 52dfd8fb..df627f37 100644
--- 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
@@ -1,20 +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
- }
+[ {
+ "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-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
index 2dd49b18..e13405d7 100644
--- 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
@@ -1,18 +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
- }
+[ {
+ "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-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
index 8dcf7a24..ee4835e0 100644
--- 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
@@ -1,23 +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"
- } ]
- }
- }
+[ {
+ "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/esr/ems/ems-create-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-create-schema-casablanca-moco.json
index b53ae785..6a3bfa51 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-create-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-create-schema-casablanca-moco.json
@@ -1,42 +1,42 @@
-[ {
- "request" : {
- "method" : "put",
- "uri" : "/aai/v13/external-system/esr-ems-list/esr-ems/bfae89e5-d4d4-46ed-a700-a0a90d961627",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-6b3a932c-14a9-4e57-82f9-34bed8335340",
- "Content-Type" : "application/json"
- },
- "json" : {
- "ems-id" : "bfae89e5-d4d4-46ed-a700-a0a90d961627",
- "passive" : true,
- "remote-path" : "sample",
- "esr-system-info-list" : {
- "esr-system-info" : [ {
- "esr-system-info-id" : "bfae89e5-d4d4-46ed-a700-a0a90d961627",
- "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
- }
+[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/aai/v13/external-system/esr-ems-list/esr-ems/bfae89e5-d4d4-46ed-a700-a0a90d961627",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-6b3a932c-14a9-4e57-82f9-34bed8335340",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "ems-id" : "bfae89e5-d4d4-46ed-a700-a0a90d961627",
+ "passive" : true,
+ "remote-path" : "sample",
+ "esr-system-info-list" : {
+ "esr-system-info" : [ {
+ "esr-system-info-id" : "bfae89e5-d4d4-46ed-a700-a0a90d961627",
+ "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/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-delete-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-delete-schema-casablanca-moco.json
index 12de5ae3..2439df18 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-delete-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-delete-schema-casablanca-moco.json
@@ -1,18 +1,18 @@
-[ {
- "request" : {
- "method" : "delete",
- "uri" : "/aai/v13/external-system/esr-ems-list/esr-ems/bfae89e5-d4d4-46ed-a700-a0a90d961627",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-2a5b8f19-1975-41c9-9cbf-0326e38b8f93",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 204,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "delete",
+ "uri" : "/aai/v13/external-system/esr-ems-list/esr-ems/bfae89e5-d4d4-46ed-a700-a0a90d961627",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-2a5b8f19-1975-41c9-9cbf-0326e38b8f93",
+ "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/esr/ems/ems-list-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-list-schema-casablanca-moco.json
index dd3aeb56..23bcf38b 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-list-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-list-schema-casablanca-moco.json
@@ -1,23 +1,23 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/aai/v13/external-system/esr-ems-list",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-18c05764-8e44-4cb0-af47-7de4f5145159",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "esr-ems" : [ {
- "ems-id" : "bfae89e5-d4d4-46ed-a700-a0a90d961627",
- "resource-version" : "1538645515474"
- } ]
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/aai/v13/external-system/esr-ems-list",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-18c05764-8e44-4cb0-af47-7de4f5145159",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "esr-ems" : [ {
+ "ems-id" : "bfae89e5-d4d4-46ed-a700-a0a90d961627",
+ "resource-version" : "1538645515474"
+ } ]
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-show-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-show-schema-casablanca-moco.json
index e99e1291..1841e64c 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-show-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/ems/ems-show-schema-casablanca-moco.json
@@ -1,35 +1,35 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/aai/v13/external-system/esr-ems-list/esr-ems/bfae89e5-d4d4-46ed-a700-a0a90d961627/esr-system-info-list/esr-system-info/bfae89e5-d4d4-46ed-a700-a0a90d961627",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-2ea29d59-9491-4448-bbac-b776234b8418",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "esr-system-info-id" : "bfae89e5-d4d4-46ed-a700-a0a90d961627",
- "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" : "1538645515493"
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/aai/v13/external-system/esr-ems-list/esr-ems/bfae89e5-d4d4-46ed-a700-a0a90d961627/esr-system-info-list/esr-system-info/bfae89e5-d4d4-46ed-a700-a0a90d961627",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-2ea29d59-9491-4448-bbac-b776234b8418",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "esr-system-info-id" : "bfae89e5-d4d4-46ed-a700-a0a90d961627",
+ "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" : "1538645515493"
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/sdnc/sdnc-create-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/sdnc/sdnc-create-schema-casablanca-moco.json
index c248bdcc..b40eac67 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/sdnc/sdnc-create-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/sdnc/sdnc-create-schema-casablanca-moco.json
@@ -1,42 +1,42 @@
-[ {
- "request" : {
- "method" : "put",
- "uri" : "/aai/v13/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/6fbb4251-2eb1-4c41-b01f-4e5b128afabe",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-fa5795ef-76b9-4a4a-8a9c-e12781025b40",
- "Content-Type" : "application/json"
- },
- "json" : {
- "thirdparty-sdnc-id" : "6fbb4251-2eb1-4c41-b01f-4e5b128afabe",
- "location" : "core",
- "product-name" : "SDWAN",
- "esr-system-info-list" : {
- "esr-system-info" : [ {
- "esr-system-info-id" : "6fbb4251-2eb1-4c41-b01f-4e5b128afabe",
- "system-name" : "SDWANDomain63",
- "type" : "SDWAN",
- "vendor" : "huawei",
- "version" : "V3R1",
- "service-url" : "",
- "user-name" : "test",
- "password" : "password",
- "system-type" : "sdnc",
- "protocal" : "RESTCONF",
- "ssl-cacert" : "",
- "ssl-insecure" : "",
- "ip-address" : "172.60.50.63",
- "port" : "18008",
- "cloud-domain" : "",
- "default-tenant" : ""
- } ]
- }
- }
- },
- "response" : {
- "status" : 201,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/aai/v13/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/6fbb4251-2eb1-4c41-b01f-4e5b128afabe",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-fa5795ef-76b9-4a4a-8a9c-e12781025b40",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "thirdparty-sdnc-id" : "6fbb4251-2eb1-4c41-b01f-4e5b128afabe",
+ "location" : "core",
+ "product-name" : "SDWAN",
+ "esr-system-info-list" : {
+ "esr-system-info" : [ {
+ "esr-system-info-id" : "6fbb4251-2eb1-4c41-b01f-4e5b128afabe",
+ "system-name" : "SDWANDomain63",
+ "type" : "SDWAN",
+ "vendor" : "huawei",
+ "version" : "V3R1",
+ "service-url" : "",
+ "user-name" : "test",
+ "password" : "password",
+ "system-type" : "sdnc",
+ "protocal" : "RESTCONF",
+ "ssl-cacert" : "",
+ "ssl-insecure" : "",
+ "ip-address" : "172.60.50.63",
+ "port" : "18008",
+ "cloud-domain" : "",
+ "default-tenant" : ""
+ } ]
+ }
+ }
+ },
+ "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/esr/sdnc/sdnc-delete-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/sdnc/sdnc-delete-schema-casablanca-moco.json
index 87d76b12..f4f6ee86 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/sdnc/sdnc-delete-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/sdnc/sdnc-delete-schema-casablanca-moco.json
@@ -1,26 +1,26 @@
-[ {
- "request" : {
- "method" : "delete",
- "uri" : "/aai/v13/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/6fbb4251-2eb1-4c41-b01f-4e5b128afabe",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-7b427aa1-1d6d-4a4f-90a3-264cc42f1ab8",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 404,
- "json" : {
- "requestError" : {
- "serviceException" : {
- "messageId" : "SVC3001",
- "text" : "Resource not found for %1 using id %2 (msg=%3) (ec=%4)",
- "variables" : [ "DELETE", "external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/6fbb4251-2eb1-4c41-b01f-4e5b128afabe", "Node Not Found:No Node of type esr-thirdparty-sdnc found at: external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/6fbb4251-2eb1-4c41-b01f-4e5b128afabe", "ERR.5.4.6114" ]
- }
- }
- }
- }
+[ {
+ "request" : {
+ "method" : "delete",
+ "uri" : "/aai/v13/external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/6fbb4251-2eb1-4c41-b01f-4e5b128afabe",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-7b427aa1-1d6d-4a4f-90a3-264cc42f1ab8",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 404,
+ "json" : {
+ "requestError" : {
+ "serviceException" : {
+ "messageId" : "SVC3001",
+ "text" : "Resource not found for %1 using id %2 (msg=%3) (ec=%4)",
+ "variables" : [ "DELETE", "external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/6fbb4251-2eb1-4c41-b01f-4e5b128afabe", "Node Not Found:No Node of type esr-thirdparty-sdnc found at: external-system/esr-thirdparty-sdnc-list/esr-thirdparty-sdnc/6fbb4251-2eb1-4c41-b01f-4e5b128afabe", "ERR.5.4.6114" ]
+ }
+ }
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/sdnc/sdnc-list-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/sdnc/sdnc-list-schema-casablanca-moco.json
index e85e123e..1fbf06d5 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/sdnc/sdnc-list-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/sdnc/sdnc-list-schema-casablanca-moco.json
@@ -1,25 +1,25 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/aai/v13/external-system/esr-thirdparty-sdnc-list",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-4b666ab3-b1a9-4c4d-b150-f9db9e0b053d",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "esr-thirdparty-sdnc" : [ {
- "thirdparty-sdnc-id" : "6fbb4251-2eb1-4c41-b01f-4e5b128afabe",
- "location" : "core",
- "product-name" : "SDWAN",
- "resource-version" : "1538648650726"
- } ]
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/aai/v13/external-system/esr-thirdparty-sdnc-list",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-4b666ab3-b1a9-4c4d-b150-f9db9e0b053d",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "esr-thirdparty-sdnc" : [ {
+ "thirdparty-sdnc-id" : "6fbb4251-2eb1-4c41-b01f-4e5b128afabe",
+ "location" : "core",
+ "product-name" : "SDWAN",
+ "resource-version" : "1538648650726"
+ } ]
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-create-schema-beijing-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-create-schema-beijing-moco.json
index 1a44aa09..e950bdcc 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-create-schema-beijing-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-create-schema-beijing-moco.json
@@ -1,35 +1,35 @@
-[ {
- "request" : {
- "method" : "put",
- "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/esr-system-info-list/esr-system-info/6a47cd3d-a24c-4d71-b47d-bfe729acce7b",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-73d3c542-567c-4ad1-be40-a0baf85bdfde",
- "Content-Type" : "application/json"
- },
- "json" : {
- "esr-system-info-id" : "6a47cd3d-a24c-4d71-b47d-bfe729acce7b",
- "system-name" : "vim-onap",
- "type" : "OpenStack",
- "vendor" : "Devstack",
- "version" : "ocata",
- "service-url" : "http://192.168.16.149/identity",
- "user-name" : "onap",
- "password" : "onap",
- "system-type" : "vim",
- "protocal" : "",
- "ssl-cacert" : "",
- "ssl-insecure" : "false",
- "ip-address" : "",
- "port" : "",
- "cloud-domain" : "default",
- "default-tenant" : "onap"
- }
- },
- "response" : {
- "status" : 201,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/esr-system-info-list/esr-system-info/6a47cd3d-a24c-4d71-b47d-bfe729acce7b",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-73d3c542-567c-4ad1-be40-a0baf85bdfde",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "esr-system-info-id" : "6a47cd3d-a24c-4d71-b47d-bfe729acce7b",
+ "system-name" : "vim-onap",
+ "type" : "OpenStack",
+ "vendor" : "Devstack",
+ "version" : "ocata",
+ "service-url" : "http://192.168.16.149/identity",
+ "user-name" : "onap",
+ "password" : "onap",
+ "system-type" : "vim",
+ "protocal" : "",
+ "ssl-cacert" : "",
+ "ssl-insecure" : "false",
+ "ip-address" : "",
+ "port" : "",
+ "cloud-domain" : "default",
+ "default-tenant" : "onap"
+ }
+ },
+ "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/esr/vim/vim-delete-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-delete-schema-casablanca-moco.json
index 0f564bea..6e45c18c 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-delete-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-delete-schema-casablanca-moco.json
@@ -1,18 +1,18 @@
-[ {
- "request" : {
- "method" : "delete",
- "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/esr-system-info-list/esr-system-info/6a47cd3d-a24c-4d71-b47d-bfe729acce7b",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-fb8c06d9-12d6-4698-ad1b-3c3615d7c936",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 204,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "delete",
+ "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/esr-system-info-list/esr-system-info/6a47cd3d-a24c-4d71-b47d-bfe729acce7b",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-fb8c06d9-12d6-4698-ad1b-3c3615d7c936",
+ "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/esr/vim/vim-list-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-list-schema-casablanca-moco.json
index a94cd712..b5734501 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-list-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vim/vim-list-schema-casablanca-moco.json
@@ -1,37 +1,37 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/esr-system-info-list",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-7794bfc8-0fc6-4760-a1e2-c7f7234df42b",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "esr-system-info" : [ {
- "esr-system-info-id" : "6a47cd3d-a24c-4d71-b47d-bfe729acce7b",
- "system-name" : "vim-onap",
- "type" : "OpenStack",
- "vendor" : "Devstack",
- "version" : "ocata",
- "service-url" : "http://192.168.16.149/identity",
- "user-name" : "onap",
- "password" : "onap",
- "system-type" : "vim",
- "ssl-cacert" : "",
- "ssl-insecure" : false,
- "ip-address" : "",
- "port" : "",
- "cloud-domain" : "default",
- "default-tenant" : "onap",
- "resource-version" : "1538644383786"
- } ]
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/esr-system-info-list",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-7794bfc8-0fc6-4760-a1e2-c7f7234df42b",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "esr-system-info" : [ {
+ "esr-system-info-id" : "6a47cd3d-a24c-4d71-b47d-bfe729acce7b",
+ "system-name" : "vim-onap",
+ "type" : "OpenStack",
+ "vendor" : "Devstack",
+ "version" : "ocata",
+ "service-url" : "http://192.168.16.149/identity",
+ "user-name" : "onap",
+ "password" : "onap",
+ "system-type" : "vim",
+ "ssl-cacert" : "",
+ "ssl-insecure" : false,
+ "ip-address" : "",
+ "port" : "",
+ "cloud-domain" : "default",
+ "default-tenant" : "onap",
+ "resource-version" : "1538644383786"
+ } ]
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-casablanca-moco.json
index 6c047537..b1aa967b 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-create-schema-casablanca-moco.json
@@ -1,42 +1,42 @@
-[ {
- "request" : {
- "method" : "put",
- "uri" : "/aai/v13/external-system/esr-vnfm-list/esr-vnfm/3c96d72b-7fd8-45f7-a9bb-c9d270001eb8",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-d263bbf3-1fa4-435a-858d-f11c9af5f651",
- "Content-Type" : "application/json"
- },
- "json" : {
- "vnfm-id" : "3c96d72b-7fd8-45f7-a9bb-c9d270001eb8",
- "vim-id" : "6a47cd3d-a24c-4d71-b47d-bfe729acce7b",
- "certificate-url" : "",
- "esr-system-info-list" : {
- "esr-system-info" : [ {
- "esr-system-info-id" : "3c96d72b-7fd8-45f7-a9bb-c9d270001eb8",
- "system-name" : "vnfm-hw",
- "type" : "OpenStack",
- "vendor" : "Huawei",
- "version" : "1.0",
- "service-url" : "http://10.0.1.1",
- "user-name" : "admin",
- "password" : "password",
- "system-type" : "vnfm",
- "protocal" : "",
- "ssl-cacert" : "",
- "ssl-insecure" : "",
- "ip-address" : "",
- "port" : "",
- "cloud-domain" : "",
- "default-tenant" : ""
- } ]
- }
- }
- },
- "response" : {
- "status" : 201,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/aai/v13/external-system/esr-vnfm-list/esr-vnfm/3c96d72b-7fd8-45f7-a9bb-c9d270001eb8",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-d263bbf3-1fa4-435a-858d-f11c9af5f651",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "vnfm-id" : "3c96d72b-7fd8-45f7-a9bb-c9d270001eb8",
+ "vim-id" : "6a47cd3d-a24c-4d71-b47d-bfe729acce7b",
+ "certificate-url" : "",
+ "esr-system-info-list" : {
+ "esr-system-info" : [ {
+ "esr-system-info-id" : "3c96d72b-7fd8-45f7-a9bb-c9d270001eb8",
+ "system-name" : "vnfm-hw",
+ "type" : "OpenStack",
+ "vendor" : "Huawei",
+ "version" : "1.0",
+ "service-url" : "http://10.0.1.1",
+ "user-name" : "admin",
+ "password" : "password",
+ "system-type" : "vnfm",
+ "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/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-casablanca-moco.json
index 7cb28094..ee737f20 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-delete-schema-casablanca-moco.json
@@ -1,18 +1,18 @@
-[ {
- "request" : {
- "method" : "delete",
- "uri" : "/aai/v13/external-system/esr-vnfm-list/esr-vnfm/3c96d72b-7fd8-45f7-a9bb-c9d270001eb8",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-d0883a72-b220-4578-9c38-4dce8ec0fad1",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 204,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "delete",
+ "uri" : "/aai/v13/external-system/esr-vnfm-list/esr-vnfm/3c96d72b-7fd8-45f7-a9bb-c9d270001eb8",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-d0883a72-b220-4578-9c38-4dce8ec0fad1",
+ "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/esr/vnfm/vnfm-list-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-casablanca-moco.json
index 5ae1057a..713562ec 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-list-schema-casablanca-moco.json
@@ -1,25 +1,25 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/aai/v13/external-system/esr-vnfm-list",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-3a30a455-1807-42f2-a3c9-2e62b5c42e20",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "esr-vnfm" : [ {
- "vnfm-id" : "3c96d72b-7fd8-45f7-a9bb-c9d270001eb8",
- "vim-id" : "6a47cd3d-a24c-4d71-b47d-bfe729acce7b",
- "certificate-url" : "",
- "resource-version" : "1538645099584"
- } ]
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/aai/v13/external-system/esr-vnfm-list",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-3a30a455-1807-42f2-a3c9-2e62b5c42e20",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "esr-vnfm" : [ {
+ "vnfm-id" : "3c96d72b-7fd8-45f7-a9bb-c9d270001eb8",
+ "vim-id" : "6a47cd3d-a24c-4d71-b47d-bfe729acce7b",
+ "certificate-url" : "",
+ "resource-version" : "1538645099584"
+ } ]
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-casablanca-moco.json
index f1ae621e..b167b7e0 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/esr/vnfm/vnfm-show-schema-casablanca-moco.json
@@ -1,35 +1,35 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/aai/v13/external-system/esr-vnfm-list/esr-vnfm/3c96d72b-7fd8-45f7-a9bb-c9d270001eb8/esr-system-info-list/esr-system-info/3c96d72b-7fd8-45f7-a9bb-c9d270001eb8",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-eb87600e-80a4-4a9f-b878-df2de9b44eb4",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "esr-system-info-id" : "3c96d72b-7fd8-45f7-a9bb-c9d270001eb8",
- "system-name" : "vnfm-hw",
- "type" : "OpenStack",
- "vendor" : "Huawei",
- "version" : "1.0",
- "service-url" : "http://10.0.1.1",
- "user-name" : "admin",
- "password" : "password",
- "system-type" : "vnfm",
- "ssl-cacert" : "",
- "ssl-insecure" : false,
- "ip-address" : "",
- "port" : "",
- "cloud-domain" : "",
- "default-tenant" : "",
- "resource-version" : "1538645099620"
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/aai/v13/external-system/esr-vnfm-list/esr-vnfm/3c96d72b-7fd8-45f7-a9bb-c9d270001eb8/esr-system-info-list/esr-system-info/3c96d72b-7fd8-45f7-a9bb-c9d270001eb8",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-eb87600e-80a4-4a9f-b878-df2de9b44eb4",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "esr-system-info-id" : "3c96d72b-7fd8-45f7-a9bb-c9d270001eb8",
+ "system-name" : "vnfm-hw",
+ "type" : "OpenStack",
+ "vendor" : "Huawei",
+ "version" : "1.0",
+ "service-url" : "http://10.0.1.1",
+ "user-name" : "admin",
+ "password" : "password",
+ "system-type" : "vnfm",
+ "ssl-cacert" : "",
+ "ssl-insecure" : false,
+ "ip-address" : "",
+ "port" : "",
+ "cloud-domain" : "",
+ "default-tenant" : "",
+ "resource-version" : "1538645099620"
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-casablanca-moco.json
index ac9e061c..78f797b8 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-create-schema-casablanca-moco.json
@@ -1,24 +1,24 @@
-[ {
- "request" : {
- "method" : "put",
- "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-875d27b0-5136-4ac3-88b2-516803fda9d4",
- "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
- }
+[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-875d27b0-5136-4ac3-88b2-516803fda9d4",
+ "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/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-delete-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-delete-schema-casablanca-moco.json
index 34af1852..93c74e28 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-delete-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-delete-schema-casablanca-moco.json
@@ -1,18 +1,18 @@
-[ {
- "request" : {
- "method" : "delete",
- "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-88c58f14-7c55-4691-ba8a-98466fea7743",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 204,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "delete",
+ "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-88c58f14-7c55-4691-ba8a-98466fea7743",
+ "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/infra/cloud/cloud-list-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-list-schema-casablanca-moco.json
index c539ac40..dade3411 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-list-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/cloud/cloud-list-schema-casablanca-moco.json
@@ -1,25 +1,25 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/aai/v13/cloud-infrastructure/cloud-regions",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-8465f051-c389-40ff-9a5c-8c7e1ac01b7c",
- "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" : "1538643783460"
- } ]
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/aai/v13/cloud-infrastructure/cloud-regions",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-8465f051-c389-40ff-9a5c-8c7e1ac01b7c",
+ "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" : "1538643783460"
+ } ]
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-create-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-create-schema-casablanca-moco.json
index 8b5f664f..d0c95d82 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-create-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-create-schema-casablanca-moco.json
@@ -1,21 +1,21 @@
-[ {
- "request" : {
- "method" : "put",
- "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/tenants/tenant/b00fc210-dd12-4b40-be2f-b9ef9153c00c",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-d482dd0b-201c-44c8-af21-20c421550d74",
- "Content-Type" : "application/json"
- },
- "json" : {
- "tenant-id" : "b00fc210-dd12-4b40-be2f-b9ef9153c00c",
- "tenant-name" : "onap"
- }
- },
- "response" : {
- "status" : 201,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/tenants/tenant/b00fc210-dd12-4b40-be2f-b9ef9153c00c",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-d482dd0b-201c-44c8-af21-20c421550d74",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "tenant-id" : "b00fc210-dd12-4b40-be2f-b9ef9153c00c",
+ "tenant-name" : "onap"
+ }
+ },
+ "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/infra/tenant/tenant-delete-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-delete-schema-casablanca-moco.json
index 59fd1837..b46285fa 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-delete-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-delete-schema-casablanca-moco.json
@@ -1,18 +1,18 @@
-[ {
- "request" : {
- "method" : "delete",
- "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/tenants/tenant/b00fc210-dd12-4b40-be2f-b9ef9153c00c",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-f9356ea8-6829-454c-b61f-2be4245d2f5d",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 204,
- "json" : null
- }
+[ {
+ "request" : {
+ "method" : "delete",
+ "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/tenants/tenant/b00fc210-dd12-4b40-be2f-b9ef9153c00c",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-f9356ea8-6829-454c-b61f-2be4245d2f5d",
+ "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/infra/tenant/tenant-list-schema-casablanca-moco.json b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-list-schema-casablanca-moco.json
index 0c801d61..6ae97193 100644
--- a/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-list-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/aai/src/main/resources/open-cli-sample/infra/tenant/tenant-list-schema-casablanca-moco.json
@@ -1,24 +1,24 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/tenants",
- "headers" : {
- "Authorization" : "Basic QUFJOkFBSQ==",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "X-TransactionId" : "req-bbfb7c9a-e638-42dd-bcdb-50df0740c1dc",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "tenant" : [ {
- "tenant-id" : "b00fc210-dd12-4b40-be2f-b9ef9153c00c",
- "tenant-name" : "onap",
- "resource-version" : "1538647781315"
- } ]
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/aai/v13/cloud-infrastructure/cloud-regions/cloud-region/huawei-cloud/bangalore/tenants",
+ "headers" : {
+ "Authorization" : "Basic QUFJOkFBSQ==",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "X-TransactionId" : "req-bbfb7c9a-e638-42dd-bcdb-50df0740c1dc",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "tenant" : [ {
+ "tenant-id" : "b00fc210-dd12-4b40-be2f-b9ef9153c00c",
+ "tenant-name" : "onap",
+ "resource-version" : "1538647781315"
+ } ]
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-casablanca-moco.json b/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-casablanca-moco.json
index b22f95cc..1acb32e6 100644
--- a/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-aggreement-create-schema-casablanca-moco.json
@@ -1,29 +1,29 @@
-[ {
- "request" : {
- "method" : "post",
- "uri" : "/onboarding-api/v1.0/vendor-license-models/d8c1362526414b9bbe25cdd972eebf0e/versions/7afd0daa8271470db3b556fdedf074f4/license-agreements",
- "headers" : {
- "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "USER_ID" : "cs0008",
- "X-TransactionId" : "req-84977a57-d8dd-47a9-87fb-6171b3a02db8",
- "Content-Type" : "application/json"
- },
- "json" : {
- "addedFeatureGroupsIds" : [ "e4ba1e16f22f44c59051dead1fa7d1cf" ],
- "description" : "Huawei Test license",
- "licenseTerm" : {
- "choice" : "Fixed_Term",
- "other" : ""
- },
- "name" : "Test aggrement"
- }
- },
- "response" : {
- "status" : 200,
- "json" : {
- "value" : "ddfcedccb72241a1b87c63be74896322"
- }
- }
+[ {
+ "request" : {
+ "method" : "post",
+ "uri" : "/onboarding-api/v1.0/vendor-license-models/d8c1362526414b9bbe25cdd972eebf0e/versions/7afd0daa8271470db3b556fdedf074f4/license-agreements",
+ "headers" : {
+ "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "USER_ID" : "cs0008",
+ "X-TransactionId" : "req-84977a57-d8dd-47a9-87fb-6171b3a02db8",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "addedFeatureGroupsIds" : [ "e4ba1e16f22f44c59051dead1fa7d1cf" ],
+ "description" : "Huawei Test license",
+ "licenseTerm" : {
+ "choice" : "Fixed_Term",
+ "other" : ""
+ },
+ "name" : "Test aggrement"
+ }
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "value" : "ddfcedccb72241a1b87c63be74896322"
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-create-schema-casablanca-moco.json b/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-create-schema-casablanca-moco.json
index b885f3f0..0ef60dc0 100644
--- a/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-create-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-create-schema-casablanca-moco.json
@@ -1,31 +1,31 @@
-[ {
- "request" : {
- "method" : "post",
- "uri" : "/onboarding-api/v1.0/vendor-license-models",
- "headers" : {
- "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "USER_ID" : "cs0008",
- "X-TransactionId" : "req-4692c777-f63e-4e50-a994-b5c208b62a9a",
- "Content-Type" : "application/json"
- },
- "json" : {
- "vendorName" : "Huawei IN",
- "description" : "Huawei Test license",
- "iconRef" : "icon"
- }
- },
- "response" : {
- "status" : 200,
- "json" : {
- "itemId" : "d8c1362526414b9bbe25cdd972eebf0e",
- "version" : {
- "id" : "7afd0daa8271470db3b556fdedf074f4",
- "name" : "1.0",
- "description" : "Initial version",
- "status" : "Draft"
- }
- }
- }
+[ {
+ "request" : {
+ "method" : "post",
+ "uri" : "/onboarding-api/v1.0/vendor-license-models",
+ "headers" : {
+ "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "USER_ID" : "cs0008",
+ "X-TransactionId" : "req-4692c777-f63e-4e50-a994-b5c208b62a9a",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "vendorName" : "Huawei IN",
+ "description" : "Huawei Test license",
+ "iconRef" : "icon"
+ }
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "itemId" : "d8c1362526414b9bbe25cdd972eebf0e",
+ "version" : {
+ "id" : "7afd0daa8271470db3b556fdedf074f4",
+ "name" : "1.0",
+ "description" : "Initial version",
+ "status" : "Draft"
+ }
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-casablanca-moco.json b/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-casablanca-moco.json
index c4052efe..6ccb52c1 100644
--- a/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-entitlement-pool-create-schema-casablanca-moco.json
@@ -1,30 +1,30 @@
-[ {
- "request" : {
- "method" : "post",
- "uri" : "/onboarding-api/v1.0/vendor-license-models/d8c1362526414b9bbe25cdd972eebf0e/versions/7afd0daa8271470db3b556fdedf074f4/entitlement-pools",
- "headers" : {
- "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "USER_ID" : "cs0008",
- "X-TransactionId" : "req-f141aab8-be09-417a-9363-1ccf1f796280",
- "Content-Type" : "application/json"
- },
- "json" : {
- "name" : "Test Pool",
- "time" : {
- "choice" : "",
- "other" : ""
- },
- "startDate" : "12/12/2018",
- "expiryDate" : "10/11/2019",
- "manufacturerReferenceNumber" : "123456"
- }
- },
- "response" : {
- "status" : 200,
- "json" : {
- "value" : "3091c5af38bf4fc3b3e17371c9fecbda"
- }
- }
+[ {
+ "request" : {
+ "method" : "post",
+ "uri" : "/onboarding-api/v1.0/vendor-license-models/d8c1362526414b9bbe25cdd972eebf0e/versions/7afd0daa8271470db3b556fdedf074f4/entitlement-pools",
+ "headers" : {
+ "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "USER_ID" : "cs0008",
+ "X-TransactionId" : "req-f141aab8-be09-417a-9363-1ccf1f796280",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "name" : "Test Pool",
+ "time" : {
+ "choice" : "",
+ "other" : ""
+ },
+ "startDate" : "12/12/2018",
+ "expiryDate" : "10/11/2019",
+ "manufacturerReferenceNumber" : "123456"
+ }
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "value" : "3091c5af38bf4fc3b3e17371c9fecbda"
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-casablanca-moco.json b/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-casablanca-moco.json
index e2e4a1ad..dd07556f 100644
--- a/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-feature-group-create-schema-casablanca-moco.json
@@ -1,27 +1,27 @@
-[ {
- "request" : {
- "method" : "post",
- "uri" : "/onboarding-api/v1.0/vendor-license-models/d8c1362526414b9bbe25cdd972eebf0e/versions/7afd0daa8271470db3b556fdedf074f4/feature-groups",
- "headers" : {
- "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "USER_ID" : "cs0008",
- "X-TransactionId" : "req-aec4e184-23a7-48ac-88fb-96202e971b25",
- "Content-Type" : "application/json"
- },
- "json" : {
- "name" : "Test key group",
- "addedLicenseKeyGroupsIds" : [ "f3fd5a1294694f8590051c2755a4a918" ],
- "addedEntitlementPoolsIds" : [ "3091c5af38bf4fc3b3e17371c9fecbda" ],
- "partNumber" : "654321",
- "description" : "Huawei Test license"
- }
- },
- "response" : {
- "status" : 200,
- "json" : {
- "value" : "e4ba1e16f22f44c59051dead1fa7d1cf"
- }
- }
+[ {
+ "request" : {
+ "method" : "post",
+ "uri" : "/onboarding-api/v1.0/vendor-license-models/d8c1362526414b9bbe25cdd972eebf0e/versions/7afd0daa8271470db3b556fdedf074f4/feature-groups",
+ "headers" : {
+ "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "USER_ID" : "cs0008",
+ "X-TransactionId" : "req-aec4e184-23a7-48ac-88fb-96202e971b25",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "name" : "Test key group",
+ "addedLicenseKeyGroupsIds" : [ "f3fd5a1294694f8590051c2755a4a918" ],
+ "addedEntitlementPoolsIds" : [ "3091c5af38bf4fc3b3e17371c9fecbda" ],
+ "partNumber" : "654321",
+ "description" : "Huawei Test license"
+ }
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "value" : "e4ba1e16f22f44c59051dead1fa7d1cf"
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-key-group-create-schema-casablanca-moco.json b/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-key-group-create-schema-casablanca-moco.json
index d74f37b5..51f0e1f4 100644
--- a/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-key-group-create-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-key-group-create-schema-casablanca-moco.json
@@ -1,25 +1,25 @@
-[ {
- "request" : {
- "method" : "post",
- "uri" : "/onboarding-api/v1.0/vendor-license-models/d8c1362526414b9bbe25cdd972eebf0e/versions/7afd0daa8271470db3b556fdedf074f4/license-key-groups",
- "headers" : {
- "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "USER_ID" : "cs0008",
- "X-TransactionId" : "req-9247b01c-1707-42d5-bc83-3402d5c48501",
- "Content-Type" : "application/json"
- },
- "json" : {
- "description" : "Huawei Test license",
- "name" : "Test key group",
- "type" : "Universal"
- }
- },
- "response" : {
- "status" : 200,
- "json" : {
- "value" : "f3fd5a1294694f8590051c2755a4a918"
- }
- }
+[ {
+ "request" : {
+ "method" : "post",
+ "uri" : "/onboarding-api/v1.0/vendor-license-models/d8c1362526414b9bbe25cdd972eebf0e/versions/7afd0daa8271470db3b556fdedf074f4/license-key-groups",
+ "headers" : {
+ "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "USER_ID" : "cs0008",
+ "X-TransactionId" : "req-9247b01c-1707-42d5-bc83-3402d5c48501",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "description" : "Huawei Test license",
+ "name" : "Test key group",
+ "type" : "Universal"
+ }
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "value" : "f3fd5a1294694f8590051c2755a4a918"
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-submit-schema-casablanca-moco.json b/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-submit-schema-casablanca-moco.json
index 7460914b..52d6fd29 100644
--- a/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-submit-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vlm/vlm-submit-schema-casablanca-moco.json
@@ -1,21 +1,21 @@
-[ {
- "request" : {
- "method" : "put",
- "uri" : "/onboarding-api/v1.0/vendor-license-models/d8c1362526414b9bbe25cdd972eebf0e/versions/7afd0daa8271470db3b556fdedf074f4/actions",
- "headers" : {
- "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "USER_ID" : "cs0008",
- "X-TransactionId" : "req-bb4ab620-1c37-48f0-9fe1-96df9838c0ed",
- "Content-Type" : "application/json"
- },
- "json" : {
- "action" : "Submit"
- }
- },
- "response" : {
- "status" : 200,
- "json" : { }
- }
+[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/onboarding-api/v1.0/vendor-license-models/d8c1362526414b9bbe25cdd972eebf0e/versions/7afd0daa8271470db3b556fdedf074f4/actions",
+ "headers" : {
+ "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "USER_ID" : "cs0008",
+ "X-TransactionId" : "req-bb4ab620-1c37-48f0-9fe1-96df9838c0ed",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "action" : "Submit"
+ }
+ },
+ "response" : {
+ "status" : 200,
+ "json" : { }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-casablanca-moco.json b/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-casablanca-moco.json
index 7720cc9e..5d460755 100644
--- a/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-create-schema-casablanca-moco.json
@@ -1,41 +1,41 @@
-[ {
- "request" : {
- "method" : "post",
- "uri" : "/onboarding-api/v1.0/vendor-software-products",
- "headers" : {
- "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "USER_ID" : "cs0008",
- "X-TransactionId" : "req-2d36d422-79f1-4d8e-bada-dee0e32266c2",
- "Content-Type" : "application/json"
- },
- "json" : {
- "category" : "resourceNewCategory.generic",
- "vendorId" : "d8c1362526414b9bbe25cdd972eebf0e",
- "subCategory" : "resourceNewCategory.generic.abstract",
- "description" : "vFW sample vsp",
- "licensingVersion" : "7afd0daa8271470db3b556fdedf074f4",
- "licensingData" : {
- "featureGroups" : [ "e4ba1e16f22f44c59051dead1fa7d1cf" ],
- "licenseAgreement" : "ddfcedccb72241a1b87c63be74896322"
- },
- "icon" : "icon",
- "onboardingMethod" : "Manual",
- "vendorName" : "Huawei IN",
- "name" : "vFW software"
- }
- },
- "response" : {
- "status" : 200,
- "json" : {
- "itemId" : "5223ac6156ce4a5fb3b33ab205f34c6e",
- "version" : {
- "id" : "0732aefa14634e398f16ccfdabc8ed0a",
- "name" : "1.0",
- "description" : "Initial version",
- "status" : "Draft"
- }
- }
- }
+[ {
+ "request" : {
+ "method" : "post",
+ "uri" : "/onboarding-api/v1.0/vendor-software-products",
+ "headers" : {
+ "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "USER_ID" : "cs0008",
+ "X-TransactionId" : "req-2d36d422-79f1-4d8e-bada-dee0e32266c2",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "category" : "resourceNewCategory.generic",
+ "vendorId" : "d8c1362526414b9bbe25cdd972eebf0e",
+ "subCategory" : "resourceNewCategory.generic.abstract",
+ "description" : "vFW sample vsp",
+ "licensingVersion" : "7afd0daa8271470db3b556fdedf074f4",
+ "licensingData" : {
+ "featureGroups" : [ "e4ba1e16f22f44c59051dead1fa7d1cf" ],
+ "licenseAgreement" : "ddfcedccb72241a1b87c63be74896322"
+ },
+ "icon" : "icon",
+ "onboardingMethod" : "Manual",
+ "vendorName" : "Huawei IN",
+ "name" : "vFW software"
+ }
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "itemId" : "5223ac6156ce4a5fb3b33ab205f34c6e",
+ "version" : {
+ "id" : "0732aefa14634e398f16ccfdabc8ed0a",
+ "name" : "1.0",
+ "description" : "Initial version",
+ "status" : "Draft"
+ }
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-list-schema-casablanca-moco.json b/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-list-schema-casablanca-moco.json
index f66bcdb1..76a88f8a 100644
--- a/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-list-schema-casablanca-moco.json
+++ b/products/onap-casablanca/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-list-schema-casablanca-moco.json
@@ -1,58 +1,58 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/onboarding-api/v1.0/vendor-software-products",
- "headers" : {
- "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "USER_ID" : "cs0008",
- "X-TransactionId" : "req-373a1f99-8c3a-43b8-8b27-7d2d75dc60bb",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "listCount" : 4,
- "results" : [ {
- "name" : "vFW software",
- "description" : "vFW sample vsp",
- "vendorName" : "Huawei IN",
- "vendorId" : "d8c1362526414b9bbe25cdd972eebf0e",
- "onboardingMethod" : "Manual",
- "id" : "5223ac6156ce4a5fb3b33ab205f34c6e",
- "owner" : "cs0008",
- "status" : "ACTIVE"
- }, {
- "name" : "test123",
- "description" : "test",
- "vendorName" : "Huawei IN",
- "vendorId" : "d8c1362526414b9bbe25cdd972eebf0e",
- "onboardingMethod" : "Manual",
- "id" : "83f9c5d846044f81b3b94e15aaaafb0b",
- "owner" : "cs0008",
- "status" : "ACTIVE"
- }, {
- "name" : "test",
- "description" : "test",
- "vendorName" : "hw",
- "vendorId" : "efd7a4cece974be7ad8d7798b17f9621",
- "onboardingMethod" : "NetworkPackage",
- "id" : "3cf5d987d1d444be8b172b3744bcbe0c",
- "owner" : "cs0008",
- "status" : "ACTIVE"
- }, {
- "name" : "test1",
- "description" : "test",
- "vendorName" : "Huawei IN",
- "vendorId" : "d8c1362526414b9bbe25cdd972eebf0e",
- "onboardingMethod" : "Manual",
- "id" : "3ee1964d46834c0eaa4f9909bf40b961",
- "owner" : "cs0008",
- "status" : "ACTIVE"
- } ]
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/onboarding-api/v1.0/vendor-software-products",
+ "headers" : {
+ "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "USER_ID" : "cs0008",
+ "X-TransactionId" : "req-373a1f99-8c3a-43b8-8b27-7d2d75dc60bb",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "listCount" : 4,
+ "results" : [ {
+ "name" : "vFW software",
+ "description" : "vFW sample vsp",
+ "vendorName" : "Huawei IN",
+ "vendorId" : "d8c1362526414b9bbe25cdd972eebf0e",
+ "onboardingMethod" : "Manual",
+ "id" : "5223ac6156ce4a5fb3b33ab205f34c6e",
+ "owner" : "cs0008",
+ "status" : "ACTIVE"
+ }, {
+ "name" : "test123",
+ "description" : "test",
+ "vendorName" : "Huawei IN",
+ "vendorId" : "d8c1362526414b9bbe25cdd972eebf0e",
+ "onboardingMethod" : "Manual",
+ "id" : "83f9c5d846044f81b3b94e15aaaafb0b",
+ "owner" : "cs0008",
+ "status" : "ACTIVE"
+ }, {
+ "name" : "test",
+ "description" : "test",
+ "vendorName" : "hw",
+ "vendorId" : "efd7a4cece974be7ad8d7798b17f9621",
+ "onboardingMethod" : "NetworkPackage",
+ "id" : "3cf5d987d1d444be8b172b3744bcbe0c",
+ "owner" : "cs0008",
+ "status" : "ACTIVE"
+ }, {
+ "name" : "test1",
+ "description" : "test",
+ "vendorName" : "Huawei IN",
+ "vendorId" : "d8c1362526414b9bbe25cdd972eebf0e",
+ "onboardingMethod" : "Manual",
+ "id" : "3ee1964d46834c0eaa4f9909bf40b961",
+ "owner" : "cs0008",
+ "status" : "ACTIVE"
+ } ]
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/vnfsdk/src/main/resources/open-cli-sample/vnftest-list-moco.json b/products/onap-casablanca/features/vnfsdk/src/main/resources/open-cli-sample/vnftest-list-moco.json
index 42a74b12..bb1eb3b0 100644
--- a/products/onap-casablanca/features/vnfsdk/src/main/resources/open-cli-sample/vnftest-list-moco.json
+++ b/products/onap-casablanca/features/vnfsdk/src/main/resources/open-cli-sample/vnftest-list-moco.json
@@ -1,29 +1,29 @@
-[ {
- "request" : {
- "method" : "get",
- "uri" : "/vnf-sdk-marketplace/onapapi/vnfsdk-marketplace/v1/PackageResource/vtp/tests",
- "headers" : {
- "Accept" : "application/json",
- "Content-Type" : "application/json"
- },
- "json" : null
- },
- "response" : {
- "status" : 200,
- "json" : {
- "results" : [ {
- "schema" : "vnftest-list.yaml",
- "ocs-version" : "1.0",
- "sr.no" : "1",
- "type" : "http",
- "command" : "vnftest-list"
- }, {
- "schema" : "vtp-validate-csar.yaml",
- "ocs-version" : "1.0",
- "sr.no" : "2",
- "type" : "basic",
- "command" : "csar-validate"
- } ]
- }
- }
+[ {
+ "request" : {
+ "method" : "get",
+ "uri" : "/vnf-sdk-marketplace/onapapi/vnfsdk-marketplace/v1/PackageResource/vtp/tests",
+ "headers" : {
+ "Accept" : "application/json",
+ "Content-Type" : "application/json"
+ },
+ "json" : null
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "results" : [ {
+ "schema" : "vnftest-list.yaml",
+ "ocs-version" : "1.0",
+ "sr.no" : "1",
+ "type" : "http",
+ "command" : "vnftest-list"
+ }, {
+ "schema" : "vtp-validate-csar.yaml",
+ "ocs-version" : "1.0",
+ "sr.no" : "2",
+ "type" : "basic",
+ "command" : "csar-validate"
+ } ]
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-casablanca/features/vnfsdk/src/main/resources/open-cli-sample/vnftest-run-moco.json b/products/onap-casablanca/features/vnfsdk/src/main/resources/open-cli-sample/vnftest-run-moco.json
index e598a1b1..c9a1ede7 100644
--- a/products/onap-casablanca/features/vnfsdk/src/main/resources/open-cli-sample/vnftest-run-moco.json
+++ b/products/onap-casablanca/features/vnfsdk/src/main/resources/open-cli-sample/vnftest-run-moco.json
@@ -1,23 +1,23 @@
-[ {
- "request" : {
- "method" : "post",
- "uri" : "/vnf-sdk-marketplace/onapapi/vnfsdk-marketplace/v1/vtp/tests/csar-validate/run",
- "headers" : {
- "Accept" : "application/json",
- "Content-Type" : "application/json"
- },
- "json" : {
- "csar" : "D:\\workspace\\onap\\1.1\\vnfsdk\\validation\\csarvalidation\\src\\test\\resources\\USN.csar"
- }
- },
- "response" : {
- "status" : 200,
- "json" : {
- "results" : [ {
- "error" : "SUCCESS"
- } ],
- "build_tag" : null,
- "criteria" : "PASS"
- }
- }
+[ {
+ "request" : {
+ "method" : "post",
+ "uri" : "/vnf-sdk-marketplace/onapapi/vnfsdk-marketplace/v1/vtp/tests/csar-validate/run",
+ "headers" : {
+ "Accept" : "application/json",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "csar" : "D:\\workspace\\onap\\1.1\\vnfsdk\\validation\\csarvalidation\\src\\test\\resources\\USN.csar"
+ }
+ },
+ "response" : {
+ "status" : 200,
+ "json" : {
+ "results" : [ {
+ "error" : "SUCCESS"
+ } ],
+ "build_tag" : null,
+ "criteria" : "PASS"
+ }
+ }
} ] \ No newline at end of file
diff --git a/products/onap-dublin/catalog/src/main/resources/open-cli-sample/catalog-schema-moco.json b/products/onap-dublin/catalog/src/main/resources/open-cli-sample/catalog-schema-moco.json
index 8ed762b3..7284c8cd 100644
--- a/products/onap-dublin/catalog/src/main/resources/open-cli-sample/catalog-schema-moco.json
+++ b/products/onap-dublin/catalog/src/main/resources/open-cli-sample/catalog-schema-moco.json
@@ -11,34 +11,34 @@
"response" : {
"status" : 200,
"json" : {
- "serviceName": "so",
- "version": "v1",
- "url": "/ecomp/mso/infra",
- "protocol": "REST",
- "visualRange": "1",
- "lb_policy": "",
- "publish_port": "",
- "namespace": "",
- "network_plane_type": "",
- "host": "",
- "path": "",
- "enable_ssl": false,
- "nodes": [
- {
- "ip": "10.0.5.1",
- "port": "8080",
- "checkType": "",
- "checkUrl": "",
- "tls_skip_verify": true,
- "ha_role": "",
- "nodeId": "_v1_so_10.0.5.1_8080",
- "status": "passing"
- }
- ],
- "metadata": [],
- "labels": [],
- "status": "1",
- "is_manual": false
- }
+ "serviceName": "so",
+ "version": "v1",
+ "url": "/ecomp/mso/infra",
+ "protocol": "REST",
+ "visualRange": "1",
+ "lb_policy": "",
+ "publish_port": "",
+ "namespace": "",
+ "network_plane_type": "",
+ "host": "",
+ "path": "",
+ "enable_ssl": false,
+ "nodes": [
+ {
+ "ip": "10.0.5.1",
+ "port": "8080",
+ "checkType": "",
+ "checkUrl": "",
+ "tls_skip_verify": true,
+ "ha_role": "",
+ "nodeId": "_v1_so_10.0.5.1_8080",
+ "status": "passing"
+ }
+ ],
+ "metadata": [],
+ "labels": [],
+ "status": "1",
+ "is_manual": false
+ }
}
} ] \ No newline at end of file
diff --git a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-commit-schema-dublin-moco.json b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-commit-schema-dublin-moco.json
index 439f5e00..1c3c07b2 100644
--- a/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-commit-schema-dublin-moco.json
+++ b/products/onap-dublin/features/sdc/src/main/resources/open-cli-sample/vsp/vsp-commit-schema-dublin-moco.json
@@ -1,24 +1,24 @@
-[ {
- "request" : {
- "method" : "put",
- "uri" : "/onboarding-api/v1.0/items/a653d9bd40dc43e2ae45004daeab9003/versions/d6e590f98c2347b7a29b27e263527fac/actions",
- "headers" : {
- "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
- "X-FromAppId" : "ONAP CLI",
- "Accept" : "application/json",
- "USER_ID" : "cs0008",
- "X-TransactionId" : "req-f64dec4f-646e-46d8-807e-99e7170a6afb",
- "Content-Type" : "application/json"
- },
- "json" : {
- "action" : "Commit",
- "commitRequest" : {
- "message" : "Powered by Open Command Platform - OCOMP"
- }
- }
- },
- "response" : {
- "status" : 200,
- "json" : { }
- }
+[ {
+ "request" : {
+ "method" : "put",
+ "uri" : "/onboarding-api/v1.0/items/a653d9bd40dc43e2ae45004daeab9003/versions/d6e590f98c2347b7a29b27e263527fac/actions",
+ "headers" : {
+ "Authorization" : "Basic Y3MwMDA4OmRlbW8xMjM0NTYh",
+ "X-FromAppId" : "ONAP CLI",
+ "Accept" : "application/json",
+ "USER_ID" : "cs0008",
+ "X-TransactionId" : "req-f64dec4f-646e-46d8-807e-99e7170a6afb",
+ "Content-Type" : "application/json"
+ },
+ "json" : {
+ "action" : "Commit",
+ "commitRequest" : {
+ "message" : "Powered by Open Command Platform - OCOMP"
+ }
+ }
+ },
+ "response" : {
+ "status" : 200,
+ "json" : { }
+ }
} ] \ No newline at end of file
diff --git a/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java b/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java
index e8924470..ea219948 100644
--- a/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java
+++ b/profiles/http/src/main/java/org/onap/cli/fw/http/connect/OnapHttpConnection.java
@@ -373,7 +373,7 @@ public class OnapHttpConnection {
}
}
- @Contract(threading = ThreadingBehavior.UNSAFE)
+ @Contract(threading = ThreadingBehavior.UNSAFE)
static class HttpDeleteWithBody extends HttpEntityEnclosingRequestBase {
public HttpDeleteWithBody() {
diff --git a/validate/validation/pom.xml b/validate/validation/pom.xml
index 02f84084..92af4457 100644
--- a/validate/validation/pom.xml
+++ b/validate/validation/pom.xml
@@ -86,7 +86,7 @@
<artifactId>cli-products-onap-dublin-features-aai</artifactId>
<version>${project.version}</version>
</dependency>
-
+
<dependency>
<groupId>org.onap.cli</groupId>
<artifactId>cli-products-onap-dublin-features-sdc</artifactId>