홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
sangho
Committed by Ray Milkey
f2ca7e5c 1 parent 64dd8899

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

Change-Id: I3a37540480912849f03e8880cc8c9b387c6bc613
Inline Side-by-side
Showing 2 changed files with 3 additions and 1 deletions
...@@ -161,8 +161,10 @@ public class OpenstackSwitchingManager implements OpenstackSwitchingService { ...@@ -161,8 +161,10 @@ public class OpenstackSwitchingManager implements OpenstackSwitchingService {
161 161
162 @Override 162 @Override
163 public void createPorts(OpenstackPort openstackPort) { 163 public void createPorts(OpenstackPort openstackPort) {
164 + if (!openstackPort.fixedIps().isEmpty()) {
164 registerDhcpInfo(openstackPort); 165 registerDhcpInfo(openstackPort);
165 } 166 }
167 + }
166 168
167 @Override 169 @Override
168 public void deletePort(String uuid) { 170 public void deletePort(String uuid) {
......
...@@ -73,7 +73,7 @@ public class OpenstackPortCodec extends JsonCodec<OpenstackPort> { ...@@ -73,7 +73,7 @@ public class OpenstackPortCodec extends JsonCodec<OpenstackPort> {
73 for (JsonNode fixedIpInfo: fixedIpList) { 73 for (JsonNode fixedIpInfo: fixedIpList) {
74 String subnetId = fixedIpInfo.path(SUBNET_ID).asText(); 74 String subnetId = fixedIpInfo.path(SUBNET_ID).asText();
75 String ipAddressStr = fixedIpInfo.path(IP_ADDRESS).asText(); 75 String ipAddressStr = fixedIpInfo.path(IP_ADDRESS).asText();
76 - if (ipAddressStr != null) { 76 + if (!fixedIpInfo.path(IP_ADDRESS).isMissingNode() && ipAddressStr != null) {
77 Ip4Address ipAddress = Ip4Address.valueOf(ipAddressStr); 77 Ip4Address ipAddress = Ip4Address.valueOf(ipAddressStr);
78 fixedIpMap.put(subnetId, ipAddress); 78 fixedIpMap.put(subnetId, ipAddress);
79 } 79 }
......