Phaneendra Manda
Committed by Ray Milkey

[ONOS-3161]UT for port pair web resource

Change-Id: I81a98b9407305f572eec999f9555dd4a6bc4e808
......@@ -42,7 +42,9 @@ import org.onosproject.vtnweb.web.PortPairCodec;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
/**
......@@ -67,8 +69,13 @@ public class PortPairWebResource extends AbstractWebResource {
public Response getPortPairs() {
Iterable<PortPair> portPairs = service.getPortPairs();
ObjectNode result = new ObjectMapper().createObjectNode();
result.set("port_pairs", new PortPairCodec().encode(portPairs, this));
return ok(result).build();
ArrayNode portPairEntry = result.putArray("port_pairs");
if (portPairs != null) {
for (final PortPair portPair : portPairs) {
portPairEntry.add(new PortPairCodec().encode(portPair, this));
}
}
return ok(result.toString()).build();
}
/**
......@@ -80,18 +87,15 @@ public class PortPairWebResource extends AbstractWebResource {
@GET
@Path("{pair_id}")
@Produces(MediaType.APPLICATION_JSON)
public Response getPortPair(@PathParam("portPairId") String id) {
public Response getPortPair(@PathParam("pair_id") String id) {
if (!service.exists(PortPairId.of(id))) {
return Response.status(NOT_FOUND)
.entity(PORT_PAIR_NOT_FOUND).build();
return Response.status(NOT_FOUND).entity(PORT_PAIR_NOT_FOUND).build();
}
PortPair portPair = nullIsNotFound(service.getPortPair(PortPairId.of(id)),
PORT_PAIR_NOT_FOUND);
PortPair portPair = nullIsNotFound(service.getPortPair(PortPairId.of(id)), PORT_PAIR_NOT_FOUND);
ObjectNode result = new ObjectMapper().createObjectNode();
result.set("port_pair", new PortPairCodec().encode(portPair, this));
return ok(result).build();
return ok(result.toString()).build();
}
/**
......@@ -106,11 +110,11 @@ public class PortPairWebResource extends AbstractWebResource {
@Produces(MediaType.APPLICATION_JSON)
public Response createPortPair(InputStream stream) {
try {
ObjectNode jsonTree = (ObjectNode) mapper().readTree(stream);
PortPair portPair = codec(PortPair.class).decode(jsonTree, this);
Boolean isSuccess = nullIsNotFound(service.createPortPair(portPair),
PORT_PAIR_NOT_FOUND);
ObjectMapper mapper = new ObjectMapper();
ObjectNode jsonTree = (ObjectNode) mapper.readTree(stream);
JsonNode port = jsonTree.get("port_pair");
PortPair portPair = new PortPairCodec().decode((ObjectNode) port, this);
Boolean isSuccess = nullIsNotFound(service.createPortPair(portPair), PORT_PAIR_NOT_FOUND);
return Response.status(OK).entity(isSuccess.toString()).build();
} catch (IOException e) {
log.error("Exception while creating port pair {}.", e.toString());
......@@ -132,8 +136,10 @@ public class PortPairWebResource extends AbstractWebResource {
public Response updatePortPair(@PathParam("pair_id") String id,
final InputStream stream) {
try {
ObjectNode jsonTree = (ObjectNode) mapper().readTree(stream);
PortPair portPair = codec(PortPair.class).decode(jsonTree, this);
ObjectMapper mapper = new ObjectMapper();
ObjectNode jsonTree = (ObjectNode) mapper.readTree(stream);
JsonNode port = jsonTree.get("port_pair");
PortPair portPair = new PortPairCodec().decode((ObjectNode) port, this);
Boolean isSuccess = nullIsNotFound(service.updatePortPair(portPair), PORT_PAIR_NOT_FOUND);
return Response.status(OK).entity(isSuccess.toString()).build();
} catch (IOException e) {
......@@ -152,8 +158,7 @@ public class PortPairWebResource extends AbstractWebResource {
public void deletePortPair(@PathParam("pair_id") String id) {
PortPairId portPairId = PortPairId.of(id);
Boolean isSuccess = nullIsNotFound(service.removePortPair(portPairId),
PORT_PAIR_NOT_FOUND);
Boolean isSuccess = nullIsNotFound(service.removePortPair(portPairId), PORT_PAIR_NOT_FOUND);
if (!isSuccess) {
log.debug("Port pair identifier {} does not exist", id);
}
......
/*
* Copyright 2014-2015 Open Networking Laboratory
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.onosproject.vtnweb.resources;
import static org.easymock.EasyMock.anyObject;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.replay;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.is;
import static org.hamcrest.Matchers.notNullValue;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.fail;
import java.io.InputStream;
import java.net.HttpURLConnection;
import java.util.HashSet;
import java.util.Objects;
import java.util.Set;
import javax.ws.rs.core.MediaType;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.osgi.TestServiceDirectory;
import org.onlab.rest.BaseResource;
import org.onosproject.vtnrsc.PortPair;
import org.onosproject.vtnrsc.PortPairId;
import org.onosproject.vtnrsc.TenantId;
import org.onosproject.vtnrsc.portpair.PortPairService;
import com.eclipsesource.json.JsonObject;
import com.sun.jersey.api.client.ClientResponse;
import com.sun.jersey.api.client.UniformInterfaceException;
import com.sun.jersey.api.client.WebResource;
/**
* Unit tests for port pair REST APIs.
*/
public class PortPairResourceTest extends VtnResourceTest {
final PortPairService portPairService = createMock(PortPairService.class);
PortPairId portPairId1 = PortPairId.of("78dcd363-fc23-aeb6-f44b-56dc5e2fb3ae");
TenantId tenantId1 = TenantId.tenantId("d382007aa9904763a801f68ecf065cf5");
final MockPortPair portPair1 = new MockPortPair(portPairId1, tenantId1, "portPair1",
"Mock port pair", "dace4513-24fc-4fae-af4b-321c5e2eb3d1",
"aef3478a-4a56-2a6e-cd3a-9dee4e2ec345");
/**
* Mock class for a port pair.
*/
private static class MockPortPair implements PortPair {
private final PortPairId portPairId;
private final TenantId tenantId;
private final String name;
private final String description;
private final String ingress;
private final String egress;
public MockPortPair(PortPairId portPairId, TenantId tenantId,
String name, String description,
String ingress, String egress) {
this.portPairId = portPairId;
this.tenantId = tenantId;
this.name = name;
this.description = description;
this.ingress = ingress;
this.egress = egress;
}
@Override
public PortPairId portPairId() {
return portPairId;
}
@Override
public TenantId tenantId() {
return tenantId;
}
@Override
public String name() {
return name;
}
@Override
public String description() {
return description;
}
@Override
public String ingress() {
return ingress;
}
@Override
public String egress() {
return egress;
}
@Override
public boolean exactMatch(PortPair portPair) {
return this.equals(portPair) &&
Objects.equals(this.portPairId, portPair.portPairId()) &&
Objects.equals(this.tenantId, portPair.tenantId());
}
}
/**
* Sets up the global values for all the tests.
*/
@Before
public void setUpTest() {
ServiceDirectory testDirectory = new TestServiceDirectory().add(PortPairService.class, portPairService);
BaseResource.setServiceDirectory(testDirectory);
}
/**
* Cleans up.
*/
@After
public void tearDownTest() {
}
/**
* Tests the result of the rest api GET when there are no port pairs.
*/
@Test
public void testPortPairsEmpty() {
expect(portPairService.getPortPairs()).andReturn(null).anyTimes();
replay(portPairService);
final WebResource rs = resource();
final String response = rs.path("port_pairs").get(String.class);
assertThat(response, is("{\"port_pairs\":[]}"));
}
/**
* Tests the result of a rest api GET for port pair id.
*/
@Test
public void testGetPortPairId() {
final Set<PortPair> portPairs = new HashSet<>();
portPairs.add(portPair1);
expect(portPairService.exists(anyObject())).andReturn(true).anyTimes();
expect(portPairService.getPortPair(anyObject())).andReturn(portPair1).anyTimes();
replay(portPairService);
final WebResource rs = resource();
final String response = rs.path("port_pairs/78dcd363-fc23-aeb6-f44b-56dc5e2fb3ae").get(String.class);
final JsonObject result = JsonObject.readFrom(response);
assertThat(result, notNullValue());
}
/**
* Tests that a fetch of a non-existent port pair object throws an exception.
*/
@Test
public void testBadGet() {
expect(portPairService.getPortPair(anyObject()))
.andReturn(null).anyTimes();
replay(portPairService);
WebResource rs = resource();
try {
rs.path("port_pairs/78dcd363-fc23-aeb6-f44b-56dc5aafb3ae").get(String.class);
fail("Fetch of non-existent port pair did not throw an exception");
} catch (UniformInterfaceException ex) {
assertThat(ex.getMessage(),
containsString("returned a response status of"));
}
}
/**
* Tests creating a port pair with POST.
*/
@Test
public void testPost() {
expect(portPairService.createPortPair(anyObject()))
.andReturn(true).anyTimes();
replay(portPairService);
WebResource rs = resource();
InputStream jsonStream = PortPairResourceTest.class.getResourceAsStream("post-PortPair.json");
ClientResponse response = rs.path("port_pairs")
.type(MediaType.APPLICATION_JSON_TYPE)
.post(ClientResponse.class, jsonStream);
assertThat(response.getStatus(), is(HttpURLConnection.HTTP_OK));
}
/**
* Tests deleting a port pair.
*/
@Test
public void testDelete() {
expect(portPairService.removePortPair(anyObject()))
.andReturn(true).anyTimes();
replay(portPairService);
WebResource rs = resource();
String location = "port_pairs/78dcd363-fc23-aeb6-f44b-56dc5e2fb3ae";
ClientResponse deleteResponse = rs.path(location)
.type(MediaType.APPLICATION_JSON_TYPE)
.delete(ClientResponse.class);
assertThat(deleteResponse.getStatus(),
is(HttpURLConnection.HTTP_NO_CONTENT));
}
}
{"port_pair": {
"id": "78dcd363-fc23-aeb6-f44b-56dc5e2fb3ae",
"name": "PP1",
"tenant_id": "d382007aa9904763a801f68ecf065cf5",
"description": "SF-A",
"ingress": "dace4513-24fc-4fae-af4b-321c5e2eb3d1",
"egress": "aef3478a-4a56-2a6e-cd3a-9dee4e2ec345"
}
}