Break spurious dependencies

DO NOT MERGE until https://git.opendaylight.org/gerrit/#/c/9846/
has been merged in controller.

Change-Id: I11c9eb8e9b34705faec684d54cff63c0671d4f41
Signed-off-by: Ed Warnicke <eaw@cisco.com>

diff --git a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java
index 033803be99f46a624fb155e4cb6025876ccde2db..391512a249fb18e41ddd1a27384c4c44114a31a2 100644 (file)
--- a/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java
+++ b/openflowplugin-it/src/test/java/org/opendaylight/openflowplugin/openflow/md/it/OFPaxOptionsAssistant.java
@@ -20,7 +20,7 @@ import static org.ops4j.pax.exam.CoreOptions.mavenBundle;
  *
  */
 public abstract class OFPaxOptionsAssistant {
-    
+
     /** system property required to enable osgi console and remote debugging, only presence matters */
     private static final String INSPECT_OSGI = "inspectOsgi";
     /** default remote debug port */
@@ -36,10 +36,10 @@ public abstract class OFPaxOptionsAssistant {
 
     public static final String YANGTOOLS = "org.opendaylight.yangtools";
 
-    
+
     /**
      * Works only if property -DinspectOsgi is used
-     * @return equinox console setup (in order to inspect running IT through osgi console (telnet)) 
+     * @return equinox console setup (in order to inspect running IT through osgi console (telnet))
      * and remote debugging on port {@link #DEBUG_PORT}
      */
     public static Option osgiConsoleBundles() {
@@ -52,7 +52,7 @@ public abstract class OFPaxOptionsAssistant {
             .add(CoreOptions.mavenBundle("equinoxSDK381", "org.apache.felix.gogo.runtime").versionAsInProject())
             .add(CoreOptions.mavenBundle("equinoxSDK381", "org.apache.felix.gogo.command").versionAsInProject());
         }
-            
+
         return option;
     }
 
@@ -88,7 +88,7 @@ public abstract class OFPaxOptionsAssistant {
      */
     public static Option loggingBudles() {
         return new DefaultCompositeOption(
-                mavenBundle("org.slf4j", "slf4j-api").versionAsInProject(), 
+                mavenBundle("org.slf4j", "slf4j-api").versionAsInProject(),
                 mavenBundle("org.slf4j", "log4j-over-slf4j").versionAsInProject(),
                 mavenBundle("ch.qos.logback", "logback-core").versionAsInProject(),
                 mavenBundle("ch.qos.logback", "logback-classic").versionAsInProject());
@@ -99,8 +99,9 @@ public abstract class OFPaxOptionsAssistant {
      */
     public static Option baseSalBundles() {
         return new DefaultCompositeOption(
-                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager").versionAsInProject(),
-                mavenBundle(CONTROLLER, "sal").versionAsInProject(),
+//                mavenBundle("org.apache.felix", "org.apache.felix.dependencymanager").versionAsInProject(),
+//                mavenBundle(CONTROLLER, "sal").versionAsInProject(),
+                mavenBundle(CONTROLLER, "liblldp").versionAsInProject(),
                 mavenBundle(YANGTOOLS + ".thirdparty", "antlr4-runtime-osgi-nohead").versionAsInProject());
 
     }

diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml
index d6df815dce891de934592cb3b5cb016e8ac88d51..18de4e7d6a734c96ba1eac578226b174eb696646 100644 (file)
--- a/openflowplugin/pom.xml
+++ b/openflowplugin/pom.xml
@@ -90,11 +90,7 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal.connection</artifactId>
+            <artifactId>liblldp</artifactId>
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller.model</groupId>

diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/lldp/LLDPSpeaker.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/lldp/LLDPSpeaker.java
index 8fd155c08fa75e0f982c64d66cfe2789857c7a65..4c0e2483679fe6a2e29b48dab14b25b1ecdbfdec 100644 (file)
--- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/lldp/LLDPSpeaker.java
+++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/lldp/LLDPSpeaker.java
@@ -7,12 +7,20 @@
  */
 package org.opendaylight.openflowplugin.openflow.md.lldp;
 
-import org.opendaylight.controller.sal.packet.Ethernet;
-import org.opendaylight.controller.sal.packet.LLDP;
-import org.opendaylight.controller.sal.packet.LLDPTLV;
-import org.opendaylight.controller.sal.packet.PacketException;
-import org.opendaylight.controller.sal.utils.EtherTypes;
-import org.opendaylight.controller.sal.utils.HexEncode;
+import java.math.BigInteger;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.concurrent.ConcurrentHashMap;
+
+import org.opendaylight.controller.liblldp.EtherTypes;
+import org.opendaylight.controller.liblldp.Ethernet;
+import org.opendaylight.controller.liblldp.HexEncode;
+import org.opendaylight.controller.liblldp.LLDP;
+import org.opendaylight.controller.liblldp.LLDPTLV;
+import org.opendaylight.controller.liblldp.PacketException;
 import org.opendaylight.openflowplugin.openflow.md.ModelDrivenSwitch;
 import org.opendaylight.openflowplugin.openflow.md.util.InventoryDataServiceUtil;
 import org.opendaylight.openflowplugin.openflow.md.util.OpenflowVersion;
@@ -31,37 +39,29 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.math.BigInteger;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.concurrent.ConcurrentHashMap;
-
 
 public class LLDPSpeaker {
     private static Logger LOG = LoggerFactory.getLogger(LLDPSpeaker.class);
-       
+
        private  final Map<InstanceIdentifier<NodeConnector>,TransmitPacketInput> nodeConnectorMap = new ConcurrentHashMap<InstanceIdentifier<NodeConnector>,TransmitPacketInput>();
        private  final Map<InstanceIdentifier<Node>,ModelDrivenSwitch> nodeMap = new ConcurrentHashMap<InstanceIdentifier<Node>,ModelDrivenSwitch>();
        private static final LLDPSpeaker instance = new LLDPSpeaker();
        private Timer timer = new Timer();
        private static final int DELAY = 0;
        private static final int PERIOD = 1000*5;
-       
+
        private LLDPSpeaker() {
            timer.schedule(new LLDPSpeakerTask(), DELAY, PERIOD);
        }
-       
+
        public static LLDPSpeaker getInstance() {
            return instance;
        }
-       
+
        public  void addModelDrivenSwitch(InstanceIdentifier<Node> nodeInstanceId, ModelDrivenSwitch sw) {
-               nodeMap.put(nodeInstanceId,sw);         
+               nodeMap.put(nodeInstanceId,sw);
        }
-       
+
        public void removeModelDrivenSwitch(InstanceIdentifier<Node> nodeInstanceId) {
            nodeMap.remove(nodeInstanceId);
            for (InstanceIdentifier<NodeConnector> nodeConnectorInstanceId : nodeConnectorMap.keySet()) {
@@ -92,19 +92,19 @@ public class LLDPSpeaker {
        public  void removeNodeConnector(
                        InstanceIdentifier<NodeConnector> nodeConnectorInstanceId,
                        NodeConnector nodeConnector) {
-               nodeConnectorMap.remove(nodeConnectorInstanceId);               
+               nodeConnectorMap.remove(nodeConnectorInstanceId);
        }
-       
+
        private  byte[] lldpDataFrom(InstanceIdentifier<Node> nodeInstanceId,InstanceIdentifier<NodeConnector> nodeConnectorInstanceId,MacAddress src,
                                  Short version) {
-               
+
            NodeId nodeId = InstanceIdentifier.keyOf(nodeInstanceId).getId();
            NodeConnectorId nodeConnectorId = InstanceIdentifier.keyOf(nodeConnectorInstanceId).getId();
                // Create LLDP TTL TLV
         byte[] ttl = new byte[] { (byte) 0, (byte) 120 };
         LLDPTLV ttlTlv = new LLDPTLV();
         ttlTlv.setType(LLDPTLV.TLVType.TTL.getValue()).setLength((short) ttl.length).setValue(ttl);
-               
+
         // Create LLDP ChassisID TLV
         BigInteger dataPathId = InventoryDataServiceUtil.dataPathIdFromNodeId(nodeId);
         byte[] cidValue = LLDPTLV.createChassisIDTLVValue(
@@ -168,11 +168,11 @@ public class LLDPSpeaker {
                 ModelDrivenSwitch md = nodeMap.get(nodeInstanceId);
                 md.transmitPacket(nodeConnectorMap.get(nodeConnectorInstanceId));
             }
-            
+
         }
-           
+
        }
-       
+
        private String colonize(String orig) {
            return orig.replaceAll("(?<=..)(..)", ":$1");
        }

diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertorTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertorTest.java
index 3e53c27c56110e53df927e52609db0b8300eabc9..b3c7f57a97e78b5fdd8cbf16b9542dca63659868 100644 (file)
--- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertorTest.java
+++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/ActionConvertorTest.java
@@ -16,7 +16,6 @@ import java.util.List;
 import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
-import org.opendaylight.controller.sal.action.PopVlan;
 import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil;
 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.Ipv6Prefix;
@@ -82,6 +81,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev1
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.DecNwTtl;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.Output;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopMpls;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PopVlan;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushMpls;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushPbb;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.PushVlan;
@@ -344,7 +344,7 @@ public class ActionConvertorTest {
 
     }
 
-    private void OutputActionData() {        
+    private void OutputActionData() {
         OutputActionBuilder outputB = new OutputActionBuilder();
         outputB.setMaxLength(10);
         Uri uri = new Uri(OutputPortValues.CONTROLLER.toString());
@@ -433,18 +433,18 @@ public class ActionConvertorTest {
 
     /**
      * testing {@link ActionConvertor#ofToSALPushMplsAction(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.Action)}
-     * with OF-1.3, IPv6 
+     * with OF-1.3, IPv6
      */
     @Test
     public void testOFtoSALPushMplsAction() {
-        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder actionBuilder 
+        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder actionBuilder
         = new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder();
-        
+
         actionBuilder.setType(PushVlan.class);
         EthertypeActionBuilder ethertypeActionBuilder = new EthertypeActionBuilder();
         ethertypeActionBuilder.setEthertype(new EtherType(new Integer(34888)));
         actionBuilder.addAugmentation(EthertypeAction.class, ethertypeActionBuilder.build());
-        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.Action action = actionBuilder.build(); 
+        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.Action action = actionBuilder.build();
 
         Assert.assertEquals(34888, ActionConvertor.ofToSALPushMplsAction(action).getPushMplsAction().getEthernetType().intValue());
     }
@@ -460,10 +460,10 @@ public class ActionConvertorTest {
         actions.add(actionItem++, AB1.build());
 
     }
-    
+
     /**
      * testing {@link ActionConvertor#SalToOFSetNwDst(org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder, short)}
-     * with OF-1.0, IPv4 
+     * with OF-1.0, IPv4
      */
     @Test
     public void testSalToOFSetNwDst10v4() {
@@ -479,7 +479,7 @@ public class ActionConvertorTest {
 
     /**
      * testing {@link ActionConvertor#SalToOFSetNwDst(org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder, short)}
-     * with OF-1.0, IPv6 
+     * with OF-1.0, IPv6
      */
     @Test
     public void testSalToOFSetNwDst10v6() {
@@ -491,11 +491,11 @@ public class ActionConvertorTest {
         org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.Action ofAction = ActionConvertor.SalToOFSetNwDst(action, actionBuilder, version);
         Assert.assertNull(ofAction);
     }
-    
-    
+
+
     /**
      * testing {@link ActionConvertor#SalToOFSetNwDst(org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder, short)}
-     * with OF-1.3, IPv4 
+     * with OF-1.3, IPv4
      */
     @Test
     public void testSalToOFSetNwDst13v4() {
@@ -510,11 +510,11 @@ public class ActionConvertorTest {
         Assert.assertEquals(Ipv4Dst.class, matchEntry.getOxmMatchField());
         Assert.assertEquals("10.0.0.1", matchEntry.getAugmentation(Ipv4AddressMatchEntry.class).getIpv4Address().getValue());
     }
-    
-    
+
+
     /**
      * testing {@link ActionConvertor#SalToOFSetNwDst(org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder, short)}
-     * with OF-1.3, IPv6 
+     * with OF-1.3, IPv6
      */
     @Test
     public void testSalToOFSetNwDst13v6() {
@@ -529,12 +529,12 @@ public class ActionConvertorTest {
         Assert.assertEquals(Ipv6Dst.class, matchEntry.getOxmMatchField());
         Assert.assertEquals("2001:0db8:85a3:0042:1000:8a2e:0370:7334", matchEntry.getAugmentation(Ipv6AddressMatchEntry.class).getIpv6Address().getValue());
     }
-    
-   
-    
+
+
+
     /**
      * testing {@link ActionConvertor#SalToOFSetNwSrc(org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder, short)}
-     * with OF-1.0, IPv4 
+     * with OF-1.0, IPv4
      */
     @Test
     public void testSalToOFSetNwSrc10v4() {
@@ -550,7 +550,7 @@ public class ActionConvertorTest {
 
     /**
      * testing {@link ActionConvertor#SalToOFSetNwSrc(org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder, short)}
-     * with OF-1.0, IPv6 
+     * with OF-1.0, IPv6
      */
     @Test
     public void testSalToOFSetNwSrc10v6() {
@@ -565,7 +565,7 @@ public class ActionConvertorTest {
 
     /**
      * testing {@link ActionConvertor#SalToOFSetNwSrc(org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder, short)}
-     * with OF-1.3, IPv4 
+     * with OF-1.3, IPv4
      */
     @Test
     public void testSalToOFSetNwSrc13v4() {
@@ -583,7 +583,7 @@ public class ActionConvertorTest {
 
     /**
      * testing {@link ActionConvertor#SalToOFSetNwSrc(org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action, org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder, short)}
-     * with OF-1.3, IPv6 
+     * with OF-1.3, IPv6
      */
     @Test
     public void testSalToOFSetNwSrc13v6() {
@@ -601,18 +601,18 @@ public class ActionConvertorTest {
 
     /**
      * testing {@link ActionConvertor#ofToSALPopMplsAction(org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.Action)}
-     * with OF-1.3, IPv6 
+     * with OF-1.3, IPv6
      */
     @Test
     public void testOFtoSALPopMplsAction() {
-        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder actionBuilder 
+        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder actionBuilder
         = new org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.ActionBuilder();
-        
+
         actionBuilder.setType(PopMpls.class);
         EthertypeActionBuilder ethertypeActionBuilder = new EthertypeActionBuilder();
         ethertypeActionBuilder.setEthertype(new EtherType(new Integer(34888)));
         actionBuilder.addAugmentation(EthertypeAction.class, ethertypeActionBuilder.build());
-        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.Action action = actionBuilder.build(); 
+        org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.action.rev130731.actions.grouping.Action action = actionBuilder.build();
 
         Assert.assertEquals(34888, ActionConvertor.ofToSALPopMplsAction(action).getPopMplsAction().getEthernetType().intValue());
     }
@@ -621,15 +621,15 @@ public class ActionConvertorTest {
         SetNwDstAction nwDstAction = new SetNwDstActionBuilder().setAddress(address).build();
         SetNwDstActionCase action = new SetNwDstActionCaseBuilder()
             .setSetNwDstAction(nwDstAction)
-            .build(); 
+            .build();
         return action;
     }
-    
+
     private static SetNwSrcActionCase provisionNwSrcActionBuilder(Address address) {
         SetNwSrcAction nwSrcAction = new SetNwSrcActionBuilder().setAddress(address).build();
         SetNwSrcActionCase action = new SetNwSrcActionCaseBuilder()
             .setSetNwSrcAction(nwSrcAction)
-            .build(); 
+            .build();
         return action;
     }
 

diff --git a/pom.xml b/pom.xml
index 29899c7998fa7e2fa9ee9d390e95e05c0341b2fe..52ec596a231123cfe93a13f03f16e6f4bddde6b0 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -119,14 +119,9 @@
         </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal</artifactId>
+            <artifactId>liblldp</artifactId>
             <version>${sal.api.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.opendaylight.controller</groupId>
-            <artifactId>sal.connection</artifactId>
-            <version>${sal.connection.api.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.opendaylight.controller</groupId>
             <artifactId>sal-common-util</artifactId>