Seperating usecase test suite dependencies

  # Refactoring BulkPM Dataplane test suite

Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Change-Id: I4b2ad0dc5147e10ffc55f4ec210a29f073cd865b
Issue-ID: INT-832
Signed-off-by: efiacor <fiachra.corcoran@est.tech>

26 files changed, 0 insertions, 266 deletions

diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-customer.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-customer.json
deleted file mode 100755
index 6c53c056..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-customer.json
+++ /dev/null
@@ -1,73 +0,0 @@
-{
-    "global-customer-id": "DemoCustomer",
-    "subscriber-name": "DemoCustomer",
-    "subscriber-type": "INFRA",
-    "service-subscriptions": {
-        "service-subscription": [
-            {
-                "service-type": "vLB",
-                "relationship-list": {
-                    "relationship": [
-                        {
-                            "related-to": "tenant",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/xyzcloud/tenants/tenant/693c7729b2364a26a3ca602e6f66187d",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "cloud-region.cloud-owner",
-                                    "relationship-value": "CloudOwner"
-                                },
-                                {
-                                    "relationship-key": "cloud-region.cloud-region-id",
-                                    "relationship-value": "xyzcloud"
-                                },
-                                {
-                                    "relationship-key": "tenant.tenant-id",
-                                    "relationship-value": "693c7729b2364a26a3ca602e6f66187d"
-                                }
-                            ],
-                            "related-to-property": [
-                                {
-                                    "property-key": "tenant.tenant-name",
-                                    "property-value": "admin"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            },
-            {
-                "service-type": "vCPE",
-                "relationship-list": {
-                    "relationship": [
-                        {
-                            "related-to": "tenant",
-                            "relationship-label": "org.onap.relationships.inventory.Uses",
-                            "related-link": "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/xyzcloud/tenants/tenant/693c7729b2364a26a3ca602e6f66187d",
-                            "relationship-data": [
-                                {
-                                    "relationship-key": "cloud-region.cloud-owner",
-                                    "relationship-value": "CloudOwner"
-                                },
-                                {
-                                    "relationship-key": "cloud-region.cloud-region-id",
-                                    "relationship-value": "xyzcloud"
-                                },
-                                {
-                                    "relationship-key": "tenant.tenant-id",
-                                    "relationship-value": "693c7729b2364a26a3ca602e6f66187d"
-                                }
-                            ],
-                            "related-to-property": [
-                                {
-                                    "property-key": "tenant.tenant-name",
-                                    "property-value": "admin"
-                                }
-                            ]
-                        }
-                    ]
-                }
-            }
-        ]
-    }
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-project-relation-ship.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-project-relation-ship.json
deleted file mode 100755
index c2662266..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-project-relation-ship.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "related-link": "/business/customers/customer/DemoCustomer/service-subscriptions/service-subscription/vCPE/service-instances/service-instance/ccece8fe-13da-456a-baf6-41b3a4a2bc2b"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-project.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-project.json
deleted file mode 100755
index f78ddfaf..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/business-project.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "project-name": "PROJECT_NAME_VALUE"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/cloud-region-related-link.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/cloud-region-related-link.json
deleted file mode 100755
index f6bf992d..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/cloud-region-related-link.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "related-link": "/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/PnfSwUCloudRegion"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/cloud-region.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/cloud-region.json
deleted file mode 100755
index fa328408..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/cloud-region.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-    "cloud-owner": "CloudOwner",
-    "cloud-region-id": "PnfSwUCloudRegion",
-    "cloud-type": "openstack",
-    "owner-defined-type": "OwnerType",
-    "cloud-region-version": "1.0",
-    "cloud-zone": "CloudZone",
-    "complex-name": "clli1",
-    "cloud-extra-info": ""
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/esr-system-info.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/esr-system-info.json
deleted file mode 100755
index 65d6095c..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/esr-system-info.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-    "esr-system-info-id": "5c067098-f2e3-40f7-a7ba-155e7c61e916",
-    "system-name": "vnfmSimulator",
-    "type": "simulator",
-    "vendor": "EST",
-    "version": "V1.0",
-    "service-url": "https://so-vnfm-simulator.onap:9095/vnflcm/v1",
-    "user-name": "vnfmadapter",
-    "password": "123456",
-    "system-type": "VNFM",
-    "resource-version": "1564774459055"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/esr-vnfm.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/esr-vnfm.json
deleted file mode 100755
index 52395273..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/esr-vnfm.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "vnfm-id": "c5e99cee-1996-4606-b697-838d51d4e1a3",
-    "vim-id": "PnfSwUVimId",
-    "certificate-url": ""
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-orch-status-update.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-orch-status-update.json
deleted file mode 100755
index 2c00ea3a..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-orch-status-update.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "vnf-id": "dfd02fb5-d7fb-4aac-b3c4-cd6b60058701",
-    "orchestration-status": "Assigned"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-related-link.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-related-link.json
deleted file mode 100755
index 388773b7..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-related-link.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "related-link": "/network/generic-vnfs/generic-vnf/dfd02fb5-d7fb-4aac-b3c4-cd6b60058701"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-relationship.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-relationship.json
deleted file mode 100755
index 25f317a5..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf-relationship.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "related-to": "generic-vnf",
-    "relationship-label": "org.onap.relationships.inventory.Uses",
-    "related-link": "/aai/v17/network/generic-vnfs/generic-vnf/dfd02fb5-d7fb-4aac-b3c4-cd6b60058701",
-    "relationship-data": [{
-        "relationship-key": "generic-vnf.vnf-id",
-        "relationship-value": "dfd02fb5-d7fb-4aac-b3c4-cd6b60058701"
-    }],
-    "related-to-property": [{
-        "property-key": "generic-vnf.vnf-name",
-        "property-value": "EsyVnfInstantiationTest2"
-    }]
-}
\ No newline at end of file
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf.json
deleted file mode 100755
index 3740ce12..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/generic-vnf.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-    "vnf-id": "dfd02fb5-d7fb-4aac-b3c4-cd6b60058701",
-    "vnf-name": "EsyVnfInstantiationTest2",
-    "vnf-type": "Sol004Zip4Service/Sol004Zip3VSP 0",
-    "service-id": "f13844f4-dbf8-4d0e-a979-45204f3ddb4e",
-    "prov-status": "PREPROV",
-    "orchestration-status": "Inventoried",
-    "model-invariant-id": "b0f14066-2b65-40d2-b5a4-c8f2116fb5fc",
-    "model-version-id": "84b9649a-4eb9-4967-9abe-e8702f55518b",
-    "model-customization-id": "50a90cd7-a84e-4ee1-b5ba-bfa5a26f5e15",
-    "nf-type": "vnflcm",
-    "nf-role": "vnflcm",
-    "selflink": "http://localhost:9921/generic-vnf/dfd02fb5-d7fb-4aac-b3c4-cd6b60058701"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/line-of-business-related-link.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/line-of-business-related-link.json
deleted file mode 100755
index 5ec5e9f0..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/line-of-business-related-link.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "related-link": "/business/lines-of-business/line-of-business/LINE_OF_BUSINESS_1"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/line-of-business.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/line-of-business.json
deleted file mode 100755
index 61746a24..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/line-of-business.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "line-of-business-name": "LINE_OF_BUSINESS_1"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/owning-entity-relation-ship.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/owning-entity-relation-ship.json
deleted file mode 100755
index c2662266..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/owning-entity-relation-ship.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "related-link": "/business/customers/customer/DemoCustomer/service-subscriptions/service-subscription/vCPE/service-instances/service-instance/ccece8fe-13da-456a-baf6-41b3a4a2bc2b"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/owning-entity.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/owning-entity.json
deleted file mode 100755
index 7248d41d..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/owning-entity.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "owning-entity-id": "oe_1",
-    "owning-entity-name": "oe_2"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/platform-related-link.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/platform-related-link.json
deleted file mode 100755
index 6e0de8ec..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/platform-related-link.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "related-link": "/business/platforms/platform/PLATFORM_APP_ID_1"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/platform.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/platform.json
deleted file mode 100755
index d94f2f02..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/platform.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "platform-name": "PLATFORM_APP_ID_1"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/pnf.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/pnf.json
deleted file mode 100755
index fdd865d3..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/pnf.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "pnf-name2":"example-pnf-name2-val-78244",
-  "pnf-name2-source":"example-pnf-name2-source-val-99275",
-  "equip-type":"example-equip-type-val-20348",
-  "equip-vendor":"example-equip-vendor-val-52182",
-  "equip-model":"example-equip-model-val-8370",
-  "management-option":"example-management-option-val-72881",
-  "ipaddress-v4-oam":"10.12.25.73",
-  "ipaddress-v6-oam":"x:x:x:x:x:X",
-  "target-software-version":"xxxxXXX",
-  "pnf-name":"test-008",
-  "pnf-id":"5f2602dc-f647-4535-8f1d-9ec079e68a49",
-  "in-maint":false,
-  "resource-version":"1570117118905",
-  "selflink": "http://localhost:9921/pnf/test-008"
-}
\ No newline at end of file
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/relation-ship.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/relation-ship.json
deleted file mode 100755
index c2662266..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/relation-ship.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "related-link": "/business/customers/customer/DemoCustomer/service-subscriptions/service-subscription/vCPE/service-instances/service-instance/ccece8fe-13da-456a-baf6-41b3a4a2bc2b"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-Instance-relationShip.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-Instance-relationShip.json
deleted file mode 100755
index ab643d3c..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-Instance-relationShip.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-    "related-to": "generic-vnf",
-    "relationship-label": "org.onap.relationships.inventory.ComposedOf",
-    "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/dfd02fb5-d7fb-4aac-b3c4-cd6b60058701",
-    "relationship-data": [{
-        "relationship-key": "generic-vnf.vnf-id",
-        "relationship-value": "dfd02fb5-d7fb-4aac-b3c4-cd6b60058701"
-    }],
-    "related-to-property": [{
-        "property-key": "generic-vnf.vnf-name",
-        "property-value": "EsyVnfInstantiationTest2"
-    }]
-}
\ No newline at end of file
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-instance-orch-status-update.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-instance-orch-status-update.json
deleted file mode 100755
index 5cd566a6..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-instance-orch-status-update.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "service-instance-id": "ccece8fe-13da-456a-baf6-41b3a4a2bc2b",
-    "service-instance-name": "ServiceTest",
-    "orchestration-status": "Active"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-instance.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-instance.json
deleted file mode 100755
index 18ae8cb6..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-instance.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-    "service-instance-id": "ccece8fe-13da-456a-baf6-41b3a4a2bc2b",
-    "service-instance-name": "ServiceTest",
-    "environment-context": "General_Revenue-Bearing",
-    "workload-context": "Production",
-    "model-invariant-id": "e9acd081-9c89-4b4d-bcb3-e0e2b9715b2a",
-    "model-version-id": "c112a499-6148-488b-ba82-3f5938cf26d2",
-    "orchestration-status": "Inventoried"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-subscription.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-subscription.json
deleted file mode 100755
index e1b4f4f4..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/service-subscription.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "service-type": "Firewall"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/tenant-relationship.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/tenant-relationship.json
deleted file mode 100755
index eb96c8c3..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/tenant-relationship.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "related-to": "tenant",
-    "relationship-label": "org.onap.relationships.inventory.BelongsTo",
-    "related-link": "/aai/v15/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/PnfSwUCloudRegion/tenants/tenant/693c7729b2364a26a3ca602e6f66187d",
-    "relationship-data": [
-        {
-            "relationship-key": "cloud-region.cloud-owner",
-            "relationship-value": "CloudOwner"
-        },
-        {
-            "relationship-key": "cloud-region.cloud-region-id",
-            "relationship-value": "PnfSwUCloudRegion"
-        },
-        {
-            "relationship-key": "tenant.tenant-id",
-            "relationship-value": "693c7729b2364a26a3ca602e6f66187d"
-        }
-    ],
-    "related-to-property": [
-        {
-            "property-key": "tenant.tenant-name",
-            "property-value": "admin"
-        }
-    ]
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/tenant.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/tenant.json
deleted file mode 100755
index 746131a6..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/tenant.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-    "tenant-id": "693c7729b2364a26a3ca602e6f66187d",
-    "tenant-name": "admin"
-}
diff --git a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/vServer.json b/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/vServer.json
deleted file mode 100755
index 5fa1843e..00000000
--- a/plans/usecases/pnf-sw-upgrade/so/simulator/aai-simulator/src/test/resources/test-data/vServer.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-    "vserver-id": "f84fdb9b-ad7c-49db-a08f-e443b4cbd033",
-    "vserver-name": "CsitVServer",
-    "prov-status": "active",
-    "relationship-list": {
-        "relationship": [
-            {
-                "related-to": "generic-vnf",
-                "relationship-label": "tosca.relationships.HostedOn",
-                "related-link": "/aai/v15/network/generic-vnfs/generic-vnf/dfd02fb5-d7fb-4aac-b3c4-cd6b60058701",
-                "relationship-data": [
-                    {
-                        "relationship-key": "generic-vnf.vnf-id",
-                        "relationship-value": "58157d7e-d50d-4a7d-aebe-ae6e41ca1d9f"
-                    }
-                ],
-                "related-to-property": [
-                    {
-                        "property-key": "generic-vnf.vnf-name",
-                        "property-value": "Test"
-                    }
-                ]
-            }
-        ]
-    }
-}