Make Http as separate plugin

Issue-ID: CLI-66

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

12 files changed, 0 insertions, 1926 deletions

diff --git a/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml b/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml
deleted file mode 100644
index 44f1f86a..00000000
--- a/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-create-schema.yaml
+++ /dev/null
@@ -1,107 +0,0 @@
-open_cli_schema_version: 1.0
-name: microservice-create
-description: Register microservice into Onap
-
-info:
-  product: onap-amsterdam
-  service: msb
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
-  - name: service-name
-    description: Onap service name
-    type: string
-    short_option: x
-    long_option: service-name
-    is_optional: false
-  - name: service-version
-    description: Onap service version
-    type: string
-    short_option: y
-    long_option: service-version
-    is_optional: false
-  - name: service-url
-    description: Onap service base url
-    type: url
-    short_option: r
-    long_option: service-url
-    is_optional: false
-  - name: enable-ssl
-    description: Onap service is enabled with https or not
-    type: string
-    short_option: b
-    long_option: enable-ssl
-    is_optional: true
-    default: false
-  - name: path
-    description: Onap service path
-    type: string
-    short_option: c
-    long_option: path
-    is_optional: true
-  - name: node-ip
-    description: Onap service running node IP
-    type: string
-  - name: node-port
-    description: Onap service running node port
-    type: string
-  - name: create-or-update
-    description: Onap service create or update
-    type: bool
-    default_value: true
-results:
-  direction: portrait
-  attributes:
-    - name: name
-      description: Onap service name
-      scope: short
-      type: string
-    - name: version
-      description: Onap service version
-      scope: short
-      type: string
-    - name: url
-      description: Onap service base url
-      scope: short
-      type: url
-    - name: status
-      description: Onap service status
-      scope: short
-      type: digit
-    - name: nodes
-      description: Onap service running nodes
-      scope: long
-      type: string
-    - name: enable-ssl
-      description: Onap service is enabled with https or not
-      scope: long
-      type: string
-    - name: path
-      description: Onap service path
-      scope: long
-      type: string
-http:
-  service:
-    auth: none
-    mode: direct
-  request:
-    uri: /services
-    method: POST
-    body: '{"serviceName":"${service-name}","version":"${service-version}","path":"${path}","url":"${service-url}","protocol":"REST", "enable_ssl":"${enable-ssl}", "visualRange":"1","lb_policy":"ip_hash","nodes":[{"ip":"${node-ip}","port":"${node-port}","ttl":0}]}'
-    headers:
-    queries:
-      createOrUpdate: ${create-or-update}
-  success_codes:
-    - 201
-    - 200
-  result_map:
-    name: $b{$.serviceName}
-    version: $b{$.version}
-    url: $b{$.url}
-    status: $b{$.status}
-    enable-ssl: $b{$.enable_ssl}
-    path: $b{$.path}
-    nodes: $b{$.nodes[*].ip}:$b{$.nodes[*].port}
-
-  sample_response:
-    body: '{"serviceName":"test","version":"v1","url":"/api/test/v1","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"127.0.0.1","port":"8012","ttl":0,"nodeId":"test_127.0.0.1_8012","expiration":"2017-02-10T05:33:25Z","created_at":"2017-02-10T05:33:25Z","updated_at":"2017-02-10T05:33:25Z"}],"status":"1"}'
diff --git a/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-delete-schema.yaml b/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-delete-schema.yaml
deleted file mode 100644
index cc7f875b..00000000
--- a/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-delete-schema.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-open_cli_schema_version: 1.0
-name: microservice-delete
-description: Deletes the micro service from Onap
-
-info:
-  product: onap-amsterdam
-  service: msb
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
-  - name: service-name
-    description: Onap service name
-    type: string
-    short_option: x
-    long_option: service-name
-    is_optional: false
-  - name: service-version
-    description: Onap service version
-    type: string
-    short_option: y
-    long_option: service-version
-    is_optional: false
-  - name: node-ip
-    description: Onap service running node IP
-    type: string
-    short_option: i
-    long_option: node-ip
-    is_optional: false
-  - name: node-port
-    description: Onap service running node port
-    type: string
-    short_option: r
-    long_option: node-port
-    is_optional: false
-http:
-  service:
-    auth: none
-    mode: direct
-  request:
-    uri: /services/${service-name}/version/${service-version}/nodes/${node-ip}/${node-port}
-    method: DELETE
-  success_codes:
-    - 201
-    - 200
-    - 204
-    - 500
-
-
-
diff --git a/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-list-schema.yaml b/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-list-schema.yaml
deleted file mode 100644
index 91f847f3..00000000
--- a/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-list-schema.yaml
+++ /dev/null
@@ -1,65 +0,0 @@
-open_cli_schema_version: 1.0
-name: microservice-list
-description: Lists the registetred micro services in Onap
-
-
-info:
-  product: onap-amsterdam
-  service: msb
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-results:
-  direction: landscape
-  attributes:
-    - name: name
-      description: Onap service name
-      scope: short
-      type: string
-    - name: version
-      description: Onap service version
-      scope: short
-      type: string
-    - name: url
-      description: Onap service base url
-      scope: short
-      type: url
-    - name: status
-      description: Onap service status
-      scope: short
-      type: digit
-    - name: nodes
-      description: Onap service running nodes
-      scope: long
-      type: json
-    - name: enable-ssl
-      description: Onap service is enabled with https or not
-      scope: long
-      type: string
-    - name: path
-      description: Onap service path
-      scope: long
-      type: string
-http:
-  service:
-    auth: none
-    mode: direct
-  request:
-    uri: /services
-    method: GET
-  success_codes:
-    - 201
-    - 200
-  result_map:
-    name: $b{$.[*].serviceName}
-    version: $b{$.[*].version}
-    url: $b{$.[*].url}
-    status: $b{$.[*].status}
-    enable-ssl: $b{$.[*].enable_ssl}
-    path: $b{$.[*].path}
-    nodes: $b{$.[*].nodes[*].ip}:$b{$.[*].nodes[*].port}
-  sample_response:
-    body: '[{"serviceName":"test","version":"v1","url":"/api/test/v1","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"127.0.0.1","port":"8012","ttl":0,"nodeId":"test_127.0.0.1_8012","expiration":"2017-02-10T05:33:25Z","created_at":"2017-02-10T05:33:25Z","updated_at":"2017-02-10T05:33:25Z"}],"status":"1"}]'
-
-
-
-
diff --git a/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-show-schema.yaml b/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-show-schema.yaml
deleted file mode 100644
index 13de1030..00000000
--- a/plugins/onap-amsterdam/features/msb/src/main/resources/open-cli-schema/microservice-show-schema.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-open_cli_schema_version: 1.0
-name: microservice-show
-description: Details the registered microservice in Onap
-
-info:
-  product: onap-amsterdam
-  service: msb
-  author: ONAP CLI Team onap-discuss@lists.onap.org
-
-parameters:
-  - name: service-name
-    description: Onap service name
-    type: string
-    short_option: x
-    long_option: service-name
-    is_optional: false
-  - name: service-version
-    description: Onap service version
-    type: string
-    short_option: y
-    long_option: service-version
-    is_optional: false
-results:
-  direction: portrait
-  attributes:
-    - name: name
-      description: Onap service name
-      scope: short
-      type: string
-    - name: version
-      description: Onap service version
-      scope: short
-      type: string
-    - name: url
-      description: Onap service base url
-      scope: short
-      type: url
-    - name: status
-      description: Onap service status
-      scope: short
-      type: digit
-    - name: nodes
-      description: Onap service running nodes
-      scope: long
-      type: json
-    - name: enable-ssl
-      description: Onap service is enabled with https or not
-      scope: long
-      type: string
-    - name: path
-      description: Onap service path
-      scope: long
-      type: string
-http:
-  service:
-    auth: none
-    mode: direct
-  request:
-    uri: /services/${service-name}/version/${service-version}
-    method: GET
-  success_codes:
-    - 201
-    - 200
-  result_map:
-    name: $b{$.serviceName}
-    version: $b{$.version}
-    url: $b{$.url}
-    status: $b{$.status}
-    enable-ssl: $b{$.enable_ssl}
-    path: $b{$.path}
-    nodes: $b{$.nodes[*].ip}:$b{$.nodes[*].port}
-  sample_response:
-    body: '{"serviceName":"test","version":"v1","url":"/api/test/v1","protocol":"REST","visualRange":"1","lb_policy":"hash","nodes":[{"ip":"127.0.0.1","port":"8012","ttl":0,"nodeId":"test_127.0.0.1_8012","expiration":"2017-02-10T05:33:25Z","created_at":"2017-02-10T05:33:25Z","updated_at":"2017-02-10T05:33:25Z"}],"status":"1"}'
-
-
-
-
diff --git a/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-moco.json b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-moco.json
deleted file mode 100644
index d2b703d0..00000000
--- a/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-moco.json
+++ /dev/null
@@ -1,55 +0,0 @@
-[ {
-  "request" : {
-    "method" : "post",
-    "uri" : "/api/microservices/v1/services",
-    "headers" : {
-      "Accept" : "application/json",
-      "Content-Type" : "application/json"
-    },
-    "json" : {
-      "serviceName" : "test",
-      "version" : "v1",
-      "path" : "/test",
-      "url" : "/test",
-      "protocol" : "REST",
-      "enable_ssl" : "",
-      "visualRange" : "1",
-      "lb_policy" : "ip_hash",
-      "nodes" : [ {
-        "ip" : "10.0.0.1",
-        "port" : "8080",
-        "ttl" : 0
-      } ]
-    }
-  },
-  "response" : {
-    "status" : 201,
-    "json" : {
-      "serviceName" : "test",
-      "version" : "v1",
-      "url" : "/test",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "ip_hash",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "/test",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.0.1",
-        "port" : "8080",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_test_10.0.0.1_8080",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }
-  }
-} ]
\ No newline at end of file
diff --git a/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-sample.yaml b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-sample.yaml
deleted file mode 100644
index 3216ff7e..00000000
--- a/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-create-schema-sample.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-open_cli_sample_version: 1.0
-name: microservice-create
-version: onap-amsterdam
-samples:
-  sample1:
-    name: microservice-create
-    input: --service-name test --service-version v1 --service-url /test --path /test 10.0.0.1 8080
-    moco: microservice-create-schema-moco.json
-    output: |
-      +----------+--------------+
-      |property  |value         |
-      +----------+--------------+
-      |name      |test          |
-      +----------+--------------+
-      |version   |v1            |
-      +----------+--------------+
-      |url       |/test         |
-      +----------+--------------+
-      |status    |1             |
-      +----------+--------------+
diff --git a/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-moco.json b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-moco.json
deleted file mode 100644
index 0c3d7e82..00000000
--- a/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-moco.json
+++ /dev/null
@@ -1,15 +0,0 @@
-[ {
-  "request" : {
-    "method" : "delete",
-    "uri" : "/api/microservices/v1/services/test/version/v1/nodes/10.0.0.1/8080",
-    "headers" : {
-      "Accept" : "application/json",
-      "Content-Type" : "application/json"
-    },
-    "json" : null
-  },
-  "response" : {
-    "status" : 200,
-    "json" : null
-  }
-} ]
\ No newline at end of file
diff --git a/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-sample.yaml b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-sample.yaml
deleted file mode 100644
index c0a3778d..00000000
--- a/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-delete-schema-sample.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-open_cli_sample_version: 1.0
-
-name: microservice-delete
-version: onap-amsterdam
-samples:
-    sample1:
-        name: microservice-delete
-        input: --service-name test --service-version v1 --host-url http://192.168.17.23:80 --node-ip 23.14.15.156 --node-port 80
-        moco: microservice-delete-schema-moco.json
-        output:
diff --git a/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-moco.json b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-moco.json
deleted file mode 100644
index b836183d..00000000
--- a/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-moco.json
+++ /dev/null
@@ -1,1335 +0,0 @@
-[ {
-  "request" : {
-    "method" : "get",
-    "uri" : "/api/microservices/v1/services",
-    "headers" : {
-      "Accept" : "application/json",
-      "Content-Type" : "application/json"
-    },
-    "json" : null
-  },
-  "response" : {
-    "status" : 200,
-    "json" : [ {
-      "serviceName" : "aai-actions",
-      "version" : "v11",
-      "url" : "/aai/v11/actions",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : true,
-      "nodes" : [ {
-        "ip" : "10.0.1.1",
-        "port" : "8443",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_aai-actions_10.0.1.1_8443",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "aai-actions-deprecated",
-      "version" : "v11",
-      "url" : "/aai/v11/actions",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "/aai/v11/actions",
-      "enable_ssl" : true,
-      "nodes" : [ {
-        "ip" : "10.0.1.1",
-        "port" : "8443",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_aai-actions-deprecated_10.0.1.1_8443",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "aai-business",
-      "version" : "v11",
-      "url" : "/aai/v11/business",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : true,
-      "nodes" : [ {
-        "ip" : "10.0.1.1",
-        "port" : "8443",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_aai-business_10.0.1.1_8443",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "aai-business-deprecated",
-      "version" : "v11",
-      "url" : "/aai/v11/business",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "/aai/v11/business",
-      "enable_ssl" : true,
-      "nodes" : [ {
-        "ip" : "10.0.1.1",
-        "port" : "8443",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_aai-business-deprecated_10.0.1.1_8443",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "aai-cloudInfrastructure",
-      "version" : "v11",
-      "url" : "/aai/v11/cloud-infrastructure",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : true,
-      "nodes" : [ {
-        "ip" : "10.0.1.1",
-        "port" : "8443",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_aai-cloudInfrastructure_10.0.1.1_8443",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "aai-cloudInfrastructure-deprecated",
-      "version" : "v11",
-      "url" : "/aai/v11/cloud-infrastructure",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "/aai/v11/cloud-infrastructure",
-      "enable_ssl" : true,
-      "nodes" : [ {
-        "ip" : "10.0.1.1",
-        "port" : "8443",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_aai-cloudInfrastructure-deprecated_10.0.1.1_8443",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "aai-esr-gui",
-      "version" : "v1",
-      "url" : "/esr-gui",
-      "protocol" : "UI",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "/iui/aai-esr-gui",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.14.1",
-        "port" : "9519",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_aai-esr-gui_10.0.14.1_9519",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "aai-esr-server",
-      "version" : "v1",
-      "url" : "/api/aai-esr-server/v1",
-      "protocol" : "REST",
-      "visualRange" : "0|1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "172.17.0.5",
-        "port" : "9518",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_aai-esr-server_172.17.0.5_9518",
-        "status" : "passing"
-      }, {
-        "ip" : "10.0.14.1",
-        "port" : "9518",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_aai-esr-server_10.0.14.1_9518",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "aai-externalSystem",
-      "version" : "v11",
-      "url" : "/aai/v11/external-system",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : true,
-      "nodes" : [ {
-        "ip" : "10.0.1.1",
-        "port" : "8443",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_aai-externalSystem_10.0.1.1_8443",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "aai-externalSystem-deprecated",
-      "version" : "v11",
-      "url" : "/aai/v11/external-system",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "/aai/v11/external-system",
-      "enable_ssl" : true,
-      "nodes" : [ {
-        "ip" : "10.0.1.1",
-        "port" : "8443",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_aai-externalSystem-deprecated_10.0.1.1_8443",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "aai-network",
-      "version" : "v11",
-      "url" : "/aai/v11/network",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : true,
-      "nodes" : [ {
-        "ip" : "10.0.1.1",
-        "port" : "8443",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_aai-network_10.0.1.1_8443",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "aai-network-deprecated",
-      "version" : "v11",
-      "url" : "/aai/v11/network",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "/aai/v11/network",
-      "enable_ssl" : true,
-      "nodes" : [ {
-        "ip" : "10.0.1.1",
-        "port" : "8443",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_aai-network-deprecated_10.0.1.1_8443",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "aai-search",
-      "version" : "v11",
-      "url" : "/aai/v11/search",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : true,
-      "nodes" : [ {
-        "ip" : "10.0.1.1",
-        "port" : "8443",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_aai-search_10.0.1.1_8443",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "aai-search-deprecated",
-      "version" : "v11",
-      "url" : "/aai/v11/search",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "/aai/v11/search",
-      "enable_ssl" : true,
-      "nodes" : [ {
-        "ip" : "10.0.1.1",
-        "port" : "8443",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_aai-search-deprecated_10.0.1.1_8443",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "aai-service-design-and-creation",
-      "version" : "v11",
-      "url" : "/aai/v11/service-design-and-creation",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : true,
-      "nodes" : [ {
-        "ip" : "10.0.1.1",
-        "port" : "8443",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_aai-service-design-and-creation_10.0.1.1_8443",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "aai-service-design-and-creation-deprecated",
-      "version" : "v11",
-      "url" : "/aai/v11/service-design-and-creation",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "/aai/v11/service-design-and-creation",
-      "enable_ssl" : true,
-      "nodes" : [ {
-        "ip" : "10.0.1.1",
-        "port" : "8443",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_aai-service-design-and-creation-deprecated_10.0.1.1_8443",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "activiti",
-      "version" : "v1",
-      "url" : "/api/activiti/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.14.1",
-        "port" : "8804",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_activiti_10.0.14.1_8804",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "activiti-rest",
-      "version" : "v1",
-      "url" : "/activiti-rest",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "/activiti-rest",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.14.1",
-        "port" : "8804",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_activiti-rest_10.0.14.1_8804",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "catalog",
-      "version" : "v1",
-      "url" : "/api/catalog/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "172.17.0.15",
-        "port" : "8806",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_catalog_172.17.0.15_8806",
-        "status" : "passing"
-      }, {
-        "ip" : "10.0.14.1",
-        "port" : "8806",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_catalog_10.0.14.1_8806",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "emsdriver",
-      "version" : "v1",
-      "url" : "/api/emsdriver/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.14.1",
-        "port" : "8206",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_emsdriver_10.0.14.1_8206",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "gvnfmdriver",
-      "version" : "v1",
-      "url" : "/api/gvnfmdriver/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "172.17.0.17",
-        "port" : "8484",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_gvnfmdriver_172.17.0.17_8484",
-        "status" : "passing"
-      }, {
-        "ip" : "10.0.14.1",
-        "port" : "8484",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_gvnfmdriver_10.0.14.1_8484",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "huaweivnfmdriver",
-      "version" : "v1",
-      "url" : "/api/huaweivnfmdriver/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.14.1",
-        "port" : "8482",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_huaweivnfmdriver_10.0.14.1_8482",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "jujuvnfmdriver",
-      "version" : "v1",
-      "url" : "/api/jujuvnfmdriver/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.14.1",
-        "port" : "8483",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_jujuvnfmdriver_10.0.14.1_8483",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "multicloud",
-      "version" : "v0",
-      "url" : "/api/multicloud/v0",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.14.1",
-        "port" : "9001",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_multicloud_10.0.14.1_9001",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "multicloud-ocata",
-      "version" : "v0",
-      "url" : "/api/multicloud-ocata/v0",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.14.1",
-        "port" : "9006",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_multicloud-ocata_10.0.14.1_9006",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "multicloud-titanium_cloud",
-      "version" : "v0",
-      "url" : "/api/multicloud-titanium_cloud/v0",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.14.1",
-        "port" : "9005",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_multicloud-titanium_cloud_10.0.14.1_9005",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "multicloud-vio",
-      "version" : "v0",
-      "url" : "/api/multicloud-vio/v0",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.14.1",
-        "port" : "9004",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_multicloud-vio_10.0.14.1_9004",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "nokia-vnfm-driver",
-      "version" : "v1",
-      "url" : "/api/nokiavnfmdriver/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "172.17.0.27",
-        "port" : "8486",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_nokia-vnfm-driver_172.17.0.27_8486",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "nokiavnfmdriver",
-      "version" : "v1",
-      "url" : "/api/nokiavnfmdriver/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.14.1",
-        "port" : "8485",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_nokiavnfmdriver_10.0.14.1_8485",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "nslcm",
-      "version" : "v1",
-      "url" : "/api/nslcm/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "172.17.0.20",
-        "port" : "8403",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_nslcm_172.17.0.20_8403",
-        "status" : "passing"
-      }, {
-        "ip" : "10.0.14.1",
-        "port" : "8403",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_nslcm_10.0.14.1_8403",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "policy-pdp",
-      "version" : "v1",
-      "url" : "/pdp",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.6.1",
-        "port" : "8081",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_policy-pdp_10.0.6.1_8081",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "policy-pdp-deprecated",
-      "version" : "v1",
-      "url" : "/pdp",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "/pdp",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.6.1",
-        "port" : "8081",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_policy-pdp-deprecated_10.0.6.1_8081",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "portal",
-      "version" : "v2",
-      "url" : "/",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.9.1",
-        "port" : "8989",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_portal_10.0.9.1_8989",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "resmgr",
-      "version" : "v1",
-      "url" : "/api/resmgr/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.14.1",
-        "port" : "8480",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_resmgr_10.0.14.1_8480",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "sdc",
-      "version" : "v1",
-      "url" : "/sdc/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.3.1",
-        "port" : "8080",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_sdc_10.0.3.1_8080",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "sdc-deprecated",
-      "version" : "v1",
-      "url" : "/sdc/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "/sdc/v1",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.3.1",
-        "port" : "8080",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_sdc-deprecated_10.0.3.1_8080",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "sdnc",
-      "version" : "v1",
-      "url" : "/restconf",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "/restconf",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.7.1",
-        "port" : "8282",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_sdnc_10.0.7.1_8282",
-        "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" : "",
-        "ha_role" : "",
-        "nodeId" : "_so_10.0.5.1_8080",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "so-deprecated",
-      "version" : "v1",
-      "url" : "/ecomp/mso/infra",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "/ecomp/mso/infra",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.5.1",
-        "port" : "8080",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_so-deprecated_10.0.5.1_8080",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "usecase-ui",
-      "version" : "v1",
-      "url" : "/usecase-ui",
-      "protocol" : "UI",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "172.17.0.11",
-        "port" : "8080",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_usecase-ui_172.17.0.11_8080",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "usecaseui",
-      "version" : "v1",
-      "url" : "/api/usecaseui/server/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.14.1",
-        "port" : "8901",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_usecaseui_10.0.14.1_8901",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "usecaseui-gui",
-      "version" : "v1",
-      "url" : "/iui/usecaseui",
-      "protocol" : "UI",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "/iui/usecaseui",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.14.1",
-        "port" : "8900",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_usecaseui-gui_10.0.14.1_8900",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "vnflcm",
-      "version" : "v1",
-      "url" : "/api/vnflcm/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.14.1",
-        "port" : "8801",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_vnflcm_10.0.14.1_8801",
-        "status" : "passing"
-      }, {
-        "ip" : "172.17.0.22",
-        "port" : "8801",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_vnflcm_172.17.0.22_8801",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "vnfmgr",
-      "version" : "v1",
-      "url" : "/api/vnfmgr/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "172.17.0.23",
-        "port" : "8803",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_vnfmgr_172.17.0.23_8803",
-        "status" : "passing"
-      }, {
-        "ip" : "10.0.14.1",
-        "port" : "8803",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_vnfmgr_10.0.14.1_8803",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "vnfres",
-      "version" : "v1",
-      "url" : "/api/vnfres/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "172.17.0.24",
-        "port" : "8802",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_vnfres_172.17.0.24_8802",
-        "status" : "passing"
-      }, {
-        "ip" : "10.0.14.1",
-        "port" : "8802",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_vnfres_10.0.14.1_8802",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "workflow",
-      "version" : "v1",
-      "url" : "/api/workflow/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.14.1",
-        "port" : "8805",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_workflow_10.0.14.1_8805",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "ztesdncdriver",
-      "version" : "v1",
-      "url" : "/api/ztesdncdriver/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "172.17.0.25",
-        "port" : "8411",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_ztesdncdriver_172.17.0.25_8411",
-        "status" : "passing"
-      }, {
-        "ip" : "10.0.14.1",
-        "port" : "8411",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_ztesdncdriver_10.0.14.1_8411",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }, {
-      "serviceName" : "ztevmanagerdriver",
-      "version" : "v1",
-      "url" : "/api/ztevmanagerdriver/v1",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.14.1",
-        "port" : "8410",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_ztevmanagerdriver_10.0.14.1_8410",
-        "status" : "passing"
-      }, {
-        "ip" : "172.17.0.26",
-        "port" : "8410",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_ztevmanagerdriver_172.17.0.26_8410",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    } ]
-  }
-} ]
\ No newline at end of file
diff --git a/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-sample.yaml b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-sample.yaml
deleted file mode 100644
index 819618dd..00000000
--- a/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-list-schema-sample.yaml
+++ /dev/null
@@ -1,126 +0,0 @@
-open_cli_sample_version: 1.0
-name: microservice-list
-version: onap-amsterdam
-samples:
-  sample1:
-    name: microservice-list
-    input: --long
-    moco: microservice-list-schema-moco.json
-    output: |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |name                                        |version   |url                                   |status  |nodes             |enable-ssl  |path                                  |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |aai-actions                                 |v11       |/aai/v11/actions                      |1       |10.0.1.1:8443     |true        |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |aai-actions-deprecated                      |v11       |/aai/v11/actions                      |1       |10.0.1.1:8443     |true        |/aai/v11/actions                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |aai-business                                |v11       |/aai/v11/business                     |1       |10.0.1.1:8443     |true        |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |aai-business-deprecated                     |v11       |/aai/v11/business                     |1       |10.0.1.1:8443     |true        |/aai/v11/business                     |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |aai-cloudInfrastructure                     |v11       |/aai/v11/cloud-infrastructure         |1       |10.0.1.1:8443     |true        |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |aai-cloudInfrastructure-deprecated          |v11       |/aai/v11/cloud-infrastructure         |1       |10.0.1.1:8443     |true        |/aai/v11/cloud-infrastructure         |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |aai-esr-gui                                 |v1        |/esr-gui                              |1       |10.0.14.1:9519    |false       |/iui/aai-esr-gui                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |aai-esr-server                              |v1        |/api/aai-esr-server/v1                |1       |172.17.0.5:9518   |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |aai-externalSystem                          |v11       |/aai/v11/external-system              |1       |10.0.14.1:9518    |true        |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |aai-externalSystem-deprecated               |v11       |/aai/v11/external-system              |1       |10.0.1.1:8443     |true        |/aai/v11/external-system              |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |aai-network                                 |v11       |/aai/v11/network                      |1       |10.0.1.1:8443     |true        |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |aai-network-deprecated                      |v11       |/aai/v11/network                      |1       |10.0.1.1:8443     |true        |/aai/v11/network                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |aai-search                                  |v11       |/aai/v11/search                       |1       |10.0.1.1:8443     |true        |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |aai-search-deprecated                       |v11       |/aai/v11/search                       |1       |10.0.1.1:8443     |true        |/aai/v11/search                       |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |aai-service-design-and-creation             |v11       |/aai/v11/service-design-and-creation  |1       |10.0.1.1:8443     |true        |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |aai-service-design-and-creation-deprecated  |v11       |/aai/v11/service-design-and-creation  |1       |10.0.1.1:8443     |true        |/aai/v11/service-design-and-creation  |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |activiti                                    |v1        |/api/activiti/v1                      |1       |10.0.1.1:8443     |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |activiti-rest                               |v1        |/activiti-rest                        |1       |10.0.14.1:8804    |false       |/activiti-rest                        |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |catalog                                     |v1        |/api/catalog/v1                       |1       |10.0.14.1:8804    |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |emsdriver                                   |v1        |/api/emsdriver/v1                     |1       |172.17.0.15:8806  |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |gvnfmdriver                                 |v1        |/api/gvnfmdriver/v1                   |1       |10.0.14.1:8806    |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |huaweivnfmdriver                            |v1        |/api/huaweivnfmdriver/v1              |1       |10.0.14.1:8206    |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |jujuvnfmdriver                              |v1        |/api/jujuvnfmdriver/v1                |1       |172.17.0.17:8484  |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |multicloud                                  |v0        |/api/multicloud/v0                    |1       |10.0.14.1:8484    |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |multicloud-ocata                            |v0        |/api/multicloud-ocata/v0              |1       |10.0.14.1:8482    |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |multicloud-titanium_cloud                   |v0        |/api/multicloud-titanium_cloud/v0     |1       |10.0.14.1:8483    |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |multicloud-vio                              |v0        |/api/multicloud-vio/v0                |1       |10.0.14.1:9001    |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |nokia-vnfm-driver                           |v1        |/api/nokiavnfmdriver/v1               |1       |10.0.14.1:9006    |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |nokiavnfmdriver                             |v1        |/api/nokiavnfmdriver/v1               |1       |10.0.14.1:9005    |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |nslcm                                       |v1        |/api/nslcm/v1                         |1       |10.0.14.1:9004    |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |policy-pdp                                  |v1        |/pdp                                  |1       |172.17.0.27:8486  |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |policy-pdp-deprecated                       |v1        |/pdp                                  |1       |10.0.14.1:8485    |false       |/pdp                                  |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |portal                                      |v2        |/                                     |1       |172.17.0.20:8403  |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |resmgr                                      |v1        |/api/resmgr/v1                        |1       |10.0.14.1:8403    |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |sdc                                         |v1        |/sdc/v1                               |1       |10.0.6.1:8081     |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |sdc-deprecated                              |v1        |/sdc/v1                               |1       |10.0.6.1:8081     |false       |/sdc/v1                               |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |sdnc                                        |v1        |/restconf                             |1       |10.0.9.1:8989     |false       |/restconf                             |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |so                                          |v1        |/ecomp/mso/infra                      |1       |10.0.14.1:8480    |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |so-deprecated                               |v1        |/ecomp/mso/infra                      |1       |10.0.3.1:8080     |false       |/ecomp/mso/infra                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |usecase-ui                                  |v1        |/usecase-ui                           |1       |10.0.3.1:8080     |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |usecaseui                                   |v1        |/api/usecaseui/server/v1              |1       |10.0.7.1:8282     |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |usecaseui-gui                               |v1        |/iui/usecaseui                        |1       |10.0.5.1:8080     |false       |/iui/usecaseui                        |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |vnflcm                                      |v1        |/api/vnflcm/v1                        |1       |10.0.5.1:8080     |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |vnfmgr                                      |v1        |/api/vnfmgr/v1                        |1       |172.17.0.11:8080  |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |vnfres                                      |v1        |/api/vnfres/v1                        |1       |10.0.14.1:8901    |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |workflow                                    |v1        |/api/workflow/v1                      |1       |10.0.14.1:8900    |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |ztesdncdriver                               |v1        |/api/ztesdncdriver/v1                 |1       |10.0.14.1:8801    |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |ztevmanagerdriver                           |v1        |/api/ztevmanagerdriver/v1             |1       |172.17.0.22:8801  |false       |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |                                            |          |                                      |        |172.17.0.23:8803  |            |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |                                            |          |                                      |        |10.0.14.1:8803    |            |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |                                            |          |                                      |        |172.17.0.24:8802  |            |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |                                            |          |                                      |        |10.0.14.1:8802    |            |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |                                            |          |                                      |        |10.0.14.1:8805    |            |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |                                            |          |                                      |        |172.17.0.25:8411  |            |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |                                            |          |                                      |        |10.0.14.1:8411    |            |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |                                            |          |                                      |        |10.0.14.1:8410    |            |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
-      |                                            |          |                                      |        |172.17.0.26:8410  |            |                                      |
-      +--------------------------------------------+----------+--------------------------------------+--------+------------------+------------+--------------------------------------+
diff --git a/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-moco.json b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-moco.json
deleted file mode 100644
index 5064b7b6..00000000
--- a/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-moco.json
+++ /dev/null
@@ -1,41 +0,0 @@
-[ {
-  "request" : {
-    "method" : "get",
-    "uri" : "/api/microservices/v1/services/test/version/v1",
-    "headers" : {
-      "Accept" : "application/json",
-      "Content-Type" : "application/json"
-    },
-    "json" : null
-  },
-  "response" : {
-    "status" : 200,
-    "json" : {
-      "serviceName" : "test",
-      "version" : "v1",
-      "url" : "/C:/Git/test",
-      "protocol" : "REST",
-      "visualRange" : "1",
-      "lb_policy" : "ip_hash",
-      "publish_port" : "",
-      "namespace" : "",
-      "network_plane_type" : "",
-      "host" : "",
-      "path" : "/C:/Git/test",
-      "enable_ssl" : false,
-      "nodes" : [ {
-        "ip" : "10.0.0.1",
-        "port" : "8080",
-        "checkType" : "",
-        "checkUrl" : "",
-        "ha_role" : "",
-        "nodeId" : "_test_10.0.0.1_8080",
-        "status" : "passing"
-      } ],
-      "metadata" : [ ],
-      "labels" : [ ],
-      "status" : "1",
-      "is_manual" : false
-    }
-  }
-} ]
\ No newline at end of file
diff --git a/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-sample.yaml b/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-sample.yaml
deleted file mode 100644
index b75cb8bc..00000000
--- a/plugins/onap-amsterdam/features/msb/src/test/resources/open-cli-sample/microservice-show-schema-sample.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-open_cli_sample_version: 1.0
-name: microservice-show
-version: onap-amsterdam
-samples:
-  sample1:
-    name: microservice-show
-    input: --service-name test --service-version v1 --long
-    moco: microservice-show-schema-moco.json
-    output: |
-      +------------+----------------+
-      |property    |value           |
-      +------------+----------------+
-      |name        |test            |
-      +------------+----------------+
-      |version     |v1              |
-      +------------+----------------+
-      |url         |/test           |
-      +------------+----------------+
-      |status      |1               |
-      +------------+----------------+
-      |nodes       |10.0.0.1:8080   |
-      +------------+----------------+
-      |enable-ssl  |false           |
-      +------------+----------------+
-      |path        |/test           |
-      +------------+----------------+