10 files changed, 362 insertions, 8 deletions
diff --git a/src/test/resources/junit/aaiResourcesData-1.json b/src/test/resources/junit/aaiResourcesData-1.json
deleted file mode 100644
index 66563d5..0000000
--- a/src/test/resources/junit/aaiResourcesData-1.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-     "related-to": "vnfc",
-     "related-link": "/aai/v11/network/vnfcs/vnfc/zrdm5aepdg01vmg003",
-     "relationship-data": [
-          { "relationship-key": "vnfc.vnfc-name",
-          "relationship-value": "zrdm5aepdg01vmg003" }
-      ]
-}
-\ No newline at end of file
diff --git a/src/test/resources/junit/customerData-1.json b/src/test/resources/junit/customerData.json
index 31e6baa..31e6baa 100644
--- a/src/test/resources/junit/customerData-1.json
+++ b/src/test/resources/junit/customerData.json
diff --git a/src/test/resources/junit/customerData-CustomerIdNotFound.json b/src/test/resources/junit/customerDataCustomerIdNotFound.json
index e2f71c6..e2f71c6 100644
--- a/src/test/resources/junit/customerData-CustomerIdNotFound.json
+++ b/src/test/resources/junit/customerDataCustomerIdNotFound.json
diff --git a/src/test/resources/junit/genericVnf.json b/src/test/resources/junit/genericVnf.json
new file mode 100644
index 0000000..a731dbd
--- /dev/null
+++ b/src/test/resources/junit/genericVnf.json
@@ -0,0 +1,100 @@
+{
+    "vnf-id": "d94daff6-7d5b-4d2e-bc99-c9af0754b59d",
+    "vnf-name": "vcpe_vnf_vcpevsp_vgmux_0830_201809061919",
+    "vnf-type": "vcpesvc_vgmux/vcpevsp_vgmux_0830 0",
+    "service-id": "f9457e8c-4afd-45da-9389-46acd9bf5116",
+    "prov-status": "PROV",
+    "orchestration-status": "Active",
+    "in-maint": false,
+    "is-closed-loop-disabled": false,
+    "resource-version": "1536261950146",
+    "model-invariant-id": "17e561e9-d0c2-4959-a709-9335b2233966",
+    "model-version-id": "eaabc15d-c084-4e40-9d46-4d963a4c079b",
+    "model-customization-id": "71c4be60-c6a3-4874-a06e-8ebdc2f0f87b",
+    "nf-type": "",
+    "nf-function": "",
+    "nf-role": "",
+    "nf-naming-code": "",
+    "relationship-list": {
+        "relationship": [
+            {
+                "related-to": "service-instance",
+                "related-link": "/aai/v11/business/customers/customer/SDN-ETHERNET-INTERNET/service-subscriptions/service-subscription/vCPE/service-instances/service-instance/68352304-7bba-4609-8551-0d0b819376c3",
+                "relationship-data": [
+                    {
+                        "relationship-key": "customer.global-customer-id",
+                        "relationship-value": "SDN-ETHERNET-INTERNET"
+                    },
+                    {
+                        "relationship-key": "service-subscription.service-type",
+                        "relationship-value": "vCPE"
+                    },
+                    {
+                        "relationship-key": "service-instance.service-instance-id",
+                        "relationship-value": "68352304-7bba-4609-8551-0d0b819376c3"
+                    }
+                ],
+                "related-to-property": [
+                    {
+                        "property-key": "service-instance.service-instance-name",
+                        "property-value": "vcpe_svc_vcpesvc_vgmux_201809061919"
+                    }
+                ]
+            },
+            {
+                "related-to": "platform",
+                "related-link": "/aai/v11/business/platforms/platform/Platform-Demonstration",
+                "relationship-data": [
+                    {
+                        "relationship-key": "platform.platform-name",
+                        "relationship-value": "Platform-Demonstration"
+                    }
+                ]
+            },
+            {
+                "related-to": "vserver",
+                "related-link": "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/RegionOne/tenants/tenant/bc43d50ffcb84750bac0c1707a9a765b/vservers/vserver/0714ea3e-2126-4c31-b405-6796ffc955fb",
+                "relationship-data": [
+                    {
+                        "relationship-key": "cloud-region.cloud-owner",
+                        "relationship-value": "CloudOwner"
+                    },
+                    {
+                        "relationship-key": "cloud-region.cloud-region-id",
+                        "relationship-value": "RegionOne"
+                    },
+                    {
+                        "relationship-key": "tenant.tenant-id",
+                        "relationship-value": "bc43d50ffcb84750bac0c1707a9a765b"
+                    },
+                    {
+                        "relationship-key": "vserver.vserver-id",
+                        "relationship-value": "0714ea3e-2126-4c31-b405-6796ffc955fb"
+                    }
+                ],
+                "related-to-property": [
+                    {
+                       "property-key": "vserver.vserver-name",
+                        "property-value": "zdcpe1cpe01mux01_201809061919"
+                    }
+                ]
+            }
+        ]
+    },
+    "vf-modules": {
+        "vf-module": [
+            {
+                "vf-module-id": "2c3f8902-f278-4ee3-93cf-9d2364cbafca",
+                "vf-module-name": "vcpe_vfmodule_vcpevspvgmux0830_201809061919",
+                "heat-stack-id": "vcpe_vfmodule_vcpevspvgmux0830_201809061919/f421ea6a-04e9-422a-8a8e-a6a01cbf87d2",
+                "orchestration-status": "active",
+                "is-base-vf-module": true,
+                "resource-version": "1536261945277",
+                "model-invariant-id": "ced468ed-46ec-4e18-9bb7-1a861c98087c",
+                "model-version-id": "d2f0ea48-d996-4d9e-893e-f649cbb969aa",
+                "model-customization-id": "52314e9a-e963-44d4-94b9-0de1ed2268c5",
+                "module-index": 0
+            }
+        ]
+    }
+}
diff --git a/src/test/resources/junit/queryNodeData-nullResourceLink.json b/src/test/resources/junit/queryNodeDataNullResourceLink.json
index 36eb667..36eb667 100644
--- a/src/test/resources/junit/queryNodeData-nullResourceLink.json
+++ b/src/test/resources/junit/queryNodeDataNullResourceLink.json
diff --git a/src/test/resources/junit/queryNodeDataVcpe.json b/src/test/resources/junit/queryNodeDataVcpe.json
new file mode 100644
index 0000000..593ba09
--- /dev/null
+++ b/src/test/resources/junit/queryNodeDataVcpe.json
@@ -0,0 +1,9 @@
+{
+    "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/queryNodeData-1.json b/src/test/resources/junit/queryNodeDataVfw.json
index e827391..e827391 100644
--- a/src/test/resources/junit/queryNodeData-1.json
+++ b/src/test/resources/junit/queryNodeDataVfw.json
diff --git a/src/test/resources/sdncResponse.json b/src/test/resources/junit/sdncGenericResponse.json
index 27b791a..27b791a 100644
--- a/src/test/resources/sdncResponse.json
+++ b/src/test/resources/junit/sdncGenericResponse.json
diff --git a/src/test/resources/junit/serviceInstance.json b/src/test/resources/junit/serviceInstance.json
new file mode 100644
index 0000000..9415d84
--- /dev/null
+++ b/src/test/resources/junit/serviceInstance.json
@@ -0,0 +1,66 @@
+{
+    "service-instance-id": "68352304-7bba-4609-8551-0d0b819376c3",
+    "service-instance-name": "vcpe_svc_vcpesvc_vgmux_201809061919",
+    "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"
+                    }
+                ]
+            }
+        ]
+    }
+}
diff --git a/src/test/resources/junit/vnfApiResponse.json b/src/test/resources/junit/vnfApiResponse.json
new file mode 100644
index 0000000..e3828a0
--- /dev/null
+++ b/src/test/resources/junit/vnfApiResponse.json
@@ -0,0 +1,187 @@
+{
+  "vnfs": {
+    "vnf-list": [
+      {
+        "vnf-id": "2c3f8902-f278-4ee3-93cf-9d2364cbafca",
+        "service-data": {
+          "vnf-request-information": {
+            "vnf-type": "VshakenIst09042018..base_alb..module-3",
+            "generic-vnf-name": "zdyh3bsflb0001v_01",
+            "vnf-id": "2c3f8902-f278-4ee3-93cf-9d2364cbafca",
+            "use-preload": "Y",
+            "generic-vnf-type": "vShaken_DNS_ns592n/vSHAKEN_IST_09042018 0",
+            "tenant": "f2e24e16c51244539b1f00123809cf4f",
+            "vnf-name": "zdyh3bsflb0001v_base_module_01",
+            "aic-cloud-region": "dyh3b",
+            "generic-vnf-id": "6bd2296e-d3e8-4eb8-ad65-a54d7bdb86d6"
+          },
+          "vnf-topology-information": {
+            "vnf-assignments": {
+              "vnf-networks": [
+                {
+                  "network-role": "signaling",
+                  "network-name": "vshaken_signal",
+                  "ipv6-subnet-id": "936e0970-7403-48ef-9cf3-6374b42c5497",
+                  "neutron-id": "5755dd95-b8f4-469a-931f-200727ed1933",
+                  "network-id": "77747167-c41f-43e4-a5be-9a39b21949c8",
+                  "contrail-network-fqdn": "default-domain:APP-C-24595-T-IST-05A:vshaken_signal",
+                  "ipv6-subnet-name": "vshaken_signal_v6_s1"
+                },
+                {
+                  "network-role": "management",
+                  "subnet-name": "vshaken_mgmt_v4_s1",
+                  "network-name": "vshaken_mgmt",
+                  "subnet-id": "1bf746bc-aace-4575-b8e6-4c8f9ccddd42",
+                  "neutron-id": "96f4178f-ef7a-4754-acd0-269e9c5f0fc4",
+                  "network-id": "1dc87784-3359-4a47-a868-458c13545624",
+                  "contrail-network-fqdn": "default-domain:APP-C-24595-T-IST-05A:vshaken_mgmt"
+                }
+              ],
+              "vnf-vms": [
+                {
+                  "vm-type": "alb",
+                  "vm-networks": [
+                    {
+                      "network-role": "management",
+                      "network-ips": [
+                        {
+                          "ip-address": "135.50.172.132"
+                        },
+                        {
+                          "ip-address": "135.50.172.133"
+                       }
+                      ],
+                      "use-dhcp": "Y"
+                    },
+                    {
+                      "network-role": "signaling",
+                      "network-ips-v6": [
+                        {
+                          "ip-address-ipv6": "2001:1890:1001:2652::7:1"
+                        },
+                        {
+                          "ip-address-ipv6": "2001:1890:1001:2652::7:2"
+                        },
+                        {
+                          "ip-address-ipv6": "2001:1890:1001:2652::7:3"
+                        },
+                        {
+                          "ip-address-ipv6": "2001:1890:1001:2652::7:4"
+                        },
+                        {
+                          "ip-address-ipv6": "2001:1890:1001:2652::7:5"
+                        },
+                        {
+                          "ip-address-ipv6": "2001:1890:1001:2652::7:6"
+                        },
+                        {
+                          "ip-address-ipv6": "2001:1890:1001:2652::7:7"
+                        },
+                        {
+                          "ip-address-ipv6": "2001:1890:1001:2652::7:8"
+                        }
+                      ],
+                      "use-dhcp": "Y"
+                    }
+                  ],
+                  "vm-names": [
+                    {
+                      "vm-name": "dyh3bsflb0001vm001"
+                    },
+                    {
+                      "vm-name": "dyh3bsflb0001vm002"
+                    }
+                  ],
+                  "vm-count": 2
+                }
+              ],
+              "availability-zones": [
+                {
+                  "availability-zone": "dyh3b-kvm-az01"
+                },
+                {
+                  "availability-zone": "dyh3b-kvm-az02"
+                }
+              ]
+            },
+            "vnf-parameters": [
+              {
+                "vnf-parameter-name": "license_server_ip",
+                "vnf-parameter-value": "135.69.241.53"
+              },
+              {
+                "vnf-parameter-name": "alb_admin_password",
+                "vnf-parameter-value": "foobar"
+              },
+              {
+                "vnf-parameter-name": "vf_module_id",
+                "vnf-parameter-value": "zdyh3bsflb0001v"
+              },
+              {
+                "vnf-parameter-name": "alb_root_password",
+                "vnf-parameter-value": "boofar"
+              },
+              {
+                "vnf-parameter-name": "vnf_id",
+                "vnf-parameter-value": "zdyh3bsflb0001v"
+              },
+              {
+                "vnf-parameter-name": "license_server_password",
+                "vnf-parameter-value": "root"
+              },
+              {
+                "vnf-parameter-name": "license_pool_name",
+                "vnf-parameter-value": "vshaken_pool"
+              },
+              {
+                "vnf-parameter-name": "signaling_netmask",
+                "vnf-parameter-value": "64"
+              },
+              {
+                "vnf-parameter-name": "alb_ssh_public_key",
+                "vnf-parameter-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDpbEGYuDm2azRRqDHmaNeeN1w7in2TeK8y+8hTc7BtwQFjuoZBdZb7Hexf4JbYMzNc7QMaVvGa/paFS5GHoYl+gDWhci9CB3LoHHaCDB9YbBm4VaTf/04tWmur9OAl+h7EnoL+7ksRp1+7aLy3ictdimJlvlbIVgio4pINobXRqzOFr+QP+LWH92sjFGlGe61WjU/19QGyQSq0EOMU7vIxo5QaxZHpwkdQy8R1rJjoXdMj/rh3COiXWlVy3hZi3eGtK50M7vQbXn56azF4hPeN6kxkIwn2syFE0Jmw4J1aj2mnJDsix7tTlf6DL6wi54G8M21ZHHnobzKPiojjYLfh"
+              }
+            ],
+            "vnf-topology-identifier": {
+              "service-type": "SDN-MOBILITY",
+              "vnf-type": "VshakenIst09042018..base_alb..module-3",
+              "generic-vnf-name": "zdyh3bsflb0001v_01",
+              "generic-vnf-type": "vShaken_DNS_ns592n/vSHAKEN_IST_09042018 0",
+              "vnf-name": "zdyh3bsflb0001v_base_module_01"
+            }
+          },
+          "service-information": {
+            "service-id": "null",
+            "service-type": "null",
+            "service-instance-id": "ccce0f34-6603-419a-b916-acc741f4ceb4",
+            "subscriber-name": "notsurewecare"
+          },
+          "vnf-id": "2c3f8902-f278-4ee3-93cf-9d2364cbafca",
+          "sdnc-request-header": {
+            "svc-notification-url": "https://mso-sdnc-ist3.ecomp.idns.cip.att.com:30254/adapters/rest/SDNCNotify",
+            "svc-request-id": "906ece4b-d07f-4479-adbf-b7d476002808-1539182393957",
+            "svc-action": "assign"
+          },
+          "oper-status": {
+            "order-status": "PendingCreate"
+          },
+          "request-information": {
+            "source": "VID",
+            "request-action": "VNFActivateRequest",
+            "request-id": "906ece4b-d07f-4479-adbf-b7d476002808"
+          }
+        },
+        "service-status": {
+          "final-indicator": "Y",
+          "request-status": "synccomplete",
+          "response-code": "200",
+          "rpc-name": "vnf-topology-operation",
+          "vnfsdn-action": "VNFActivateRequest",
+          "rpc-action": "assign",
+          "response-timestamp": "2018-10-10T14:39:55.433Z"
+        }
+      }
+
+    ]
+  }
+}
+\ No newline at end of file