Fixed integration issues for CCVPN usecase

1) Currently holmes is updating the AAI record without resource-version
2) Also corrected some of the AAI URL's

Issue-ID: HOLMES-164

Change-Id: I7b0ba5cc786e57a282ee917bed07030dd9e74678
Signed-off-by: rama-huawei <rama.subba.reddy.s@huawei.com>

2 files changed, 116 insertions, 104 deletions

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java
index 52593aa..c094e4f 100644
--- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/AaiQuery4CcvpnTest.java
@@ -18,7 +18,11 @@ import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import org.easymock.EasyMock;
 import org.glassfish.jersey.client.HttpUrlConnectorProvider;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Rule;
+import org.junit.Test;
 import org.junit.rules.ExpectedException;
 import org.junit.runner.RunWith;
 import org.onap.holmes.common.aai.config.AaiConfig;
@@ -28,16 +32,23 @@ import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 import org.powermock.reflect.Whitebox;
 
-import javax.ws.rs.client.*;
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.Invocation;
 import javax.ws.rs.client.Invocation.Builder;
+import javax.ws.rs.client.WebTarget;
 import javax.ws.rs.core.MultivaluedHashMap;
 import javax.ws.rs.core.MultivaluedMap;
 import javax.ws.rs.core.Response;
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileReader;
+import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.util.HashMap;
-import java.util.Map;
 
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.assertThat;
@@ -245,7 +256,7 @@ public class AaiQuery4CcvpnTest {
         PowerMock.replayAll();
 
         JSONArray instances = (JSONArray) Whitebox.invokeMethod(aai, "getServiceInstances",
-                "custom-1", "service-type-1");
+                                                                "custom-1", "service-type-1");
 
         PowerMock.verifyAll();
 
@@ -265,7 +276,7 @@ public class AaiQuery4CcvpnTest {
         PowerMock.replayAll();
 
         JSONArray instances = (JSONArray) Whitebox.invokeMethod(aai, "getServiceInstances",
-                "custom-1", "service-type-1");
+                                                                "custom-1", "service-type-1");
 
         PowerMock.verifyAll();
 
@@ -276,6 +287,10 @@ public class AaiQuery4CcvpnTest {
 
     @Test
     public void test_updateTerminalPointStatus() throws CorrelationException {
+        mockGetMethod();
+        EasyMock.expect(response.readEntity(String.class)).andReturn(data.toJSONString());
+        EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
+
         mockPatchMethod();
         EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
 
@@ -288,6 +303,10 @@ public class AaiQuery4CcvpnTest {
 
     @Test
     public void test_updateTerminalPointStatus_exception() throws CorrelationException {
+        mockGetMethod();
+        EasyMock.expect(response.readEntity(String.class)).andReturn(data.toJSONString());
+        EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
+
         mockPatchMethod();
         EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2);
         EasyMock.expect(response.readEntity(String.class)).andReturn("Failed to update the TP information.");
@@ -303,6 +322,10 @@ public class AaiQuery4CcvpnTest {
 
     @Test
     public void test_updateLogicLinkStatus() throws CorrelationException {
+        mockGetMethod();
+        EasyMock.expect(response.readEntity(String.class)).andReturn(data.toJSONString());
+        EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
+
         mockPatchMethod();
         EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
 
@@ -315,6 +338,10 @@ public class AaiQuery4CcvpnTest {
 
     @Test
     public void test_updateLogicLinkStatus_exception() throws CorrelationException {
+        mockGetMethod();
+        EasyMock.expect(response.readEntity(String.class)).andReturn(data.toJSONString());
+        EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.OK);
+
         mockPatchMethod();
         EasyMock.expect(response.getStatusInfo()).andReturn(Response.Status.NOT_FOUND).times(2);
         EasyMock.expect(response.readEntity(String.class)).andReturn("Failed to update the logic link information.");
diff --git a/holmes-actions/src/test/resources/ccvpn.data.json b/holmes-actions/src/test/resources/ccvpn.data.json
index d60aae5..773b91b 100644
--- a/holmes-actions/src/test/resources/ccvpn.data.json
+++ b/holmes-actions/src/test/resources/ccvpn.data.json
@@ -1,129 +1,114 @@
 {
+  "resource-version": "1536316872154",
   "logic-link": {
-    "results": [
-      {
-        "p-interface": {
-          "interface-name": "{ifName}",
-          "network-ref": "some ref",
-          "transparent": "some value",
-          "operational-status ": "{status}",
-          "speed-value": "some speed",
-          "relationship-list": {
-            "relationship": [
+    "p-interface": {
+      "interface-name": "{ifName}",
+      "network-ref": "some ref",
+      "transparent": "some value",
+      "operational-status ": "{status}",
+      "speed-value": "some speed",
+      "relationship-list": {
+        "relationship": [
+          {
+            "related-to": "logical-link",
+            "related-link": "url of logical-link",
+            "relationship-data": [
               {
-                "related-to": "logical-link",
-                "related-link": "url of logical-link",
-                "relationship-data": [
-                  {
-                    "relationship-key": "logical-link.link-name",
-                    "relationship-value": "logic-link-1"
-                  }
-                ]
+                "relationship-key": "logical-link.link-name",
+                "relationship-value": "logic-link-1"
               }
             ]
           }
-        }
+        ]
       }
-    ]
+    }
   },
   "vpn-binding": {
-    "results": [
-      {
-        "p-interface": {
-          "interface-name": "{ifName}",
-          "network-ref": "some ref",
-          "transparent": "some value",
-          "operational-status ": "{status}",
-          "speed-value": "some speed",
-          "relationship-list": {
-            "relationship": [
+    "p-interface": {
+      "interface-name": "{ifName}",
+      "network-ref": "some ref",
+      "transparent": "some value",
+      "operational-status ": "{status}",
+      "speed-value": "some speed",
+      "relationship-list": {
+        "relationship": [
+          {
+            "related-to": "vpn-binding",
+            "related-link": "url of vpn-binding",
+            "relationship-data": [
               {
-                "related-to": "vpn-binding",
-                "related-link": "url of vpn-binding",
-                "relationship-data": [
-                  {
-                    "relationship-key": "vpn-binding.vpn-id",
-                    "relationship-value": "some id"
-                  }
-                ]
+                "relationship-key": "vpn-binding.vpn-id",
+                "relationship-value": "some id"
               }
             ]
           }
-        }
+        ]
       }
-    ]
+    }
   },
   "connectivity": {
-    "results": [
-      {
-        "vpn-binding": {
-          "vpn-id": "{vpnId}",
-          "vpn-name": "some name",
-          "access-provider-id": "provider id",
-          "access-client-id": "client id",
-          "access-topology-id": "topology id",
-          "src-access-node-id": "src node id",
-          "src-access-ltp-id": "src ltp id",
-          "dst-access-node-id": "dst node id",
-          "dst-access-ltp-id": "dst ltp id",
-          "operational-status": "some status",
-          "relationship-list": {
-            "relationship": [
+    "vpn-binding": {
+      "vpn-id": "{vpnId}",
+      "vpn-name": "some name",
+      "access-provider-id": "provider id",
+      "access-client-id": "client id",
+      "access-topology-id": "topology id",
+      "src-access-node-id": "src node id",
+      "src-access-ltp-id": "src ltp id",
+      "dst-access-node-id": "dst node id",
+      "dst-access-ltp-id": "dst ltp id",
+      "operational-status": "some status",
+      "relationship-list": {
+        "relationship": [
+          {
+            "related-to": "connectivity",
+            "related-link": "url of connectivity",
+            "relationship-data": [
               {
-                "related-to": "connectivity",
-                "related-link": "url of connectivity",
-                "relationship-data": [
-                  {
-                    "relationship-key": "connectivity. connectivity-id",
-                    "relationship-value": "some id"
-                  }
-                ]
+                "relationship-key": "connectivity.connectivity-id",
+                "relationship-value": "some id"
               }
             ]
           }
-        }
+        ]
       }
-    ]
+    }
   },
   "service-instance-by-connectivity": {
-    "results": [
-      {
-        "connectivity": {
-          "connectivity-id": "{connectivityId}",
-          "bandwidth-profile-name": "some profile",
-          "vpn-type": "some type",
-          "cir": "cir value",
-          "eir": "eir value",
-          "cbs": "cbs value",
-          "ebs": "ebs value",
-          "color-aware": "color value",
-          "coupling-flag": "flag value",
-          "etht-svc-name": "some name",
-          "access-provider-id": "provider id",
-          "access-client-id": "client id",
-          "access-topology-id": "topology id",
-          "access-node-id": "node id",
-          "access-ltp-id": "ltp id",
-          "connectivity-selflink": "some URL",
-          "cvlan ": "some tag",
-          "operational-status": "some status",
-          "relationship-list": {
-            "relationship": [
+    "connectivity": {
+      "connectivity-id": "{connectivityId}",
+      "bandwidth-profile-name": "some profile",
+      "vpn-type": "some type",
+      "cir": "cir value",
+      "eir": "eir value",
+      "cbs": "cbs value",
+      "ebs": "ebs value",
+      "color-aware": "color value",
+      "coupling-flag": "flag value",
+      "etht-svc-name": "some name",
+      "access-provider-id": "provider id",
+      "access-client-id": "client id",
+      "access-topology-id": "topology id",
+      "access-node-id": "node id",
+      "access-ltp-id": "ltp id",
+      "connectivity-selflink": "some URL",
+      "cvlan ": "some tag",
+      "operational-status": "some status",
+      "relationship-list": {
+        "relationship": [
+          {
+            "related-to": "service-instance",
+            "related-link": "/aai/v14/business/customers/customer/e151059a-d924-4629-845f-264db19e50b4/service-subscriptions/service-subscription/volte/service-instances?service-instance-id=service-1",
+            "relationship-data": [
               {
-                "related-to": "service-instance",
-                "related-link": "/aai/v14/business/customers/customer/e151059a-d924-4629-845f-264db19e50b4/service-subscriptions/service-subscription/volte/service-instances?service-instance-id=service-1",
-                "relationship-data": [
-                  {
-                    "relationship-key": "service-instance.service-instance-id",
-                    "relationship-value": "some id"
-                  }
-                ]
+                "relationship-key": "service-instance.service-instance-id",
+                "relationship-value": "some id"
               }
             ]
           }
-        }
+        ]
       }
-    ]
+    }
   },
   "service-instances-by-service-type": {
     "results": [