Reorganize tree slightly to make room for OFOverlay renderer

Create beginning stub of OFOverlay renderer

Change-Id: I4483a5ecdf98d09f857c16e9a004589f90c40405
Signed-off-by: Rob Adams <readams@readams.net>

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModule.java b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModule.java
new file mode 100644 (file)
index 0000000..8fb3873
--- /dev/null
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModule.java
@@ -0,0 +1,24 @@
+package org.opendaylight.controller.config.yang.config.ofoverlay_provider.impl;
+
+import org.opendaylight.groupbasedpolicy.renderer.ofoverlay.OFOverlayRenderer;
+
+public class OFOverlayProviderModule extends org.opendaylight.controller.config.yang.config.ofoverlay_provider.impl.AbstractOFOverlayProviderModule {
+    public OFOverlayProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+        super(identifier, dependencyResolver);
+    }
+
+    public OFOverlayProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.controller.config.yang.config.ofoverlay_provider.impl.OFOverlayProviderModule oldModule, java.lang.AutoCloseable oldInstance) {
+        super(identifier, dependencyResolver, oldModule, oldInstance);
+    }
+
+    @Override
+    public void customValidation() {
+        // add custom validation form module attributes here.
+    }
+
+    @Override
+    public java.lang.AutoCloseable createInstance() {
+        return new OFOverlayRenderer();
+    }
+
+}

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModuleFactory.java b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModuleFactory.java
new file mode 100644 (file)
index 0000000..f572890
--- /dev/null
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/ofoverlay_provider/impl/OFOverlayProviderModuleFactory.java
@@ -0,0 +1,13 @@
+/*
+* Generated file
+*
+* Generated from: yang module name: ofoverlay-provider-impl yang module local name: ofoverlay-provider-impl
+* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+* Generated at: Tue Jun 24 15:06:29 PDT 2014
+*
+* Do not modify this file unless it is present under src/main directory
+*/
+package org.opendaylight.controller.config.yang.config.ofoverlay_provider.impl;
+public class OFOverlayProviderModuleFactory extends org.opendaylight.controller.config.yang.config.ofoverlay_provider.impl.AbstractOFOverlayProviderModuleFactory {
+
+}

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/opflex_provider/impl/OpflexProviderModule.java b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/opflex_provider/impl/OpflexProviderModule.java
index f35e76d9d65c88dda6cecd3c511f759780a20e9f..1e73d1b5f0d14badc3cc2827d70124ecf60b6bd9 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/opflex_provider/impl/OpflexProviderModule.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/controller/config/yang/config/opflex_provider/impl/OpflexProviderModule.java
@@ -1,6 +1,6 @@
 package org.opendaylight.controller.config.yang.config.opflex_provider.impl;
 
-import org.opendaylight.groupbasedpolicy.renderer.OpflexConnectionService;
+import org.opendaylight.groupbasedpolicy.renderer.opflex.OpflexConnectionService;
 
 public class OpflexProviderModule extends org.opendaylight.controller.config.yang.config.opflex_provider.impl.AbstractOpflexProviderModule {
     public OpflexProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/ExceptionHandler.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/ExceptionHandler.java
similarity index 92%
rename from groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/ExceptionHandler.java
rename to groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/ExceptionHandler.java
index 93a239d3a0f77f917a4bb94f91d472953b5d6b71..244f2060cd6532aaec6a6b0e4e69da9a390ce5ef 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/ExceptionHandler.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/ExceptionHandler.java
@@ -7,7 +7,7 @@
  *
  * Authors : Ashwin Raveendran
  */
-package org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc;
+package org.opendaylight.groupbasedpolicy.jsonrpc;
 
 import io.netty.channel.ChannelHandlerAdapter;
 import io.netty.channel.ChannelHandlerContext;

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/InvalidEncodingException.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/InvalidEncodingException.java
similarity index 91%
rename from groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/InvalidEncodingException.java
rename to groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/InvalidEncodingException.java
index f83654d1d08eb8ba64e3ba43ed5409d6575d9796..166f6b8659d477739f8abc96ceafac3a32b26c10 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/InvalidEncodingException.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/InvalidEncodingException.java
@@ -7,7 +7,7 @@
  *
  * Authors : Ashwin Raveendran, Madhu Venugopal
  */
-package org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc;
+package org.opendaylight.groupbasedpolicy.jsonrpc;
 
 public class InvalidEncodingException extends RuntimeException {
 

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpc10Request.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpc10Request.java
similarity index 95%
rename from groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpc10Request.java
rename to groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpc10Request.java
index 3604ad25aa2fc014552666198712d06f8a891d27..6e8ed8b21816e186491be652fc14364f9bb19aa4 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpc10Request.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpc10Request.java
@@ -7,7 +7,7 @@
  *
  * Authors : Ashwin Raveendran, Madhu Venugopal
  */
-package org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc;
+package org.opendaylight.groupbasedpolicy.jsonrpc;
 
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpc10Response.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpc10Response.java
similarity index 94%
rename from groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpc10Response.java
rename to groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpc10Response.java
index 7e71bc0411f0df5f68274e3129aaaa1dc8f22593..da63a70f123f38e85af42a40d6550413c224c107 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpc10Response.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpc10Response.java
@@ -7,7 +7,7 @@
  *
  * Authors : Ashwin Raveendran, Madhu Venugopal
  */
-package org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc;
+package org.opendaylight.groupbasedpolicy.jsonrpc;
 
 import java.util.List;
 

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcDecoder.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcDecoder.java
similarity index 98%
rename from groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcDecoder.java
rename to groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcDecoder.java
index 4c76eaf8765d1826a5f9861760f0bec3a5d2b975..4d6421746259113eea9ad9200aa72a4391b18749 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcDecoder.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcDecoder.java
@@ -7,7 +7,7 @@
  *
  * Authors : Ashwin Raveendran, Madhu Venugopal, Thomas Bachman
  */
-package org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc;
+package org.opendaylight.groupbasedpolicy.jsonrpc;
 
 
 import io.netty.buffer.ByteBuf;

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcEncoder.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcEncoder.java
similarity index 91%
rename from groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcEncoder.java
rename to groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcEncoder.java
index 184386dc8578381663d930926bf2e9e7794ad2a6..ae1f42c0566d45dd11ec1a246f00f59c706a06ee 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcEncoder.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcEncoder.java
@@ -8,7 +8,7 @@
  *
  * Authors : Ashwin Raveendran, Madhu Venugopal, Thomas Bachman
  */
-package org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc;
+package org.opendaylight.groupbasedpolicy.jsonrpc;
 
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.handler.codec.MessageToMessageEncoder;

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcEndpoint.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcEndpoint.java
similarity index 98%
rename from groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcEndpoint.java
rename to groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcEndpoint.java
index 2ca4e955b3e4fd81f0efb280a1052f98c500ab39..f0d8d9b22e24a8d7cd6fd3dcab3b3b1e16551806 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcEndpoint.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcEndpoint.java
@@ -8,7 +8,7 @@
  *
  * Authors : Ashwin Raveendran, Madhu Venugopal, Thomas Bachman
  */
-package org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc;
+package org.opendaylight.groupbasedpolicy.jsonrpc;
 
 import io.netty.channel.Channel;
 

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcMessage.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcMessage.java
similarity index 87%
rename from groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcMessage.java
rename to groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcMessage.java
index b37a6f214afa42ab6ea9994668433d8c86f67174..f2303add3a09ca0629a32923df1e9474f316e276 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcMessage.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcMessage.java
@@ -7,7 +7,7 @@
  *
  * Authors : Thomas Bachman
  */
-package org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc;
+package org.opendaylight.groupbasedpolicy.jsonrpc;
 
 public abstract class JsonRpcMessage {
 

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcMessageMap.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcMessageMap.java
similarity index 92%
rename from groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcMessageMap.java
rename to groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcMessageMap.java
index 756733dd6866fbfba680a096366afb69f4211f8f..936caf61e9aa5a217c781cd08f1c9ea3419521e1 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcMessageMap.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcMessageMap.java
@@ -7,7 +7,7 @@
  *
  * Authors : Thomas Bachman
  */
-package org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc;
+package org.opendaylight.groupbasedpolicy.jsonrpc;
 
 import java.util.Map;
 

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandler.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcServiceBinderHandler.java
similarity index 96%
rename from groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandler.java
rename to groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcServiceBinderHandler.java
index 665f8f12829753a4d232c54202fa63c443b985c4..6db8af7713cd20b03202018df947c1fe2903a9f7 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandler.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcServiceBinderHandler.java
@@ -7,7 +7,7 @@
  *
  * Authors : Ashwin Raveendran, Madhu Venugopal, Thomas Bachman
  */
-package org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc;
+package org.opendaylight.groupbasedpolicy.jsonrpc;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.google.common.base.Strings;

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/Params.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/Params.java
similarity index 85%
rename from groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/Params.java
rename to groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/Params.java
index 15b8950ee739c463a64c8080a159cf87e25f7f73..c6cb998e3a1b9a83f9699f8357a30f851c1e0fd6 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/Params.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/jsonrpc/Params.java
@@ -7,7 +7,7 @@
  *
  * Authors : Ashwin Raveendran
  */
-package org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc;
+package org.opendaylight.groupbasedpolicy.jsonrpc;
 
 import java.util.List;
 

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/OFOverlayRenderer.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/OFOverlayRenderer.java
new file mode 100644 (file)
index 0000000..0d5fe6c
--- /dev/null
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ofoverlay/OFOverlayRenderer.java
@@ -0,0 +1,16 @@
+package org.opendaylight.groupbasedpolicy.renderer.ofoverlay;
+
+/**
+ * Renderer that uses OpenFlow and OVSDB to implement an overlay network
+ * using Open vSwitch.
+ * @author readams
+ */
+public class OFOverlayRenderer implements AutoCloseable {
+
+    @Override
+    public void close() throws Exception {
+        // TODO Auto-generated method stub
+        
+    }
+
+}

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ChannelConnectionHandler.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/ChannelConnectionHandler.java
similarity index 94%
rename from groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ChannelConnectionHandler.java
rename to groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/ChannelConnectionHandler.java
index 1fb569034980509afe011d6088aa8335fd476d54..0ce2d461aae097ffd278e85d80967ac521e16cd4 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ChannelConnectionHandler.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/ChannelConnectionHandler.java
@@ -7,7 +7,7 @@
  *
  * Authors : Madhu Venugopal, Brent Salisbury, Thomas Bachman
  */
-package org.opendaylight.groupbasedpolicy.renderer;
+package org.opendaylight.groupbasedpolicy.renderer.opflex;
 
 import io.netty.channel.ChannelFuture;
 import io.netty.channel.ChannelFutureListener;

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/Connection.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/Connection.java
similarity index 94%
rename from groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/Connection.java
rename to groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/Connection.java
index 7f88e43387cf9e2d8cf8bbc6ae112c62632bffa4..5761915403449f054e0fec71f641d503009aea06 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/Connection.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/Connection.java
@@ -7,11 +7,11 @@
  *
  * Authors : Madhu Venugopal, Brent Salisbury, Thomas Bachman
  */
-package org.opendaylight.groupbasedpolicy.renderer;
+package org.opendaylight.groupbasedpolicy.renderer.opflex;
 
 import io.netty.channel.Channel;
 
-import org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc.JsonRpcEndpoint;
+import org.opendaylight.groupbasedpolicy.jsonrpc.JsonRpcEndpoint;
 
 public class Connection {
     private String identifier;

diff --git a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/OpflexConnectionService.java b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/OpflexConnectionService.java
similarity index 94%
rename from groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/OpflexConnectionService.java
rename to groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/OpflexConnectionService.java
index 1c9b6efa16dfeedc0a1ba1dcd9c9a6d37c7b2d4e..01b4ec4b4722720397101fc9f22ffcf37a4cd8f0 100644 (file)
--- a/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/OpflexConnectionService.java
+++ b/groupbasedpolicy/src/main/java/org/opendaylight/groupbasedpolicy/renderer/opflex/OpflexConnectionService.java
@@ -8,7 +8,7 @@
  *
  * Authors : Madhu Venugopal, Brent Salisbury, Evan Zeller, Thomas Bachman
  */
-package org.opendaylight.groupbasedpolicy.renderer;
+package org.opendaylight.groupbasedpolicy.renderer.opflex;
 
 import io.netty.bootstrap.ServerBootstrap;
 import io.netty.channel.AdaptiveRecvByteBufAllocator;
@@ -32,12 +32,11 @@ import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ExecutionException;
 
 import org.opendaylight.controller.sal.binding.api.data.DataBrokerService;
-import org.opendaylight.groupbasedpolicy.renderer.ChannelConnectionHandler;
-import org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc.JsonRpcDecoder;
-import org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc.JsonRpcMessageMap;
-import org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc.JsonRpcEndpoint;
-import org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc.JsonRpcServiceBinderHandler;
-
+import org.opendaylight.groupbasedpolicy.jsonrpc.JsonRpcDecoder;
+import org.opendaylight.groupbasedpolicy.jsonrpc.JsonRpcEndpoint;
+import org.opendaylight.groupbasedpolicy.jsonrpc.JsonRpcMessageMap;
+import org.opendaylight.groupbasedpolicy.jsonrpc.JsonRpcServiceBinderHandler;
+import org.opendaylight.groupbasedpolicy.renderer.opflex.ChannelConnectionHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/groupbasedpolicy/src/main/yang/common.yang b/groupbasedpolicy/src/main/yang/model/common.yang
similarity index 100%
rename from groupbasedpolicy/src/main/yang/common.yang
rename to groupbasedpolicy/src/main/yang/model/common.yang

diff --git a/groupbasedpolicy/src/main/yang/endpoint-provider-impl.yang b/groupbasedpolicy/src/main/yang/model/endpoint-provider-impl.yang
similarity index 100%
rename from groupbasedpolicy/src/main/yang/endpoint-provider-impl.yang
rename to groupbasedpolicy/src/main/yang/model/endpoint-provider-impl.yang

diff --git a/groupbasedpolicy/src/main/yang/endpoint-provider.yang b/groupbasedpolicy/src/main/yang/model/endpoint-provider.yang
similarity index 100%
rename from groupbasedpolicy/src/main/yang/endpoint-provider.yang
rename to groupbasedpolicy/src/main/yang/model/endpoint-provider.yang

diff --git a/groupbasedpolicy/src/main/yang/endpoint.yang b/groupbasedpolicy/src/main/yang/model/endpoint.yang
similarity index 100%
rename from groupbasedpolicy/src/main/yang/endpoint.yang
rename to groupbasedpolicy/src/main/yang/model/endpoint.yang

diff --git a/groupbasedpolicy/src/main/yang/policy-provider.yang b/groupbasedpolicy/src/main/yang/model/policy-provider.yang
similarity index 100%
rename from groupbasedpolicy/src/main/yang/policy-provider.yang
rename to groupbasedpolicy/src/main/yang/model/policy-provider.yang

diff --git a/groupbasedpolicy/src/main/yang/policy.yang b/groupbasedpolicy/src/main/yang/model/policy.yang
similarity index 100%
rename from groupbasedpolicy/src/main/yang/policy.yang
rename to groupbasedpolicy/src/main/yang/model/policy.yang

diff --git a/groupbasedpolicy/src/main/yang/opflex-provider.yang b/groupbasedpolicy/src/main/yang/renderer/ofoverlay/ofoverlay-provider.yang
similarity index 100%
rename from groupbasedpolicy/src/main/yang/opflex-provider.yang
rename to groupbasedpolicy/src/main/yang/renderer/ofoverlay/ofoverlay-provider.yang

diff --git a/groupbasedpolicy/src/main/yang/renderer/ofoverlay/ofoverlay.yang b/groupbasedpolicy/src/main/yang/renderer/ofoverlay/ofoverlay.yang
new file mode 100644 (file)
index 0000000..000966f
--- /dev/null
+++ b/groupbasedpolicy/src/main/yang/renderer/ofoverlay/ofoverlay.yang
@@ -0,0 +1,37 @@
+module ofoverlay {
+    yang-version 1;
+
+    namespace "urn:opendaylight:groupbasedpolicy:ofoverlay";
+    prefix "ofoverlay";
+
+    import ietf-inet-types { prefix "inet"; revision-date 2010-09-24; }
+
+    import gbp-common {prefix gbp-common;}
+
+    description
+        "This module defines the group-based policy ofoverlay renderer model.";
+
+    revision "2014-05-28" {
+        description
+            "Initial revision.";
+    }
+
+    // ******************
+    // Configuration Data
+    // ******************
+    container ofoverlay {
+        description
+            "Configuration for the OpenFlow overlay renderer";
+
+        config true;
+
+               leaf encapsulation-format {
+                       description "The encapsulation format to use for tunnels";
+                       type enumeration {
+                               enum vxlan {
+                                       description "Use VXLAN encapsulation";
+                               }
+                       }
+               }
+       }
+}

diff --git a/groupbasedpolicy/src/main/yang/renderer/opflex/opflex-provider.yang b/groupbasedpolicy/src/main/yang/renderer/opflex/opflex-provider.yang
new file mode 100644 (file)
index 0000000..aa64792
--- /dev/null
+++ b/groupbasedpolicy/src/main/yang/renderer/opflex/opflex-provider.yang
@@ -0,0 +1,41 @@
+module ofoverlay-provider-impl {
+     yang-version 1;
+     namespace "urn:opendaylight:params:xml:ns:yang:controller:config:ofoverlay-provider:impl";
+     prefix "ofoverlay-provider-impl";
+
+     import config { prefix config; revision-date 2013-04-05; }
+     import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; }
+
+
+     description
+         "This module contains the base YANG definitions for 
+          ofoverlay-provider impl implementation.";
+
+     revision "2014-06-11" {
+         description
+             "Initial revision.";
+     }
+
+     identity ofoverlay-provider-impl {
+        base "config:module-type";
+
+        config:java-name-prefix OFOverlayProvider;
+     }
+
+     // Augments the 'configuration' choice node under modules/module.  
+     augment "/config:modules/config:module/config:configuration" {
+         case ofoverlay-provider-impl {
+             when "/config:modules/config:module/config:type = 'ofoverlay-provider-impl'";
+
+             //wires in the data-broker service 
+             container data-broker {
+                 uses config:service-ref {
+                     refine type {
+                         mandatory false;
+                         config:required-identity mdsal:binding-data-broker;
+                     }
+                 }
+             }         
+        }
+     }
+}

diff --git a/groupbasedpolicy/src/main/yang/opflex.yang b/groupbasedpolicy/src/main/yang/renderer/opflex/opflex.yang
similarity index 100%
rename from groupbasedpolicy/src/main/yang/opflex.yang
rename to groupbasedpolicy/src/main/yang/renderer/opflex/opflex.yang

diff --git a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcDecoderTest.java b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcDecoderTest.java
similarity index 96%
rename from groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcDecoderTest.java
rename to groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcDecoderTest.java
index bc34da84377bb48a8c9b839ca3153ea186654e49..a7833652dc2befc7c9a8f3a39e45917940f51db0 100644 (file)
--- a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcDecoderTest.java
+++ b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcDecoderTest.java
@@ -8,20 +8,25 @@
  *  Authors : Dave Tucker
  */
 
-package org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc;
+package org.opendaylight.groupbasedpolicy.jsonrpc;
 
 import static io.netty.buffer.Unpooled.copiedBuffer;
+
 import static org.junit.Assert.assertEquals;
 
 import com.google.common.base.Charsets;
 import com.google.common.io.Resources;
+
 import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.handler.codec.DecoderException;
 import io.netty.handler.codec.TooLongFrameException;
 import io.netty.util.CharsetUtil;
+
 import java.net.URL;
+
 import org.junit.Before;
 import org.junit.Test;
+import org.opendaylight.groupbasedpolicy.jsonrpc.JsonRpcDecoder;
 
 public class JsonRpcDecoderTest {
     static int testJson_BYTES = 179;

diff --git a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcEndpointTest.java b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcEndpointTest.java
similarity index 94%
rename from groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcEndpointTest.java
rename to groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcEndpointTest.java
index 3d21d28dc058fe26e51c0dbdd4b641fafd6b22bb..072053b4bb87c2834a6bd5de25f5e273358240e9 100644 (file)
--- a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcEndpointTest.java
+++ b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcEndpointTest.java
@@ -8,25 +8,31 @@
  *  Authors : Thomas Bachman
  */
 
-package org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc;
+package org.opendaylight.groupbasedpolicy.jsonrpc;
 
 import static io.netty.buffer.Unpooled.copiedBuffer;
+
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.fail;
 
 import io.netty.channel.embedded.EmbeddedChannel;
+
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.JsonNode;
 
-
 import io.netty.util.CharsetUtil;
+
 import org.junit.Before;
 import org.junit.Test;
-
+import org.opendaylight.groupbasedpolicy.jsonrpc.JsonRpcDecoder;
+import org.opendaylight.groupbasedpolicy.jsonrpc.JsonRpcEndpoint;
+import org.opendaylight.groupbasedpolicy.jsonrpc.JsonRpcMessage;
+import org.opendaylight.groupbasedpolicy.jsonrpc.JsonRpcMessageMap;
+import org.opendaylight.groupbasedpolicy.jsonrpc.JsonRpcServiceBinderHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandlerTest.java b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcServiceBinderHandlerTest.java
similarity index 89%
rename from groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandlerTest.java
rename to groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcServiceBinderHandlerTest.java
index 81c21690c6ad36725a20c3ae4a4d7c45dd9a0d9e..0d66ebeb06401db6653220a4b4142c702df8b2ae 100644 (file)
--- a/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/JsonRpcServiceBinderHandlerTest.java
+++ b/groupbasedpolicy/src/test/java/org/opendaylight/groupbasedpolicy/jsonrpc/JsonRpcServiceBinderHandlerTest.java
@@ -8,18 +8,23 @@
  *  Authors : Thomas Bachman
  */
 
-package org.opendaylight.groupbasedpolicy.renderer.lib.jsonrpc;
+package org.opendaylight.groupbasedpolicy.jsonrpc;
 
 import static io.netty.buffer.Unpooled.copiedBuffer;
 import io.netty.channel.embedded.EmbeddedChannel;
-import com.fasterxml.jackson.databind.JsonNode;
 
+import com.fasterxml.jackson.databind.JsonNode;
 
 import io.netty.util.CharsetUtil;
+
 import org.junit.Before;
 import org.junit.Test;
+
 import static org.mockito.Mockito.*;
 
+import org.opendaylight.groupbasedpolicy.jsonrpc.JsonRpcDecoder;
+import org.opendaylight.groupbasedpolicy.jsonrpc.JsonRpcEndpoint;
+import org.opendaylight.groupbasedpolicy.jsonrpc.JsonRpcServiceBinderHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/groupbasedpolicy/src/test/resources/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/pretty-test.json b/groupbasedpolicy/src/test/resources/org/opendaylight/groupbasedpolicy/jsonrpc/pretty-test.json
similarity index 100%
rename from groupbasedpolicy/src/test/resources/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/pretty-test.json
rename to groupbasedpolicy/src/test/resources/org/opendaylight/groupbasedpolicy/jsonrpc/pretty-test.json

diff --git a/groupbasedpolicy/src/test/resources/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/test.json b/groupbasedpolicy/src/test/resources/org/opendaylight/groupbasedpolicy/jsonrpc/test.json
similarity index 100%
rename from groupbasedpolicy/src/test/resources/org/opendaylight/groupbasedpolicy/renderer/lib/jsonrpc/test.json
rename to groupbasedpolicy/src/test/resources/org/opendaylight/groupbasedpolicy/jsonrpc/test.json