diff --git a/src/main/java/net/floodlightcontroller/loadbalancer/PoolsResource.java b/src/main/java/net/floodlightcontroller/loadbalancer/PoolsResource.java index 8feb2eb03d1668eb23d0589ac3f1f8f21e58597d..a0ec7b117c52c47e5b678f29a91d453ef77a72ab 100644 --- a/src/main/java/net/floodlightcontroller/loadbalancer/PoolsResource.java +++ b/src/main/java/net/floodlightcontroller/loadbalancer/PoolsResource.java @@ -19,12 +19,12 @@ package net.floodlightcontroller.loadbalancer; import java.io.IOException; import java.util.Collection; -import net.floodlightcontroller.packet.IPv4; - import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.MappingJsonFactory; + +import org.projectfloodlight.openflow.types.IpProtocol; import org.restlet.resource.Delete; import org.restlet.resource.Get; import org.restlet.resource.Post; @@ -134,11 +134,11 @@ public class PoolsResource extends ServerResource { if (n.equals("protocol")) { String tmp = jp.getText(); if (tmp.equalsIgnoreCase("TCP")) { - pool.protocol = IPv4.PROTOCOL_TCP; + pool.protocol = (byte) IpProtocol.TCP.getIpProtocolNumber(); } else if (tmp.equalsIgnoreCase("UDP")) { - pool.protocol = IPv4.PROTOCOL_UDP; + pool.protocol = (byte) IpProtocol.UDP.getIpProtocolNumber(); } else if (tmp.equalsIgnoreCase("ICMP")) { - pool.protocol = IPv4.PROTOCOL_ICMP; + pool.protocol = (byte) IpProtocol.ICMP.getIpProtocolNumber(); } continue; } diff --git a/src/main/java/net/floodlightcontroller/loadbalancer/VipsResource.java b/src/main/java/net/floodlightcontroller/loadbalancer/VipsResource.java index fd93e41ee17af92c2a3c8dc77abf1efc463924be..7a5a563dc0f764c0666288509ded67e6a2f6b9f7 100644 --- a/src/main/java/net/floodlightcontroller/loadbalancer/VipsResource.java +++ b/src/main/java/net/floodlightcontroller/loadbalancer/VipsResource.java @@ -25,6 +25,8 @@ import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonToken; import com.fasterxml.jackson.databind.MappingJsonFactory; + +import org.projectfloodlight.openflow.types.IpProtocol; import org.restlet.resource.Delete; import org.restlet.resource.Get; import org.restlet.resource.Post; @@ -131,11 +133,11 @@ public class VipsResource extends ServerResource { if (n.equals("protocol")) { String tmp = jp.getText(); if (tmp.equalsIgnoreCase("TCP")) { - vip.protocol = IPv4.PROTOCOL_TCP; + vip.protocol = (byte) IpProtocol.TCP.getIpProtocolNumber(); } else if (tmp.equalsIgnoreCase("UDP")) { - vip.protocol = IPv4.PROTOCOL_UDP; + vip.protocol = (byte) IpProtocol.UDP.getIpProtocolNumber(); } else if (tmp.equalsIgnoreCase("ICMP")) { - vip.protocol = IPv4.PROTOCOL_ICMP; + vip.protocol = (byte) IpProtocol.ICMP.getIpProtocolNumber(); } continue; }