X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fnorthbound%2Fintegrationtest%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnorthbound%2Fintegrationtest%2FNorthboundIT.java;fp=opendaylight%2Fnorthbound%2Fintegrationtest%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fnorthbound%2Fintegrationtest%2FNorthboundIT.java;h=f4adc71fa2f3a2cd81babd05ac62c2c9fd0a4678;hp=b8229cfc5d5ad0896d1558f5a71d3ccc2a426574;hb=c482b318eda18c6649b012c3b42e5004aace8db8;hpb=4b863003a7ba2da0df528f806471262d0c800a09 diff --git a/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java b/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java index b8229cfc5d..f4adc71fa2 100644 --- a/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java +++ b/opendaylight/northbound/integrationtest/src/test/java/org/opendaylight/controller/northbound/integrationtest/NorthboundIT.java @@ -200,8 +200,8 @@ public class NorthboundIT { Integer buffersValue) throws JSONException { JSONObject nodeInfo = node.getJSONObject("node"); - Assert.assertEquals(nodeId, (Integer) nodeInfo.getInt("@id")); - Assert.assertEquals(nodeType, nodeInfo.getString("@type")); + Assert.assertEquals(nodeId, (Integer) nodeInfo.getInt("id")); + Assert.assertEquals(nodeType, nodeInfo.getString("type")); JSONObject properties = node.getJSONObject("properties"); @@ -242,10 +242,10 @@ public class NorthboundIT { JSONObject node = nodeConnector.getJSONObject("node"); JSONObject properties = nodeConnectorProperties.getJSONObject("properties"); - Assert.assertEquals(ncId, (Integer) nodeConnector.getInt("@id")); - Assert.assertEquals(ncType, nodeConnector.getString("@type")); - Assert.assertEquals(nodeId, (Integer) node.getInt("@id")); - Assert.assertEquals(nodeType, node.getString("@type")); + Assert.assertEquals(ncId, (Integer) nodeConnector.getInt("id")); + Assert.assertEquals(ncType, nodeConnector.getString("type")); + Assert.assertEquals(nodeId, (Integer) node.getInt("id")); + Assert.assertEquals(nodeType, node.getString("type")); if (state == null) { Assert.assertFalse(properties.has("state")); } else { @@ -612,8 +612,8 @@ public class NorthboundIT { JSONObject flowStatistics = getJsonInstance(json, "flowStatistics", 0xCAFE); JSONObject node = flowStatistics.getJSONObject("node"); // test that node was returned properly - Assert.assertTrue(node.getInt("@id") == 0xCAFE); - Assert.assertEquals(node.getString("@type"), "STUB"); + Assert.assertTrue(node.getInt("id") == 0xCAFE); + Assert.assertEquals(node.getString("type"), "STUB"); // test that flow statistics results are correct JSONArray flowStats = flowStatistics.getJSONArray("flowStatistic"); @@ -631,8 +631,8 @@ public class NorthboundIT { JSONObject portStatistics = getJsonInstance(json, "portStatistics", 0xCAFE); JSONObject node2 = portStatistics.getJSONObject("node"); // test that node was returned properly - Assert.assertTrue(node2.getInt("@id") == 0xCAFE); - Assert.assertEquals(node2.getString("@type"), "STUB"); + Assert.assertTrue(node2.getInt("id") == 0xCAFE); + Assert.assertEquals(node2.getString("type"), "STUB"); // test that port statistic results are correct JSONObject portStat = portStatistics.getJSONObject("portStatistic"); @@ -655,8 +655,8 @@ public class NorthboundIT { json = new JSONObject(jt); node = json.getJSONObject("node"); // test that node was returned properly - Assert.assertTrue(node.getInt("@id") == 0xCAFE); - Assert.assertEquals(node.getString("@type"), "STUB"); + Assert.assertTrue(node.getInt("id") == 0xCAFE); + Assert.assertEquals(node.getString("type"), "STUB"); // test that flow statistics results are correct flowStats = json.getJSONArray("flowStatistic"); @@ -670,8 +670,8 @@ public class NorthboundIT { json = new JSONObject(jt); node2 = json.getJSONObject("node"); // test that node was returned properly - Assert.assertTrue(node2.getInt("@id") == 0xCAFE); - Assert.assertEquals(node2.getString("@type"), "STUB"); + Assert.assertTrue(node2.getInt("id") == 0xCAFE); + Assert.assertEquals(node2.getString("type"), "STUB"); // test that port statistic results are correct portStat = json.getJSONObject("portStatistic"); @@ -713,10 +713,10 @@ public class NorthboundIT { if (act.getString("@type").equals("output")) { JSONObject port = act.getJSONObject("port"); JSONObject port_node = port.getJSONObject("node"); - Assert.assertTrue(port.getInt("@id") == 51966); - Assert.assertTrue(port.getString("@type").equals("STUB")); - Assert.assertTrue(port_node.getInt("@id") == 51966); - Assert.assertTrue(port_node.getString("@type").equals("STUB")); + Assert.assertTrue(port.getInt("id") == 51966); + Assert.assertTrue(port.getString("type").equals("STUB")); + Assert.assertTrue(port_node.getInt("id") == 51966); + Assert.assertTrue(port_node.getString("type").equals("STUB")); } if (act.getString("@type").equals("setDlSrc")) { @@ -786,7 +786,7 @@ public class NorthboundIT { Assert.assertTrue(result.equals("404")); // test add flow1 - String fc = "{\"dynamic\":\"false\", \"name\":\"test1\", \"node\":{\"@id\":\"51966\",\"@type\":\"STUB\"}, \"actions\":[\"DROP\"]}"; + String fc = "{\"dynamic\":\"false\", \"name\":\"test1\", \"node\":{\"id\":\"51966\",\"type\":\"STUB\"}, \"actions\":[\"DROP\"]}"; result = getJsonResult(baseURL + "node/STUB/51966/static-flow/test1", "PUT", fc); Assert.assertTrue(httpResponseCode == 201); @@ -800,20 +800,20 @@ public class NorthboundIT { Assert.assertEquals(json.getString("actions"), "DROP"); Assert.assertEquals(json.getString("installInHw"), "true"); JSONObject node = json.getJSONObject("node"); - Assert.assertEquals(node.getString("@type"), "STUB"); - Assert.assertEquals(node.getString("@id"), "51966"); + Assert.assertEquals(node.getString("type"), "STUB"); + Assert.assertEquals(node.getString("id"), "51966"); // test adding same flow again fails due to repeat name..return 409 // code result = getJsonResult(baseURL + "node/STUB/51966/static-flow/test1", "PUT", fc); Assert.assertTrue(result.equals("409")); - fc = "{\"dynamic\":\"false\", \"name\":\"test2\", \"node\":{\"@id\":\"51966\",\"@type\":\"STUB\"}, \"actions\":[\"DROP\"]}"; + fc = "{\"dynamic\":\"false\", \"name\":\"test2\", \"node\":{\"id\":\"51966\",\"type\":\"STUB\"}, \"actions\":[\"DROP\"]}"; result = getJsonResult(baseURL + "node/STUB/51966/static-flow/test2", "PUT", fc); // test should return 409 for error due to same flow being added. Assert.assertTrue(result.equals("409")); // add second flow that's different - fc = "{\"dynamic\":\"false\", \"name\":\"test2\", \"nwSrc\":\"1.1.1.1\", \"node\":{\"@id\":\"51966\",\"@type\":\"STUB\"}, \"actions\":[\"DROP\"]}"; + fc = "{\"dynamic\":\"false\", \"name\":\"test2\", \"nwSrc\":\"1.1.1.1\", \"node\":{\"id\":\"51966\",\"type\":\"STUB\"}, \"actions\":[\"DROP\"]}"; result = getJsonResult(baseURL + "node/STUB/51966/static-flow/test2", "PUT", fc); Assert.assertTrue(httpResponseCode == 201); @@ -854,13 +854,13 @@ public class NorthboundIT { JSONArray json_array = json.getJSONArray(array_name); for (int i = 0; i < json_array.length(); i++) { result = json_array.getJSONObject(i); - Integer nid = result.getJSONObject("node").getInt("@id"); + Integer nid = result.getJSONObject("node").getInt("id"); if (nid.equals(nodeId)) break; } } else { result = json.getJSONObject(array_name); - Integer nid = result.getJSONObject("node").getInt("@id"); + Integer nid = result.getJSONObject("node").getInt("id"); if (!nid.equals(nodeId)) result = null; } @@ -1137,24 +1137,24 @@ public class NorthboundIT { JSONObject stt = Props.getJSONObject("state"); JSONObject ltc = Props.getJSONObject("latency"); - if (headNC.getInt("@id") == headNC1_nodeConnId) { - Assert.assertEquals(headNode.getString("@type"), nodeType); - Assert.assertEquals(headNode.getLong("@id"), headNC1_nodeId); - Assert.assertEquals(headNC.getString("@type"), nodeConnType); - Assert.assertEquals(tailNode.getString("@type"),nodeType); - Assert.assertEquals(tailNode.getString("@type"), nodeConnType); - Assert.assertEquals(tailNC.getLong("@id"), tailNC1_nodeConnId); + if (headNC.getInt("id") == headNC1_nodeConnId) { + Assert.assertEquals(headNode.getString("type"), nodeType); + Assert.assertEquals(headNode.getLong("id"), headNC1_nodeId); + Assert.assertEquals(headNC.getString("type"), nodeConnType); + Assert.assertEquals(tailNode.getString("type"),nodeType); + Assert.assertEquals(tailNode.getString("type"), nodeConnType); + Assert.assertEquals(tailNC.getLong("id"), tailNC1_nodeConnId); Assert.assertEquals(bandw.getLong("value"), bw_1); Assert.assertTrue((short) stt.getInt("value") == state_1); Assert.assertEquals(ltc.getLong("value"), lat_1); - } else if (headNC.getInt("@id") == headNC2_nodeConnId) { - Assert.assertEquals(headNode.getString("@type"),nodeType); - Assert.assertEquals(headNode.getLong("@id"), headNC2_nodeId); - Assert.assertEquals(headNC.getString("@type"), nodeConnType); - Assert.assertEquals(tailNode.getString("@type"), nodeType); - Assert.assertTrue(tailNode.getInt("@id") == tailNC2_nodeId); - Assert.assertEquals(tailNC.getString("@type"), nodeConnType); - Assert.assertEquals(tailNC.getLong("@id"), tailNC2_nodeConnId); + } else if (headNC.getInt("id") == headNC2_nodeConnId) { + Assert.assertEquals(headNode.getString("type"),nodeType); + Assert.assertEquals(headNode.getLong("id"), headNC2_nodeId); + Assert.assertEquals(headNC.getString("type"), nodeConnType); + Assert.assertEquals(tailNode.getString("type"), nodeType); + Assert.assertTrue(tailNode.getInt("id") == tailNC2_nodeId); + Assert.assertEquals(tailNC.getString("type"), nodeConnType); + Assert.assertEquals(tailNC.getLong("id"), tailNC2_nodeConnId); Assert.assertEquals(bandw.getLong("value"), bw_2); Assert.assertTrue((short) stt.getInt("value") == state_2); Assert.assertEquals(ltc.getLong("value"), lat_2); @@ -1180,7 +1180,7 @@ public class NorthboundIT { .append("dstNodeConnector", nodeConnectorType_2 + "|" + nodeConnectorId_2 + "@" + nodeType_2 + "|" + nodeId_2); // execute HTTP request and verify response code - result = getJsonResult(baseURL + "/user-link", "POST", jo.toString()); + result = getJsonResult(baseURL + "/user-link", "PUT", jo.toString()); Assert.assertTrue(httpResponseCode == 201); // === test GET method for getUserLinks()