From e5cf49e331beb94e67e3362fbe97b617b8135276 Mon Sep 17 00:00:00 2001
From: Ryan Izard <rizard@g.clemson.edu>
Date: Wed, 27 Aug 2014 13:22:35 -0400
Subject: [PATCH] Load balancer quick fix due to prior IPv4 packet changes.
Uses LOXI IpProtocol now to reference certain protocol numbers, not IPv4
anymore.
---
.../loadbalancer/PoolsResource.java | 10 +++++-----
.../loadbalancer/VipsResource.java | 8 +++++---
2 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/main/java/net/floodlightcontroller/loadbalancer/PoolsResource.java b/src/main/java/net/floodlightcontroller/loadbalancer/PoolsResource.java
index 8feb2eb03..a0ec7b117 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 fd93e41ee..7a5a563dc 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;
}
--
GitLab