Moved MD-SAL openflow utility classes from net-virt-providers to its own Utility...

Change-Id: I87ff6ae4e61e1859bf0a32d76efc98fb483899cf
Signed-off-by: Madhu Venugopal <mavenugo@gmail.com>

diff --git a/openstack/net-virt-providers/pom.xml b/openstack/net-virt-providers/pom.xml
index d37ec9f111bf76dc9aee2175d8ec6f477dbc710b..4e689a407e8c7b068684a3a037ce0305b3a3c879 100644 (file)
--- a/openstack/net-virt-providers/pom.xml
+++ b/openstack/net-virt-providers/pom.xml
@@ -60,17 +60,11 @@
             <groupId>org.opendaylight.ovsdb</groupId>
             <artifactId>openstack.net-virt</artifactId>
         </dependency>
-    <dependency>
-      <groupId>org.opendaylight.openflowplugin</groupId>
-      <artifactId>openflowplugin-extension-nicira</artifactId>
-      <version>${openflowplugin-nicira.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>org.opendaylight.ovsdb</groupId>
-      <artifactId>of-extension.nx-sal</artifactId>
-      <version>1.0.0-SNAPSHOT</version>
-    </dependency>
-
+        <dependency>
+          <groupId>org.opendaylight.ovsdb</groupId>
+          <artifactId>utils.mdsal-openflow</artifactId>
+          <version>1.0.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -99,6 +93,8 @@
                             org.osgi.framework,
                             *
                         </Import-Package>
+                        <Embed-Dependency>utils.mdsal-openflow;type=!pom;inline=false</Embed-Dependency>
+                        <Embed-Transitive>true</Embed-Transitive>
                         <Bundle-Activator>org.opendaylight.ovsdb.openstack.netvirt.providers.Activator</Bundle-Activator>
                     </instructions>
                 </configuration>

diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/OF13Provider.java b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/OF13Provider.java
index 1369f0c2d6ea0e8c3be6bc159a732ffd2da9b92b..97f57acf919c56f27faaa250427386896c6cf59a 100644 (file)
--- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/OF13Provider.java
+++ b/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/OF13Provider.java
@@ -31,8 +31,8 @@ import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProvider;
 import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager;
 import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService;
 import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService;
-import org.opendaylight.ovsdb.openstack.netvirt.providers.mdsalopenflow13.OF13MdSalInstruction;
-import org.opendaylight.ovsdb.openstack.netvirt.providers.mdsalopenflow13.OF13MdSalMatch;
+import org.opendaylight.ovsdb.utils.mdsal.openflow.MatchUtils;
+import org.opendaylight.ovsdb.utils.mdsal.openflow.InstructionUtils;
 import org.opendaylight.ovsdb.plugin.api.StatusWithUuid;
 import org.opendaylight.ovsdb.schema.openvswitch.Bridge;
 import org.opendaylight.ovsdb.schema.openvswitch.Interface;
@@ -1285,7 +1285,7 @@ public class OF13Provider implements NetworkingProvider {
         FlowBuilder flowBuilder = new FlowBuilder();
 
         // Create Match(es) and Set them in the FlowBuilder Object
-        flowBuilder.setMatch(OF13MdSalMatch.createEtherTypeMatch(matchBuilder, etherType).build());
+        flowBuilder.setMatch(MatchUtils.createEtherTypeMatch(matchBuilder, etherType).build());
 
         // Create the OF Actions and Instructions
         InstructionBuilder ib = new InstructionBuilder();
@@ -1295,7 +1295,7 @@ public class OF13Provider implements NetworkingProvider {
         List<Instruction> instructions = Lists.newArrayList();
 
         // Call the InstructionBuilder Methods Containing Actions
-        OF13MdSalInstruction.createSendToControllerInstructions(ib);
+        InstructionUtils.createSendToControllerInstructions(ib);
         ib.setOrder(0);
         ib.setKey(new InstructionKey(0));
         instructions.add(ib.build());
@@ -1340,7 +1340,7 @@ public class OF13Provider implements NetworkingProvider {
         List<Instruction> instructions = Lists.newArrayList();
 
         // Call the InstructionBuilder Methods Containing Actions
-        OF13MdSalInstruction.createNormalInstructions(ib);
+        InstructionUtils.createNormalInstructions(ib);
         ib.setOrder(0);
         ib.setKey(new InstructionKey(0));
         instructions.add(ib.build());
@@ -1384,8 +1384,8 @@ public class OF13Provider implements NetworkingProvider {
         FlowBuilder flowBuilder = new FlowBuilder();
 
         // Create Match(es) and Set them in the FlowBuilder Object
-        flowBuilder.setMatch(OF13MdSalMatch.createTunnelIDMatch(matchBuilder, tunnelId).build());
-        flowBuilder.setMatch(OF13MdSalMatch.createInPortMatch(matchBuilder, dpidLong, ofPort).build());
+        flowBuilder.setMatch(MatchUtils.createTunnelIDMatch(matchBuilder, tunnelId).build());
+        flowBuilder.setMatch(MatchUtils.createInPortMatch(matchBuilder, dpidLong, ofPort).build());
 
         if (write) {
             // Create the OF Actions and Instructions
@@ -1396,7 +1396,7 @@ public class OF13Provider implements NetworkingProvider {
             List<Instruction> instructions = Lists.newArrayList();
 
             // Call the InstructionBuilder Methods Containing Actions
-            OF13MdSalInstruction.createGotoTableInstructions(ib, goToTableId);
+            InstructionUtils.createGotoTableInstructions(ib, goToTableId);
             ib.setOrder(0);
             ib.setKey(new InstructionKey(0));
             instructions.add(ib.build());
@@ -1445,9 +1445,9 @@ public class OF13Provider implements NetworkingProvider {
 
         // Create Match(es) and Set them in the FlowBuilder Object
         flowBuilder.setMatch(
-                OF13MdSalMatch.createVlanIdMatch(matchBuilder, new VlanId(Integer.valueOf(segmentationId)))
+                MatchUtils.createVlanIdMatch(matchBuilder, new VlanId(Integer.valueOf(segmentationId)))
                         .build())
-                .setMatch(OF13MdSalMatch.createInPortMatch(matchBuilder, dpidLong, ethPort)
+                .setMatch(MatchUtils.createInPortMatch(matchBuilder, dpidLong, ethPort)
                         .build());
 
         if (write) {
@@ -1459,7 +1459,7 @@ public class OF13Provider implements NetworkingProvider {
             List<Instruction> instructions = Lists.newArrayList();
 
             // Call the InstructionBuilder Methods Containing Actions
-            OF13MdSalInstruction.createGotoTableInstructions(ib, goToTableId);
+            InstructionUtils.createGotoTableInstructions(ib, goToTableId);
             ib.setOrder(0);
             ib.setKey(new InstructionKey(0));
             instructions.add(ib.build());
@@ -1508,9 +1508,9 @@ public class OF13Provider implements NetworkingProvider {
         FlowBuilder flowBuilder = new FlowBuilder();
 
         // Create the OF Match using MatchBuilder
-        flowBuilder.setMatch(OF13MdSalMatch.createEthSrcMatch(matchBuilder, new MacAddress(attachedMac)).build());
+        flowBuilder.setMatch(MatchUtils.createEthSrcMatch(matchBuilder, new MacAddress(attachedMac)).build());
         // TODO Broken In_Port Match
-        flowBuilder.setMatch(OF13MdSalMatch.createInPortMatch(matchBuilder, dpidLong, inPort).build());
+        flowBuilder.setMatch(MatchUtils.createInPortMatch(matchBuilder, dpidLong, inPort).build());
 
         String flowId = "LocalMac_"+segmentationId+"_"+inPort+"_"+attachedMac;
         // Add Flow Attributes
@@ -1533,12 +1533,12 @@ public class OF13Provider implements NetworkingProvider {
             List<Instruction> instructions = Lists.newArrayList();
 
             // GOTO Instructions Need to be added first to the List
-            OF13MdSalInstruction.createGotoTableInstructions(ib, goToTableId);
+            InstructionUtils.createGotoTableInstructions(ib, goToTableId);
             ib.setOrder(0);
             ib.setKey(new InstructionKey(0));
             instructions.add(ib.build());
             // TODO Broken SetTunID
-            OF13MdSalInstruction.createSetTunnelIdInstructions(ib, new BigInteger(segmentationId));
+            InstructionUtils.createSetTunnelIdInstructions(ib, new BigInteger(segmentationId));
             ib.setOrder(1);
             ib.setKey(new InstructionKey(1));
             instructions.add(ib.build());
@@ -1575,8 +1575,8 @@ public class OF13Provider implements NetworkingProvider {
          FlowBuilder flowBuilder = new FlowBuilder();
 
          // Create the OF Match using MatchBuilder
-         flowBuilder.setMatch(OF13MdSalMatch.createEthSrcMatch(matchBuilder, new MacAddress(attachedMac)).build());
-         flowBuilder.setMatch(OF13MdSalMatch.createInPortMatch(matchBuilder, dpidLong, inPort).build());
+         flowBuilder.setMatch(MatchUtils.createEthSrcMatch(matchBuilder, new MacAddress(attachedMac)).build());
+         flowBuilder.setMatch(MatchUtils.createInPortMatch(matchBuilder, dpidLong, inPort).build());
 
          String flowId = "LocalMac_"+segmentationId+"_"+inPort+"_"+attachedMac;
          // Add Flow Attributes
@@ -1599,12 +1599,12 @@ public class OF13Provider implements NetworkingProvider {
              List<Instruction> instructions = Lists.newArrayList();
 
              // GOTO Instructions Need to be added first to the List
-             OF13MdSalInstruction.createGotoTableInstructions(ib, goToTableId);
+             InstructionUtils.createGotoTableInstructions(ib, goToTableId);
              ib.setOrder(0);
              ib.setKey(new InstructionKey(0));
              instructions.add(ib.build());
              // Set VLAN ID Instruction
-             OF13MdSalInstruction.createSetVlanInstructions(ib, new VlanId(Integer.valueOf(segmentationId)));
+             InstructionUtils.createSetVlanInstructions(ib, new VlanId(Integer.valueOf(segmentationId)));
              ib.setOrder(1);
              ib.setKey(new InstructionKey(1));
              instructions.add(ib.build());
@@ -1638,7 +1638,7 @@ public class OF13Provider implements NetworkingProvider {
         FlowBuilder flowBuilder = new FlowBuilder();
 
         // Create the OF Match using MatchBuilder
-        flowBuilder.setMatch(OF13MdSalMatch.createInPortMatch(matchBuilder, dpidLong, inPort).build());
+        flowBuilder.setMatch(MatchUtils.createInPortMatch(matchBuilder, dpidLong, inPort).build());
 
         if (write) {
             // Instantiate the Builders for the OF Actions and Instructions
@@ -1649,7 +1649,7 @@ public class OF13Provider implements NetworkingProvider {
             List<Instruction> instructions = Lists.newArrayList();
 
             // Call the InstructionBuilder Methods Containing Actions
-            OF13MdSalInstruction.createDropInstructions(ib);
+            InstructionUtils.createDropInstructions(ib);
             ib.setOrder(0);
             ib.setKey(new InstructionKey(0));
             instructions.add(ib.build());
@@ -1699,8 +1699,8 @@ public class OF13Provider implements NetworkingProvider {
         FlowBuilder flowBuilder = new FlowBuilder();
 
         // Create the OF Match using MatchBuilder
-        flowBuilder.setMatch(OF13MdSalMatch.createTunnelIDMatch(matchBuilder, new BigInteger(segmentationId)).build());
-        flowBuilder.setMatch(OF13MdSalMatch.createDestEthMatch(matchBuilder, new MacAddress(attachedMac), null).build());
+        flowBuilder.setMatch(MatchUtils.createTunnelIDMatch(matchBuilder, new BigInteger(segmentationId)).build());
+        flowBuilder.setMatch(MatchUtils.createDestEthMatch(matchBuilder, new MacAddress(attachedMac), null).build());
 
         String flowId = "TunnelOut_"+segmentationId+"_"+OFPortOut+"_"+attachedMac;
         // Add Flow Attributes
@@ -1723,12 +1723,12 @@ public class OF13Provider implements NetworkingProvider {
             List<Instruction> instructions = Lists.newArrayList();
 
             // GOTO Instructions
-            OF13MdSalInstruction.createGotoTableInstructions(ib, goToTableId);
+            InstructionUtils.createGotoTableInstructions(ib, goToTableId);
             ib.setOrder(0);
             ib.setKey(new InstructionKey(0));
             instructions.add(ib.build());
             // Set the Output Port/Iface
-            OF13MdSalInstruction.createOutputPortInstructions(ib, dpidLong, OFPortOut);
+            InstructionUtils.createOutputPortInstructions(ib, dpidLong, OFPortOut);
             ib.setOrder(1);
             ib.setKey(new InstructionKey(1));
             instructions.add(ib.build());
@@ -1765,8 +1765,8 @@ public class OF13Provider implements NetworkingProvider {
 
          // Create the OF Match using MatchBuilder
          flowBuilder.setMatch(
-                 OF13MdSalMatch.createVlanIdMatch(matchBuilder, new VlanId(Integer.valueOf(segmentationId))).build());
-         flowBuilder.setMatch(OF13MdSalMatch.createDestEthMatch(matchBuilder, new MacAddress(attachedMac), null).build());
+                 MatchUtils.createVlanIdMatch(matchBuilder, new VlanId(Integer.valueOf(segmentationId))).build());
+         flowBuilder.setMatch(MatchUtils.createDestEthMatch(matchBuilder, new MacAddress(attachedMac), null).build());
 
          String flowId = "VlanOut_"+segmentationId+"_"+ethPort+"_"+attachedMac;
          // Add Flow Attributes
@@ -1789,7 +1789,7 @@ public class OF13Provider implements NetworkingProvider {
              List<Instruction> instructions = Lists.newArrayList();
 
              // GOTO Instructions
-             OF13MdSalInstruction.createGotoTableInstructions(ib, goToTableId);
+             InstructionUtils.createGotoTableInstructions(ib, goToTableId);
              ib.setOrder(0);
              ib.setKey(new InstructionKey(0));
              instructions.add(ib.build());
@@ -1826,10 +1826,10 @@ public class OF13Provider implements NetworkingProvider {
 
         // Create the OF Match using MatchBuilder
         // Match TunnelID
-        flowBuilder.setMatch(OF13MdSalMatch.createTunnelIDMatch(matchBuilder, new BigInteger(segmentationId)).build());
+        flowBuilder.setMatch(MatchUtils.createTunnelIDMatch(matchBuilder, new BigInteger(segmentationId)).build());
         // Match DMAC
 
-        flowBuilder.setMatch(OF13MdSalMatch.createDestEthMatch(matchBuilder, new MacAddress("01:00:00:00:00:00"),
+        flowBuilder.setMatch(MatchUtils.createDestEthMatch(matchBuilder, new MacAddress("01:00:00:00:00:00"),
                 new MacAddress("01:00:00:00:00:00")).build());
 
         String flowId = "TunnelFloodOut_"+segmentationId;
@@ -1859,7 +1859,7 @@ public class OF13Provider implements NetworkingProvider {
 
         if (write) {
             // GOTO Instruction
-            OF13MdSalInstruction.createGotoTableInstructions(ib, localTable);
+            InstructionUtils.createGotoTableInstructions(ib, localTable);
             ib.setOrder(0);
             ib.setKey(new InstructionKey(0));
             instructions.add(ib.build());
@@ -1879,7 +1879,7 @@ public class OF13Provider implements NetworkingProvider {
             writeFlow(flowBuilder, nodeBuilder);
         } else {
             /* remove port from action list */
-            boolean flowRemove = OF13MdSalInstruction.removeOutputPortFromInstructions(ib, dpidLong,
+            boolean flowRemove = InstructionUtils.removeOutputPortFromInstructions(ib, dpidLong,
                     OFPortOut, existingInstructions);
             if (flowRemove) {
                 /* if all port are removed, remove the flow too. */
@@ -1920,9 +1920,9 @@ public class OF13Provider implements NetworkingProvider {
          // Create the OF Match using MatchBuilder
          // Match Vlan ID
          flowBuilder.setMatch(
-                 OF13MdSalMatch.createVlanIdMatch(matchBuilder, new VlanId(Integer.valueOf(segmentationId))).build());
+                 MatchUtils.createVlanIdMatch(matchBuilder, new VlanId(Integer.valueOf(segmentationId))).build());
          // Match DMAC
-         flowBuilder.setMatch(OF13MdSalMatch.createDestEthMatch(matchBuilder, new MacAddress("01:00:00:00:00:00"),
+         flowBuilder.setMatch(MatchUtils.createDestEthMatch(matchBuilder, new MacAddress("01:00:00:00:00:00"),
                  new MacAddress("01:00:00:00:00:00")).build());
 
          String flowId = "VlanFloodOut_"+segmentationId;
@@ -1947,12 +1947,12 @@ public class OF13Provider implements NetworkingProvider {
 
          if (write) {
              // GOTO Instruction
-             OF13MdSalInstruction.createGotoTableInstructions(ib, localTable);
+             InstructionUtils.createGotoTableInstructions(ib, localTable);
              ib.setOrder(0);
              ib.setKey(new InstructionKey(0));
              instructions.add(ib.build());
              // Set the Output Port/Iface
-             OF13MdSalInstruction.createOutputPortInstructions(ib, dpidLong, ethPort);
+             InstructionUtils.createOutputPortInstructions(ib, dpidLong, ethPort);
              ib.setOrder(1);
              ib.setKey(new InstructionKey(1));
              instructions.add(ib.build());
@@ -1987,7 +1987,7 @@ public class OF13Provider implements NetworkingProvider {
         FlowBuilder flowBuilder = new FlowBuilder();
 
         // Create Match(es) and Set them in the FlowBuilder Object
-        flowBuilder.setMatch(OF13MdSalMatch.createTunnelIDMatch(matchBuilder, new BigInteger(segmentationId)).build());
+        flowBuilder.setMatch(MatchUtils.createTunnelIDMatch(matchBuilder, new BigInteger(segmentationId)).build());
 
         if (write) {
             // Create the OF Actions and Instructions
@@ -1998,7 +1998,7 @@ public class OF13Provider implements NetworkingProvider {
             List<Instruction> instructions = Lists.newArrayList();
 
             // Call the InstructionBuilder Methods Containing Actions
-            OF13MdSalInstruction.createGotoTableInstructions(ib, goToTableId);
+            InstructionUtils.createGotoTableInstructions(ib, goToTableId);
             ib.setOrder(0);
             ib.setKey(new InstructionKey(0));
             instructions.add(ib.build());
@@ -2049,7 +2049,7 @@ public class OF13Provider implements NetworkingProvider {
 
          // Create Match(es) and Set them in the FlowBuilder Object
          flowBuilder.setMatch(
-                 OF13MdSalMatch.createVlanIdMatch(matchBuilder, new VlanId(Integer.valueOf(segmentationId))).build());
+                 MatchUtils.createVlanIdMatch(matchBuilder, new VlanId(Integer.valueOf(segmentationId))).build());
 
          if (write) {
              // Create the OF Actions and Instructions
@@ -2065,7 +2065,7 @@ public class OF13Provider implements NetworkingProvider {
              //ib.setKey(new InstructionKey(0));
              //instructions.add(ib.build());
              // Set the Output Port/Iface
-             OF13MdSalInstruction.createOutputPortInstructions(ib, dpidLong, ethPort);
+             InstructionUtils.createOutputPortInstructions(ib, dpidLong, ethPort);
              ib.setOrder(0);
              ib.setKey(new InstructionKey(1));
              instructions.add(ib.build());
@@ -2114,8 +2114,8 @@ public class OF13Provider implements NetworkingProvider {
         FlowBuilder flowBuilder = new FlowBuilder();
 
         // Create the OF Match using MatchBuilder
-        flowBuilder.setMatch(OF13MdSalMatch.createTunnelIDMatch(matchBuilder, new BigInteger(segmentationId)).build());
-        flowBuilder.setMatch(OF13MdSalMatch.createDestEthMatch(matchBuilder, new MacAddress(attachedMac), null).build());
+        flowBuilder.setMatch(MatchUtils.createTunnelIDMatch(matchBuilder, new BigInteger(segmentationId)).build());
+        flowBuilder.setMatch(MatchUtils.createDestEthMatch(matchBuilder, new MacAddress(attachedMac), null).build());
 
         String flowId = "UcastOut_"+segmentationId+"_"+localPort+"_"+attachedMac;
         // Add Flow Attributes
@@ -2138,7 +2138,7 @@ public class OF13Provider implements NetworkingProvider {
             List<Instruction> instructions = Lists.newArrayList();
 
             // Set the Output Port/Iface
-            OF13MdSalInstruction.createOutputPortInstructions(ib, dpidLong, localPort);
+            InstructionUtils.createOutputPortInstructions(ib, dpidLong, localPort);
             ib.setOrder(0);
             ib.setKey(new InstructionKey(0));
             instructions.add(ib.build());
@@ -2173,8 +2173,8 @@ public class OF13Provider implements NetworkingProvider {
 
         // Create the OF Match using MatchBuilder
         flowBuilder.setMatch(
-                OF13MdSalMatch.createVlanIdMatch(matchBuilder, new VlanId(Integer.valueOf(segmentationId))).build());
-        flowBuilder.setMatch(OF13MdSalMatch.createDestEthMatch(matchBuilder, new MacAddress(attachedMac), null).build());
+                MatchUtils.createVlanIdMatch(matchBuilder, new VlanId(Integer.valueOf(segmentationId))).build());
+        flowBuilder.setMatch(MatchUtils.createDestEthMatch(matchBuilder, new MacAddress(attachedMac), null).build());
 
         String flowId = "VlanUcastOut_"+segmentationId+"_"+localPort+"_"+attachedMac;
         // Add Flow Attributes
@@ -2198,14 +2198,14 @@ public class OF13Provider implements NetworkingProvider {
             List<Instruction> instructions_tmp = Lists.newArrayList();
 
             /* Strip vlan and store to tmp instruction space*/
-            OF13MdSalInstruction.createPopVlanInstructions(ib);
+            InstructionUtils.createPopVlanInstructions(ib);
             ib.setOrder(0);
             ib.setKey(new InstructionKey(0));
             instructions_tmp.add(ib.build());
 
             // Set the Output Port/Iface
             ib = new InstructionBuilder();
-            OF13MdSalInstruction.addOutputPortInstructions(ib, dpidLong, localPort, instructions_tmp);
+            InstructionUtils.addOutputPortInstructions(ib, dpidLong, localPort, instructions_tmp);
             ib.setOrder(0);
             ib.setKey(new InstructionKey(0));
             instructions.add(ib.build());
@@ -2239,8 +2239,8 @@ public class OF13Provider implements NetworkingProvider {
         FlowBuilder flowBuilder = new FlowBuilder();
 
         // Create the OF Match using MatchBuilder
-        flowBuilder.setMatch(OF13MdSalMatch.createTunnelIDMatch(matchBuilder, new BigInteger(segmentationId)).build());
-        flowBuilder.setMatch(OF13MdSalMatch.createDestEthMatch(matchBuilder, new MacAddress("01:00:00:00:00:00"),
+        flowBuilder.setMatch(MatchUtils.createTunnelIDMatch(matchBuilder, new BigInteger(segmentationId)).build());
+        flowBuilder.setMatch(MatchUtils.createDestEthMatch(matchBuilder, new MacAddress("01:00:00:00:00:00"),
                 new MacAddress("01:00:00:00:00:00")).build());
 
         String flowId = "BcastOut_"+segmentationId;
@@ -2283,7 +2283,7 @@ public class OF13Provider implements NetworkingProvider {
 
             writeFlow(flowBuilder, nodeBuilder);
         } else {
-            boolean flowRemove = OF13MdSalInstruction.removeOutputPortFromInstructions(ib, dpidLong, localPort,
+            boolean flowRemove = InstructionUtils.removeOutputPortFromInstructions(ib, dpidLong, localPort,
                     existingInstructions);
             if (flowRemove) {
                 /* if all ports are removed, remove flow */
@@ -2324,8 +2324,8 @@ public class OF13Provider implements NetworkingProvider {
 
         // Create the OF Match using MatchBuilder
         flowBuilder.setMatch(
-                OF13MdSalMatch.createVlanIdMatch(matchBuilder, new VlanId(Integer.valueOf(segmentationId))).build());
-        flowBuilder.setMatch(OF13MdSalMatch.createDestEthMatch(matchBuilder, new MacAddress("01:00:00:00:00:00"),
+                MatchUtils.createVlanIdMatch(matchBuilder, new VlanId(Integer.valueOf(segmentationId))).build());
+        flowBuilder.setMatch(MatchUtils.createDestEthMatch(matchBuilder, new MacAddress("01:00:00:00:00:00"),
                 new MacAddress("01:00:00:00:00:00")).build());
 
         String flowId = "VlanBcastOut_"+segmentationId;
@@ -2374,7 +2374,7 @@ public class OF13Provider implements NetworkingProvider {
 
             if (add_pop_vlan) {
                 /* pop vlan */
-                OF13MdSalInstruction.createPopVlanInstructions(ib);
+                InstructionUtils.createPopVlanInstructions(ib);
                 ib.setOrder(0);
                 ib.setKey(new InstructionKey(0));
                 existingInstructions.add(ib.build());
@@ -2398,7 +2398,7 @@ public class OF13Provider implements NetworkingProvider {
         } else {
             //boolean flowRemove = removeOutputPortFromGroup(nodeBuilder, ib, dpidLong,
             //                     localPort, existingInstructions);
-            boolean flowRemove = OF13MdSalInstruction.removeOutputPortFromInstructions(ib, dpidLong,
+            boolean flowRemove = InstructionUtils.removeOutputPortFromInstructions(ib, dpidLong,
                     localPort, existingInstructions);
             if (flowRemove) {
                 /* if all ports are removed, remove flow */
@@ -2436,7 +2436,7 @@ public class OF13Provider implements NetworkingProvider {
         FlowBuilder flowBuilder = new FlowBuilder();
 
         // Create Match(es) and Set them in the FlowBuilder Object
-        flowBuilder.setMatch(OF13MdSalMatch.createTunnelIDMatch(matchBuilder, new BigInteger(segmentationId)).build());
+        flowBuilder.setMatch(MatchUtils.createTunnelIDMatch(matchBuilder, new BigInteger(segmentationId)).build());
 
         if (write) {
             // Create the OF Actions and Instructions
@@ -2447,7 +2447,7 @@ public class OF13Provider implements NetworkingProvider {
             List<Instruction> instructions = Lists.newArrayList();
 
             // Call the InstructionBuilder Methods Containing Actions
-            OF13MdSalInstruction.createDropInstructions(ib);
+            InstructionUtils.createDropInstructions(ib);
             ib.setOrder(0);
             ib.setKey(new InstructionKey(0));
             instructions.add(ib.build());
@@ -2496,7 +2496,7 @@ public class OF13Provider implements NetworkingProvider {
 
         // Create Match(es) and Set them in the FlowBuilder Object
         flowBuilder.setMatch(
-                OF13MdSalMatch.createVlanIdMatch(matchBuilder, new VlanId(Integer.valueOf(segmentationId))).build());
+                MatchUtils.createVlanIdMatch(matchBuilder, new VlanId(Integer.valueOf(segmentationId))).build());
 
         if (write) {
             // Create the OF Actions and Instructions
@@ -2507,7 +2507,7 @@ public class OF13Provider implements NetworkingProvider {
             List<Instruction> instructions = Lists.newArrayList();
 
             // Call the InstructionBuilder Methods Containing Actions
-            OF13MdSalInstruction.createDropInstructions(ib);
+            InstructionUtils.createDropInstructions(ib);
             ib.setOrder(0);
             ib.setKey(new InstructionKey(0));
             instructions.add(ib.build());

diff --git a/pom.xml b/pom.xml
index 41112c399cc1ed26346352b06eca5abc94d38af3..3cd3353a277f8cd685b8b823394b6074defbc292 100755 (executable)
--- a/pom.xml
+++ b/pom.xml
@@ -28,6 +28,7 @@
     <module>plugin</module>
     <module>plugin-mdsal-adapter</module>
     <module>northbound</module>
+    <module>utils/mdsal-openflow</module>
     <module>openstack/net-virt</module>
     <module>openstack/net-virt-providers</module>
     <module>of-extension/nx-ofjava</module>

diff --git a/utils/mdsal-openflow/pom.xml b/utils/mdsal-openflow/pom.xml
new file mode 100644 (file)
index 0000000..861f47f
--- /dev/null
+++ b/utils/mdsal-openflow/pom.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <parent>
+    <artifactId>commons</artifactId>
+    <groupId>org.opendaylight.ovsdb</groupId>
+    <version>1.2.0-SNAPSHOT</version>
+    <relativePath>../../commons/parent/pom.xml</relativePath>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+
+  <artifactId>utils.mdsal-openflow</artifactId>
+  <name>OpenDaylight OVSDB utility to program Openflow rules using MD_SAL</name>
+  <version>1.0.0-SNAPSHOT</version>
+  <packaging>jar</packaging>
+
+  <dependencies>
+    <!-- Yang Models -->
+    <dependency>
+      <groupId>org.opendaylight.yangtools</groupId>
+      <artifactId>yang-binding</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.yangtools.model</groupId>
+      <artifactId>ietf-inet-types</artifactId>
+      <version>2010.09.24.4-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.model</groupId>
+      <artifactId>model-inventory</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller.model</groupId>
+      <artifactId>model-flow-service</artifactId>
+    </dependency>
+    <!-- Controller Dependencies -->
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal-binding-api</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.controller</groupId>
+      <artifactId>sal</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>library</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>plugin</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.openflowplugin</groupId>
+      <artifactId>openflowplugin-extension-nicira</artifactId>
+      <version>${openflowplugin-nicira.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>org.opendaylight.ovsdb</groupId>
+      <artifactId>of-extension.nx-sal</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+</project>

diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/mdsalopenflow13/OF13MdSalAction.java b/utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/ActionUtils.java
similarity index 99%
rename from openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/mdsalopenflow13/OF13MdSalAction.java
rename to utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/ActionUtils.java
index cfc1bffd59fdec653db45297b58c4591f0a6d0a2..542d12f13bece40116b3d131de243016019991e2 100644 (file)
--- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/mdsalopenflow13/OF13MdSalAction.java
+++ b/utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/ActionUtils.java
@@ -1,4 +1,4 @@
-package org.opendaylight.ovsdb.openstack.netvirt.providers.mdsalopenflow13;
+package org.opendaylight.ovsdb.utils.mdsal.openflow;
 
 import java.math.BigInteger;
 
@@ -61,7 +61,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.ovs.nx.sal.action.rev140714
 
 import com.google.common.net.InetAddresses;
 
-public final class OF13MdSalAction {
+public final class ActionUtils {
     public static Action dropAction() {
         return new DropActionCaseBuilder()
             .setDropAction(new DropActionBuilder()

diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/mdsalopenflow13/OF13MdSalInstruction.java b/utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/InstructionUtils.java
similarity index 99%
rename from openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/mdsalopenflow13/OF13MdSalInstruction.java
rename to utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/InstructionUtils.java
index 7246e254eacc11a21379f237e65dab492e0aff82..d901e0ba661c9efcbe37a76876ffe394cd1a57a9 100644 (file)
--- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/mdsalopenflow13/OF13MdSalInstruction.java
+++ b/utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/InstructionUtils.java
@@ -7,9 +7,9 @@
  *
  */
 
-package org.opendaylight.ovsdb.openstack.netvirt.providers.mdsalopenflow13;
+package org.opendaylight.ovsdb.utils.mdsal.openflow;
 
-import static org.opendaylight.ovsdb.openstack.netvirt.providers.mdsalopenflow13.OF13MdSalAction.dropAction;
+import static org.opendaylight.ovsdb.utils.mdsal.openflow.ActionUtils.dropAction;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
@@ -68,8 +68,8 @@ import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.Lists;
 
-public class OF13MdSalInstruction {
-    private static final Logger logger = LoggerFactory.getLogger(OF13MdSalInstruction.class);
+public class InstructionUtils {
+    private static final Logger logger = LoggerFactory.getLogger(InstructionUtils.class);
     private static final int IPV4 = 0x8100;
     private static final int MAX_LENGTH = 0xffff;
 

diff --git a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/mdsalopenflow13/OF13MdSalMatch.java b/utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/MatchUtils.java
similarity index 99%
rename from openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/mdsalopenflow13/OF13MdSalMatch.java
rename to utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/MatchUtils.java
index cf6095259c59ecc14a53dff396b1bd6e3e710882..1d33b00aa0389b386b074b66caf35bbc2ad79f04 100644 (file)
--- a/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/mdsalopenflow13/OF13MdSalMatch.java
+++ b/utils/mdsal-openflow/src/main/java/org/opendaylight/ovsdb/utils/mdsal/openflow/MatchUtils.java
@@ -7,13 +7,12 @@
  *
  */
 
-package org.opendaylight.ovsdb.openstack.netvirt.providers.mdsalopenflow13;
+package org.opendaylight.ovsdb.utils.mdsal.openflow;
 
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.opendaylight.ovsdb.openstack.netvirt.providers.OF13Provider;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.PortNumber;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
@@ -71,8 +70,8 @@ import org.slf4j.LoggerFactory;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 
-public class OF13MdSalMatch extends OF13Provider {
-    private static final Logger logger = LoggerFactory.getLogger(OF13MdSalMatch.class);
+public class MatchUtils {
+    private static final Logger logger = LoggerFactory.getLogger(MatchUtils.class);
 
     /**
      * Create Ingress Port Match dpidLong, inPort