commit f2ca7e5cea51d542e3273d9711abae23ebc6dfaf
author sangho <sangho@onlab.us> Wed Dec 23 16:02:43 2015 +0900
committer Ray Milkey <ray@onlab.us> Mon Jan 04 17:02:54 2016 +0000
tree 9b0181665b2e1a124f29ee433647a5fbce2efb69
parent 64dd8899398be768fb817297c584da556ffdf67d

[Falcon] SONA : Supports port-create without fixed IPs

Change-Id: I3a37540480912849f03e8880cc8c9b387c6bc613

apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/OpenstackSwitchingManager.java

diff --git a/apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/OpenstackSwitchingManager.java b/apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/OpenstackSwitchingManager.java
index 5635f7b..d5a8c81 100644
--- a/apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/OpenstackSwitchingManager.java
+++ b/apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/OpenstackSwitchingManager.java
@@ -161,7 +161,9 @@
 
     @Override
     public void createPorts(OpenstackPort openstackPort) {
-        registerDhcpInfo(openstackPort);
+        if (!openstackPort.fixedIps().isEmpty()) {
+            registerDhcpInfo(openstackPort);
+        }
     }
 
     @Override

apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/web/OpenstackPortCodec.java

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 c369a9c..1264eb5 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
@@ -73,7 +73,7 @@
         for (JsonNode fixedIpInfo: fixedIpList) {
             String subnetId = fixedIpInfo.path(SUBNET_ID).asText();
             String ipAddressStr = fixedIpInfo.path(IP_ADDRESS).asText();
-            if (ipAddressStr != null) {
+            if (!fixedIpInfo.path(IP_ADDRESS).isMissingNode() && ipAddressStr != null) {
                 Ip4Address ipAddress = Ip4Address.valueOf(ipAddressStr);
                 fixedIpMap.put(subnetId, ipAddress);
             }