[ONOS-3116] port-pair-id testcase
Change-Id: Iad03f6447502d1a363fe56770445554b59b972f2
diff --git a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/PortPairWebResource.java b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/PortPairWebResource.java
index 9194c14..8bf459c 100644
--- a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/PortPairWebResource.java
+++ b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/resources/PortPairWebResource.java
@@ -82,11 +82,11 @@
@Produces(MediaType.APPLICATION_JSON)
public Response getPortPair(@PathParam("portPairId") String id) {
- if (!service.exists(PortPairId.portPairId(id))) {
+ if (!service.exists(PortPairId.of(id))) {
return Response.status(NOT_FOUND)
.entity(PORT_PAIR_NOT_FOUND).build();
}
- PortPair portPair = nullIsNotFound(service.getPortPair(PortPairId.portPairId(id)),
+ PortPair portPair = nullIsNotFound(service.getPortPair(PortPairId.of(id)),
PORT_PAIR_NOT_FOUND);
ObjectNode result = new ObjectMapper().createObjectNode();
@@ -151,7 +151,7 @@
@DELETE
public void deletePortPair(@PathParam("pair_id") String id) {
- PortPairId portPairId = PortPairId.portPairId(id);
+ PortPairId portPairId = PortPairId.of(id);
Boolean isSuccess = nullIsNotFound(service.removePortPair(portPairId),
PORT_PAIR_NOT_FOUND);
if (!isSuccess) {
diff --git a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/web/PortPairCodec.java b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/web/PortPairCodec.java
index 7017148..691536f 100644
--- a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/web/PortPairCodec.java
+++ b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/web/PortPairCodec.java
@@ -54,7 +54,7 @@
String id = nullIsIllegal(json.get(ID),
ID + MISSING_MEMBER_MESSAGE).asText();
- resultBuilder.setId(PortPairId.portPairId(id));
+ resultBuilder.setId(PortPairId.of(id));
String tenantId = nullIsIllegal(json.get(TENANT_ID),
TENANT_ID + MISSING_MEMBER_MESSAGE).asText();
diff --git a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/web/PortPairGroupCodec.java b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/web/PortPairGroupCodec.java
index ef0f3ed..af827a8 100644
--- a/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/web/PortPairGroupCodec.java
+++ b/apps/vtn/vtnweb/src/main/java/org/onosproject/vtnweb/web/PortPairGroupCodec.java
@@ -75,7 +75,7 @@
List<PortPairId> list = Lists.newArrayList();
ArrayNode arrayNode = (ArrayNode) json.path(PORT_PAIRS);
- arrayNode.forEach(i -> list.add(PortPairId.portPairId(i.asText())));
+ arrayNode.forEach(i -> list.add(PortPairId.of(i.asText())));
resultBuilder.setPortPairs(list);
return resultBuilder.build();