Lowered some warning levels
Change-Id: I2a857b1690d462e865821cbe388eb8e5c50ef11a
Showing
2 changed files
with
8 additions
and
4 deletions
| ... | @@ -123,8 +123,6 @@ public class CordVtnArpProxy { | ... | @@ -123,8 +123,6 @@ public class CordVtnArpProxy { |
| 123 | * @param gatewayMac gateway mac address | 123 | * @param gatewayMac gateway mac address |
| 124 | */ | 124 | */ |
| 125 | public void processArpPacket(PacketContext context, Ethernet ethPacket, MacAddress gatewayMac) { | 125 | public void processArpPacket(PacketContext context, Ethernet ethPacket, MacAddress gatewayMac) { |
| 126 | - checkArgument(!gatewayMac.equals(MacAddress.NONE)); | ||
| 127 | - | ||
| 128 | ARP arpPacket = (ARP) ethPacket.getPayload(); | 126 | ARP arpPacket = (ARP) ethPacket.getPayload(); |
| 129 | Ip4Address targetIp = Ip4Address.valueOf(arpPacket.getTargetProtocolAddress()); | 127 | Ip4Address targetIp = Ip4Address.valueOf(arpPacket.getTargetProtocolAddress()); |
| 130 | 128 | ||
| ... | @@ -132,6 +130,12 @@ public class CordVtnArpProxy { | ... | @@ -132,6 +130,12 @@ public class CordVtnArpProxy { |
| 132 | return; | 130 | return; |
| 133 | } | 131 | } |
| 134 | 132 | ||
| 133 | + if (gatewayMac.equals(MacAddress.NONE)) { | ||
| 134 | + log.debug("Gateway mac address is not set, ignoring ARP request"); | ||
| 135 | + context.block(); | ||
| 136 | + return; | ||
| 137 | + } | ||
| 138 | + | ||
| 135 | Ethernet ethReply = ARP.buildArpReply( | 139 | Ethernet ethReply = ARP.buildArpReply( |
| 136 | targetIp, | 140 | targetIp, |
| 137 | gatewayMac, | 141 | gatewayMac, | ... | ... |
| ... | @@ -57,7 +57,7 @@ public class OpenstackNetworkCodec extends JsonCodec<OpenstackNetwork> { | ... | @@ -57,7 +57,7 @@ public class OpenstackNetworkCodec extends JsonCodec<OpenstackNetwork> { |
| 57 | .id(id); | 57 | .id(id); |
| 58 | 58 | ||
| 59 | if (networkInfo.path(NETWORK_TYPE).isMissingNode()) { | 59 | if (networkInfo.path(NETWORK_TYPE).isMissingNode()) { |
| 60 | - log.warn("Network {} has no network type, ignore it.", name); | 60 | + log.debug("Network {} has no network type, ignore it.", name); |
| 61 | return null; | 61 | return null; |
| 62 | } | 62 | } |
| 63 | 63 | ||
| ... | @@ -65,7 +65,7 @@ public class OpenstackNetworkCodec extends JsonCodec<OpenstackNetwork> { | ... | @@ -65,7 +65,7 @@ public class OpenstackNetworkCodec extends JsonCodec<OpenstackNetwork> { |
| 65 | try { | 65 | try { |
| 66 | onb.networkType(OpenstackNetwork.NetworkType.valueOf(networkType.toUpperCase())); | 66 | onb.networkType(OpenstackNetwork.NetworkType.valueOf(networkType.toUpperCase())); |
| 67 | } catch (IllegalArgumentException e) { | 67 | } catch (IllegalArgumentException e) { |
| 68 | - log.warn("Network {} has unsupported network type {}, ignore it.", | 68 | + log.debug("Network {} has unsupported network type {}, ignore it.", |
| 69 | name, networkType); | 69 | name, networkType); |
| 70 | return null; | 70 | return null; |
| 71 | } | 71 | } | ... | ... |
-
Please register or login to post a comment