diff --git a/src/main/java/net/floodlightcontroller/loadbalancer/L7PoliciesResource.java b/src/main/java/net/floodlightcontroller/loadbalancer/L7PoliciesResource.java
deleted file mode 100644
index 39b10981103e79d267731b31e1fb3b31cb99f21d..0000000000000000000000000000000000000000
--- a/src/main/java/net/floodlightcontroller/loadbalancer/L7PoliciesResource.java
+++ /dev/null
@@ -1,123 +0,0 @@
-package net.floodlightcontroller.loadbalancer;
-
-import java.io.IOException;
-import java.util.Collection;
-
-import org.restlet.resource.Delete;
-import org.restlet.resource.Get;
-import org.restlet.resource.Post;
-import org.restlet.resource.Put;
-import org.restlet.resource.ServerResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.MappingJsonFactory;
-
-public class L7PoliciesResource extends ServerResource {
- protected static Logger log = LoggerFactory.getLogger(L7PoliciesResource.class);
-
- @Get("json")
- public Collection <L7Policy> retrieve() {
- ILoadBalancerService lbs =
- (ILoadBalancerService)getContext().getAttributes().
- get(ILoadBalancerService.class.getCanonicalName());
-
- String policyId = (String) getRequestAttributes().get("policy");
- if (policyId!=null)
- return lbs.listL7Policy(policyId);
- else
- return lbs.listL7Policies();
- }
-
- @Put
- @Post
- public L7Policy createL7Policy(String postData) {
-
- L7Policy l7_policy=null;
- try {
- l7_policy=jsonToL7Policy(postData);
- } catch (IOException e) {
- log.error("Could not parse JSON {}", e.getMessage());
- }
-
- ILoadBalancerService lbs =
- (ILoadBalancerService)getContext().getAttributes().
- get(ILoadBalancerService.class.getCanonicalName());
-
- String policyId = (String) getRequestAttributes().get("policy");
- if (policyId != null)
- return lbs.updateL7Policy(l7_policy);
- else
- return lbs.createL7Policy(l7_policy);
- }
-
- @Delete
- public int removeL7Policy() {
-
- String policyId = (String) getRequestAttributes().get("policy");
-
- ILoadBalancerService lbs =
- (ILoadBalancerService)getContext().getAttributes().
- get(ILoadBalancerService.class.getCanonicalName());
-
- return lbs.removeL7Policy(policyId);
- }
-
- protected L7Policy jsonToL7Policy(String json) throws IOException {
-
- if (json==null) return null;
-
- MappingJsonFactory f = new MappingJsonFactory();
- JsonParser jp;
- L7Policy l7_policy = new L7Policy();
-
- try {
- jp = f.createParser(json);
- } catch (JsonParseException e) {
- throw new IOException(e);
- }
-
- jp.nextToken();
- if (jp.getCurrentToken() != JsonToken.START_OBJECT) {
- throw new IOException("Expected START_OBJECT");
- }
-
- while (jp.nextToken() != JsonToken.END_OBJECT) {
- if (jp.getCurrentToken() != JsonToken.FIELD_NAME) {
- throw new IOException("Expected FIELD_NAME");
- }
-
- String n = jp.getCurrentName();
- jp.nextToken();
- if (jp.getText().equals(""))
- continue;
-
- if (n.equals("id")) {
- l7_policy.id = jp.getText();
- continue;
- }
- if (n.equals("vip_id")) {
- l7_policy.vipId = jp.getText();
- continue;
- }
- if (n.equals("pool_id")) {
- l7_policy.poolId = jp.getText();
- continue;
- }
- if (n.equals("value")) {
- l7_policy.action = Short.parseShort(jp.getText());
- continue;
- }
-
- log.warn("Unrecognized field {} in " +
- "parsing L7Policies",
- jp.getText());
- }
- jp.close();
-
- return l7_policy;
- }
-}
diff --git a/src/main/java/net/floodlightcontroller/loadbalancer/L7Policy.java b/src/main/java/net/floodlightcontroller/loadbalancer/L7Policy.java
deleted file mode 100644
index 011a2e1a73367d92860934fc38ff5e84410b1175..0000000000000000000000000000000000000000
--- a/src/main/java/net/floodlightcontroller/loadbalancer/L7Policy.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package net.floodlightcontroller.loadbalancer;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
-@JsonSerialize(using=L7PolicySerializer.class)
-public class L7Policy {
- protected String id;
- protected String vipId;
- protected String poolId;
- protected short action;
-
-
- public L7Policy() {
- id = String.valueOf((int) (Math.random()*10000));
- poolId = null;
- vipId = null;
- action = 0;
- }
-}
diff --git a/src/main/java/net/floodlightcontroller/loadbalancer/L7PolicySerializer.java b/src/main/java/net/floodlightcontroller/loadbalancer/L7PolicySerializer.java
deleted file mode 100644
index 9e10d027facf2bd19a9e7155f861d17b23a8022d..0000000000000000000000000000000000000000
--- a/src/main/java/net/floodlightcontroller/loadbalancer/L7PolicySerializer.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package net.floodlightcontroller.loadbalancer;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-public class L7PolicySerializer extends JsonSerializer<L7Policy> {
-
- @Override
- public void serialize(L7Policy l7_policy, JsonGenerator jGen, SerializerProvider serializer)
- throws IOException, JsonProcessingException {
- jGen.writeStartObject();
-
- jGen.writeStringField("action", String.valueOf(l7_policy.action));
- jGen.writeStringField("id", l7_policy.id);
- jGen.writeStringField("vipId", l7_policy.vipId);
- jGen.writeStringField("poolId", l7_policy.poolId);
-
- jGen.writeEndObject();
-
- }
-
-}
diff --git a/src/main/java/net/floodlightcontroller/loadbalancer/L7Rule.java b/src/main/java/net/floodlightcontroller/loadbalancer/L7Rule.java
deleted file mode 100644
index fc2d8e58d2eb60d98029928a38002ce5ce09d22b..0000000000000000000000000000000000000000
--- a/src/main/java/net/floodlightcontroller/loadbalancer/L7Rule.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package net.floodlightcontroller.loadbalancer;
-
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
-
-@JsonSerialize(using=L7RuleSerializer.class)
-public class L7Rule {
- protected String id;
- protected String policyId;
- protected short type;
- protected String value;
-
-
- public L7Rule() {
- id = String.valueOf((int) (Math.random()*10000));
- policyId = null;
- value = null;
- type = 0;
- }
-}
diff --git a/src/main/java/net/floodlightcontroller/loadbalancer/L7RuleSerializer.java b/src/main/java/net/floodlightcontroller/loadbalancer/L7RuleSerializer.java
deleted file mode 100644
index b5099781cb5a85989ed93f7caacab1497b8b1c49..0000000000000000000000000000000000000000
--- a/src/main/java/net/floodlightcontroller/loadbalancer/L7RuleSerializer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package net.floodlightcontroller.loadbalancer;
-
-import java.io.IOException;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-
-public class L7RuleSerializer extends JsonSerializer<L7Rule>{
-
- @Override
- public void serialize(L7Rule l7_rule, JsonGenerator jGen, SerializerProvider serializer)
- throws IOException, JsonProcessingException {
- jGen.writeStartObject();
-
- jGen.writeStringField("type", String.valueOf(l7_rule.type));
- jGen.writeStringField("value", l7_rule.value);
- jGen.writeStringField("id", l7_rule.id);
- jGen.writeStringField("policyId", l7_rule.policyId);
-
- jGen.writeEndObject();
- }
-
-}
diff --git a/src/main/java/net/floodlightcontroller/loadbalancer/L7RulesResource.java b/src/main/java/net/floodlightcontroller/loadbalancer/L7RulesResource.java
deleted file mode 100644
index d972013544446a677d754391e51618e472b15192..0000000000000000000000000000000000000000
--- a/src/main/java/net/floodlightcontroller/loadbalancer/L7RulesResource.java
+++ /dev/null
@@ -1,124 +0,0 @@
-package net.floodlightcontroller.loadbalancer;
-
-import java.io.IOException;
-import java.util.Collection;
-
-import org.restlet.resource.Delete;
-import org.restlet.resource.Get;
-import org.restlet.resource.Post;
-import org.restlet.resource.Put;
-import org.restlet.resource.ServerResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.core.JsonParser;
-import com.fasterxml.jackson.core.JsonToken;
-import com.fasterxml.jackson.databind.MappingJsonFactory;
-
-
-public class L7RulesResource extends ServerResource {
- protected static Logger log = LoggerFactory.getLogger(L7RulesResource.class);
-
- @Get("json")
- public Collection <L7Rule> retrieve() {
- ILoadBalancerService lbs =
- (ILoadBalancerService)getContext().getAttributes().
- get(ILoadBalancerService.class.getCanonicalName());
-
- String ruleId = (String) getRequestAttributes().get("rule");
- if (ruleId!=null)
- return lbs.listL7Rule(ruleId);
- else
- return lbs.listL7Rules();
- }
-
- @Put
- @Post
- public L7Rule createL7Rule(String postData) {
-
- L7Rule l7_rule=null;
- try {
- l7_rule=jsonToL7Rule(postData);
- } catch (IOException e) {
- log.error("Could not parse JSON {}", e.getMessage());
- }
-
- ILoadBalancerService lbs =
- (ILoadBalancerService)getContext().getAttributes().
- get(ILoadBalancerService.class.getCanonicalName());
-
- String ruleId = (String) getRequestAttributes().get("rule");
- if (ruleId != null)
- return lbs.updateL7Rule(l7_rule);
- else
- return lbs.createL7Rule(l7_rule);
- }
-
- @Delete
- public int removeL7Rule() {
-
- String ruleId = (String) getRequestAttributes().get("rule");
-
- ILoadBalancerService lbs =
- (ILoadBalancerService)getContext().getAttributes().
- get(ILoadBalancerService.class.getCanonicalName());
-
- return lbs.removeL7Rule(ruleId);
- }
-
- protected L7Rule jsonToL7Rule(String json) throws IOException {
-
- if (json==null) return null;
-
- MappingJsonFactory f = new MappingJsonFactory();
- JsonParser jp;
- L7Rule l7_rule = new L7Rule();
-
- try {
- jp = f.createParser(json);
- } catch (JsonParseException e) {
- throw new IOException(e);
- }
-
- jp.nextToken();
- if (jp.getCurrentToken() != JsonToken.START_OBJECT) {
- throw new IOException("Expected START_OBJECT");
- }
-
- while (jp.nextToken() != JsonToken.END_OBJECT) {
- if (jp.getCurrentToken() != JsonToken.FIELD_NAME) {
- throw new IOException("Expected FIELD_NAME");
- }
-
- String n = jp.getCurrentName();
- jp.nextToken();
- if (jp.getText().equals(""))
- continue;
-
- if (n.equals("id")) {
- l7_rule.id = jp.getText();
- continue;
- }
- if (n.equals("policy_id")) {
- l7_rule.policyId = jp.getText();
- continue;
- }
- if (n.equals("type")) {
- l7_rule.type = Short.parseShort(jp.getText());
- continue;
- }
- if (n.equals("value")) {
- l7_rule.value = jp.getText();
- continue;
- }
-
- log.warn("Unrecognized field {} in " +
- "parsing l7Rules",
- jp.getText());
- }
- jp.close();
-
- return l7_rule;
- }
-}