From c5827d5f23d93c43f5ecb1d015a89c3c82f47231 Mon Sep 17 00:00:00 2001 From: sanghoshin Date: Fri, 11 Dec 2015 12:52:02 +0900 Subject: [PATCH] SONA : OpenstackSwitching - Added N/A status type in OpenstackPort class to support floating IP. Change-Id: Ife0276c87d8c8c6cdaf0b882ea7af0bde99199f2 --- .../org/onosproject/openstackswitching/OpenstackPort.java | 3 ++- .../openstackswitching/web/OpenstackPortCodec.java | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/apps/openstackswitching/api/src/main/java/org/onosproject/openstackswitching/OpenstackPort.java b/apps/openstackswitching/api/src/main/java/org/onosproject/openstackswitching/OpenstackPort.java index 1613b59797..b746b6c167 100644 --- a/apps/openstackswitching/api/src/main/java/org/onosproject/openstackswitching/OpenstackPort.java +++ b/apps/openstackswitching/api/src/main/java/org/onosproject/openstackswitching/OpenstackPort.java @@ -33,7 +33,8 @@ public final class OpenstackPort { public enum PortStatus { UP, DOWN, - ACTIVE + ACTIVE, + NA, } private PortStatus status; diff --git a/apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/web/OpenstackPortCodec.java b/apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/web/OpenstackPortCodec.java index 63e6d2ea78..c369a9cb58 100644 --- a/apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/web/OpenstackPortCodec.java +++ b/apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/web/OpenstackPortCodec.java @@ -83,7 +83,11 @@ public class OpenstackPortCodec extends JsonCodec { String deviceId = portInfo.path(DEVICE_ID).asText(); OpenstackPort.Builder openstackPortBuilder = OpenstackPort.builder(); - openstackPortBuilder.portStatus(OpenstackPort.PortStatus.valueOf(status)) + OpenstackPort.PortStatus portStatus = + status.equals("N/A") ? OpenstackPort.PortStatus.NA : + OpenstackPort.PortStatus.valueOf(status); + + openstackPortBuilder.portStatus(portStatus) .name(name) .adminState(adminStateUp) .netwrokId(networkId)