Use direct GET to get service instance

Issue-ID: LOG-999

Change-Id: I2530de89628465055c9464e912cfe4764cb10f3a
Signed-off-by: Norm Traxler <normant@amdocs.com>

6 files changed, 67 insertions, 37 deletions

diff --git a/src/test/resources/junit/customerData.json b/src/test/resources/junit/customerData.json
deleted file mode 100644
index 31e6baa..0000000
--- a/src/test/resources/junit/customerData.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-            "global-customer-id": "DemoCust_651800ed-2a3c-45f5-b920-85c1ed155fc2",
-            "subscriber-name": "DemoCust_651800ed-2a3c-45f5-b920-85c1ed155fc2",
-            "subscriber-type": "CUST",
-            "resource-version": "1526324315029"
-}
\ No newline at end of file
diff --git a/src/test/resources/junit/customerDataCustomerIdNotFound.json b/src/test/resources/junit/customerDataCustomerIdNotFound.json
deleted file mode 100644
index e2f71c6..0000000
--- a/src/test/resources/junit/customerDataCustomerIdNotFound.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-            "global-customer-id": "dummy",
-            "subscriber-name": "dummy",
-            "subscriber-type": "CUST",
-            "resource-version": "1526324315029"
-}
\ No newline at end of file
diff --git a/src/test/resources/junit/queryNodeDataNullResourceLink.json b/src/test/resources/junit/queryNodeDataNullResourceLink.json
deleted file mode 100644
index 36eb667..0000000
--- a/src/test/resources/junit/queryNodeDataNullResourceLink.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "result-data": [
-        {
-            "resource-type": "service-instance",
-            "related-link": "/aai/v11/network/vnfcs/vnfc/zrdm5aepdg01vmg003"
-        }
-    ]
-}
diff --git a/src/test/resources/junit/queryNodeDataVcpe.json b/src/test/resources/junit/queryNodeDataVcpe.json
deleted file mode 100644
index 593ba09..0000000
--- a/src/test/resources/junit/queryNodeDataVcpe.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{

-    "result-data": [

-        {

-            "resource-type": "service-instance",

-            "resource-link": "/aai/v11/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vCPE/service-instances/service-instance/68352304-7bba-4609-8551-0d0b819376c3"

-        }

-    ]

-}

-

diff --git a/src/test/resources/junit/queryNodeDataVfw.json b/src/test/resources/junit/queryNodeDataVfw.json
deleted file mode 100644
index e827391..0000000
--- a/src/test/resources/junit/queryNodeDataVfw.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-    "result-data": [
-        {
-            "resource-type": "service-instance",
-            "resource-link": "/aai/v11/business/customers/customer/DemoCust_651800ed-2a3c-45f5-b920-85c1ed155fc2/service-subscriptions/service-subscription/vFW/service-instances/service-instance/7d518257-49bd-40ac-8d17-017a726ec12a"
-        }
-    ]
-}
\ No newline at end of file
diff --git a/src/test/resources/junit/serviceInstancevfw.json b/src/test/resources/junit/serviceInstancevfw.json
new file mode 100644
index 0000000..85afe08
--- /dev/null
+++ b/src/test/resources/junit/serviceInstancevfw.json
@@ -0,0 +1,67 @@
+{

+    "service-instance-id": "68352304-7bba-4609-8551-0d0b819376c3",

+    "service-instance-name": "vcpe_svc_vcpesvc_vgmux_201809061919",

+    "service-type": "vFW",

+    "environment-context": "General_Revenue-Bearing",

+    "workload-context": "Production",

+    "model-invariant-id": "58f20afd-6ed1-4451-a19d-4fbee4aefa08",

+    "model-version-id": "7b4beec3-04a6-4513-8341-959589d2bd01",

+    "resource-version": "1536261835931",

+    "orchestration-status": "Active",

+    "relationship-list": {

+        "relationship": [

+            {

+                "related-to": "project",

+                "related-link": "/aai/v11/business/projects/project/Project-Demonstration",

+                "relationship-data": [

+                    {

+                        "relationship-key": "project.project-name",

+                        "relationship-value": "Project-Demonstration"

+                    }

+                ]

+            },

+            {

+                "related-to": "generic-vnf",

+                "related-link": "/aai/v11/network/generic-vnfs/generic-vnf/d94daff6-7d5b-4d2e-bc99-c9af0754b59d",

+                "relationship-data": [

+                    {

+                        "relationship-key": "generic-vnf.vnf-id",

+                        "relationship-value": "d94daff6-7d5b-4d2e-bc99-c9af0754b59d"

+                    }

+                ],

+                "related-to-property": [

+                    {

+                        "property-key": "generic-vnf.vnf-name",

+                        "property-value": "vcpe_vnf_vcpevsp_vgmux_0830_201809061919"

+                    }

+                ]

+            },

+            {

+                "related-to": "l3-network",

+                "related-link": "/aai/v11/network/l3-networks/l3-network/ca6f5cdc-cf66-4d03-b5c0-3604da0709a6",

+                "relationship-data": [

+                    {

+                        "relationship-key": "l3-network.network-id",

+                        "relationship-value": "ca6f5cdc-cf66-4d03-b5c0-3604da0709a6"

+                    }

+                ],

+                "related-to-property": [

+                    {

+                        "property-key": "l3-network.network-name",

+                        "property-value": "vcpe_net_mux_gw_201809061919"

+                    }

+                ]

+            },

+            {

+                "related-to": "owning-entity",

+                "related-link": "/aai/v11/business/owning-entities/owning-entity/520cc603-a3c4-4ec2-9ef4-ca70facd79c0",

+                "relationship-data": [

+                    {

+                        "relationship-key": "owning-entity.owning-entity-id",

+                        "relationship-value": "520cc603-a3c4-4ec2-9ef4-ca70facd79c0"

+                    }

+                ]

+            }

+        ]

+    }

+}