if (timestamp == null || timestampName == null) {
Assert.assertFalse(properties.has("timeStamp"));
} else {
- Assert.assertEquals(timestamp, (Integer) properties.getJSONObject("timeStamp").getInt("timestamp"));
- Assert.assertEquals(timestampName, properties.getJSONObject("timeStamp").getString("timestampName"));
+ Assert.assertEquals(timestamp, (Integer) properties.getJSONObject("timeStamp").getInt("value"));
+ Assert.assertEquals(timestampName, properties.getJSONObject("timeStamp").getString("name"));
}
if (actionsValue == null) {
Assert.assertFalse(properties.has("actions"));
} else {
- Assert.assertEquals(actionsValue, (Integer) properties.getJSONObject("actions").getInt("actionsValue"));
+ Assert.assertEquals(actionsValue, (Integer) properties.getJSONObject("actions").getInt("value"));
}
if (capabilitiesValue == null) {
Assert.assertFalse(properties.has("capabilities"));
} else {
Assert.assertEquals(capabilitiesValue,
- (Integer) properties.getJSONObject("capabilities").getInt("capabilitiesValue"));
+ (Integer) properties.getJSONObject("capabilities").getInt("value"));
}
if (tablesValue == null) {
Assert.assertFalse(properties.has("tables"));
} else {
- Assert.assertEquals(tablesValue, (Integer) properties.getJSONObject("tables").getInt("tablesValue"));
+ Assert.assertEquals(tablesValue, (Integer) properties.getJSONObject("tables").getInt("value"));
}
if (buffersValue == null) {
Assert.assertFalse(properties.has("buffers"));
} else {
- Assert.assertEquals(buffersValue, (Integer) properties.getJSONObject("buffers").getInt("buffersValue"));
+ Assert.assertEquals(buffersValue, (Integer) properties.getJSONObject("buffers").getInt("value"));
}
}
if (state == null) {
Assert.assertFalse(properties.has("state"));
} else {
- Assert.assertEquals(state, (Integer) properties.getJSONObject("state").getInt("stateValue"));
+ Assert.assertEquals(state, (Integer) properties.getJSONObject("state").getInt("value"));
}
if (capabilities == null) {
Assert.assertFalse(properties.has("capabilities"));
} else {
Assert.assertEquals(capabilities,
- (Integer) properties.getJSONObject("capabilities").getInt("capabilitiesValue"));
+ (Integer) properties.getJSONObject("capabilities").getInt("value"));
}
if (bandwidth == null) {
Assert.assertFalse(properties.has("bandwidth"));
} else {
- Assert.assertEquals(bandwidth, (Integer) properties.getJSONObject("bandwidth").getInt("bandwidthValue"));
+ Assert.assertEquals(bandwidth, (Integer) properties.getJSONObject("bandwidth").getInt("value"));
}
}
// Test insert static route
String requestBody = "{\"name\":\"" + name1 + "\", \"prefix\":\"" + prefix1 + "\", \"nextHop\":\"" + nextHop1
+ "\"}";
- result = getJsonResult(baseURL + "default/" + name1, "POST", requestBody);
+ result = getJsonResult(baseURL + "default/route/" + name1, "POST", requestBody);
Assert.assertEquals(201, httpResponseCode.intValue());
requestBody = "{\"name\":\"" + name2 + "\", \"prefix\":\"" + prefix2 + "\", \"nextHop\":\"" + nextHop2 + "\"}";
- result = getJsonResult(baseURL + "default/" + name2, "POST", requestBody);
+ result = getJsonResult(baseURL + "default/route/" + name2, "POST", requestBody);
Assert.assertEquals(201, httpResponseCode.intValue());
// Test Get all static routes
}
// Test get specific static route
- result = getJsonResult(baseURL + "default/" + name1);
+ result = getJsonResult(baseURL + "default/route/" + name1);
jt = new JSONTokener(result);
json = new JSONObject(jt);
Assert.assertEquals(prefix1, json.getString("prefix"));
Assert.assertEquals(nextHop1, json.getString("nextHop"));
- result = getJsonResult(baseURL + "default/" + name2);
+ result = getJsonResult(baseURL + "default/route/" + name2);
jt = new JSONTokener(result);
json = new JSONObject(jt);
Assert.assertEquals(nextHop2, json.getString("nextHop"));
// Test delete static route
- result = getJsonResult(baseURL + "default/" + name1, "DELETE");
+ result = getJsonResult(baseURL + "default/route/" + name1, "DELETE");
Assert.assertEquals(200, httpResponseCode.intValue());
result = getJsonResult(baseURL + "default");
json = new JSONObject(jt);
node = getJsonInstance(json, "nodeProperties", nodeId_1);
Assert.assertNotNull(node);
- Assert.assertEquals(1001, node.getJSONObject("properties").getJSONObject("tier").getInt("tierValue"));
- Assert.assertEquals("node1", node.getJSONObject("properties").getJSONObject("description").getString("descriptionValue"));
+ Assert.assertEquals(1001, node.getJSONObject("properties").getJSONObject("tier").getInt("value"));
+ Assert.assertEquals("node1", node.getJSONObject("properties").getJSONObject("description").getString("value"));
// Test delete nodeConnector property
// Delete state property of nodeconnector1
String baseURL = "http://127.0.0.1:8080/controller/nb/v2/statistics/default/";
- String result = getJsonResult(baseURL + "flowstats");
+ String result = getJsonResult(baseURL + "flow");
JSONTokener jt = new JSONTokener(result);
JSONObject json = new JSONObject(jt);
JSONObject flowStatistics = getJsonInstance(json, "flowStatistics", 0xCAFE);
Assert.assertEquals(node.getString("@type"), "STUB");
// test that flow statistics results are correct
- JSONArray flowStats = flowStatistics.getJSONArray("flowStat");
+ JSONArray flowStats = flowStatistics.getJSONArray("flowStatistic");
for (int i = 0; i < flowStats.length(); i++) {
JSONObject flowStat = flowStats.getJSONObject(i);
}
- // for /controller/nb/v2/statistics/default/portstats
- result = getJsonResult(baseURL + "portstats");
+ // for /controller/nb/v2/statistics/default/port
+ result = getJsonResult(baseURL + "port");
jt = new JSONTokener(result);
json = new JSONObject(jt);
JSONObject portStatistics = getJsonInstance(json, "portStatistics", 0xCAFE);
Assert.assertEquals(node2.getString("@type"), "STUB");
// test that port statistic results are correct
- JSONObject portStat = portStatistics.getJSONObject("portStat");
+ JSONObject portStat = portStatistics.getJSONObject("portStatistic");
Assert.assertTrue(portStat.getInt("receivePackets") == 250);
Assert.assertTrue(portStat.getInt("transmitPackets") == 500);
Assert.assertTrue(portStat.getInt("receiveBytes") == 1000);
Assert.assertTrue(portStat.getInt("collisionCount") == 4);
// test for getting one specific node's stats
- result = getJsonResult(baseURL + "flowstats/STUB/51966");
+ result = getJsonResult(baseURL + "flow/node/STUB/51966");
jt = new JSONTokener(result);
json = new JSONObject(jt);
node = json.getJSONObject("node");
Assert.assertEquals(node.getString("@type"), "STUB");
// test that flow statistics results are correct
- flowStats = json.getJSONArray("flowStat");
+ flowStats = json.getJSONArray("flowStatistic");
for (int i = 0; i < flowStats.length(); i++) {
JSONObject flowStat = flowStats.getJSONObject(i);
testFlowStat(flowStat, actionTypes[i], i);
}
- result = getJsonResult(baseURL + "portstats/STUB/51966");
+ result = getJsonResult(baseURL + "port/node/STUB/51966");
jt = new JSONTokener(result);
json = new JSONObject(jt);
node2 = json.getJSONObject("node");
Assert.assertEquals(node2.getString("@type"), "STUB");
// test that port statistic results are correct
- portStat = json.getJSONObject("portStat");
+ portStat = json.getJSONObject("portStatistic");
Assert.assertTrue(portStat.getInt("receivePackets") == 250);
Assert.assertTrue(portStat.getInt("transmitPackets") == 500);
Assert.assertTrue(portStat.getInt("receiveBytes") == 1000);
String baseURL = "http://127.0.0.1:8080/controller/nb/v2/flow/default/";
// Attempt to get a flow that doesn't exit. Should return 404
// status.
- String result = getJsonResult(baseURL + "STUB/51966/test1", "GET");
+ String result = getJsonResult(baseURL + "node/STUB/51966/static-flow/test1", "GET");
Assert.assertTrue(result.equals("404"));
// test add flow1
String fc = "{\"dynamic\":\"false\", \"name\":\"test1\", \"node\":{\"@id\":\"51966\",\"@type\":\"STUB\"}, \"actions\":[\"DROP\"]}";
- result = getJsonResult(baseURL + "STUB/51966/test1", "POST", fc);
+ result = getJsonResult(baseURL + "node/STUB/51966/static-flow/test1", "PUT", fc);
Assert.assertTrue(httpResponseCode == 201);
// test get returns flow that was added.
- result = getJsonResult(baseURL + "STUB/51966/test1", "GET");
+ result = getJsonResult(baseURL + "node/STUB/51966/static-flow/test1", "GET");
// check that result came out fine.
Assert.assertTrue(httpResponseCode == 200);
JSONTokener jt = new JSONTokener(result);
Assert.assertEquals(node.getString("@id"), "51966");
// test adding same flow again fails due to repeat name..return 409
// code
- result = getJsonResult(baseURL + "STUB/51966/test1", "POST", fc);
+ 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\"]}";
- result = getJsonResult(baseURL + "STUB/51966/test2", "POST", fc);
- // test should return 500 for error due to same flow being added.
- Assert.assertTrue(result.equals("500"));
+ 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\"]}";
- result = getJsonResult(baseURL + "STUB/51966/test2", "POST", fc);
+ result = getJsonResult(baseURL + "node/STUB/51966/static-flow/test2", "PUT", fc);
Assert.assertTrue(httpResponseCode == 201);
// check that request returns both flows given node.
- result = getJsonResult(baseURL + "STUB/51966/", "GET");
+ result = getJsonResult(baseURL + "node/STUB/51966/", "GET");
jt = new JSONTokener(result);
json = new JSONObject(jt);
Assert.assertTrue(json.get("flowConfig") instanceof JSONArray);
Assert.assertTrue(count == 2);
// delete a flow, check that it's no longer in list.
- result = getJsonResult(baseURL + "STUB/51966/test2", "DELETE");
+ result = getJsonResult(baseURL + "node/STUB/51966/static-flow/test2", "DELETE");
Assert.assertTrue(httpResponseCode == 200);
- result = getJsonResult(baseURL + "STUB/51966/test2", "GET");
+ result = getJsonResult(baseURL + "node/STUB/51966/static-flow/test2", "GET");
Assert.assertTrue(result.equals("404"));
}
Assert.assertEquals(tailNode.getString("@type"),nodeType);
Assert.assertEquals(tailNode.getString("@type"), nodeConnType);
Assert.assertEquals(tailNC.getLong("@id"), tailNC1_nodeConnId);
- Assert.assertEquals(bandw.getLong("bandwidthValue"), bw_1);
- Assert.assertTrue((short) stt.getInt("stateValue") == state_1);
- Assert.assertEquals(ltc.getLong("latencyValue"), lat_1);
+ 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.assertTrue(tailNode.getInt("@id") == tailNC2_nodeId);
Assert.assertEquals(tailNC.getString("@type"), nodeConnType);
Assert.assertEquals(tailNC.getLong("@id"), tailNC2_nodeConnId);
- Assert.assertEquals(bandw.getLong("bandwidthValue"), bw_2);
- Assert.assertTrue((short) stt.getInt("stateValue") == state_2);
- Assert.assertEquals(ltc.getLong("latencyValue"), lat_2);
+ Assert.assertEquals(bandw.getLong("value"), bw_2);
+ Assert.assertTrue((short) stt.getInt("value") == state_2);
+ Assert.assertEquals(ltc.getLong("value"), lat_2);
}
}