Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

@@ -27,7 +27,7 @@ public class AddHostToHostIntentCommand extends AbstractShellCommand {
               required = true, multiValued = false)
               required = true, multiValued = false)
     String two = null;
     String two = null;
 
 
-    private static long id = 1;
+    private static long id = 0x7870001;
 
 
     @Override
     @Override
     protected void execute() {
     protected void execute() {

@@ -14,6 +14,7 @@ import org.onlab.onos.net.intent.Intent;
 import org.onlab.onos.net.intent.IntentId;
 import org.onlab.onos.net.intent.IntentId;
 import org.onlab.onos.net.intent.IntentService;
 import org.onlab.onos.net.intent.IntentService;
 import org.onlab.onos.net.intent.PointToPointIntent;
 import org.onlab.onos.net.intent.PointToPointIntent;
+import org.onlab.packet.Ethernet;
 
 
 /**
 /**
  * Installs point-to-point connectivity intents.
  * Installs point-to-point connectivity intents.
@@ -32,7 +33,7 @@ public class AddPointToPointIntentCommand extends AbstractShellCommand {
               required = true, multiValued = false)
               required = true, multiValued = false)
     String egressDeviceString = null;
     String egressDeviceString = null;
 
 
-    private static long id = 1;
+    private static long id = 0x7470001;
 
 
     @Override
     @Override
     protected void execute() {
     protected void execute() {
@@ -48,7 +49,9 @@ public class AddPointToPointIntentCommand extends AbstractShellCommand {
                 PortNumber.portNumber(getPortNumber(egressDeviceString));
                 PortNumber.portNumber(getPortNumber(egressDeviceString));
         ConnectPoint egress = new ConnectPoint(egressDeviceId, egressPortNumber);
         ConnectPoint egress = new ConnectPoint(egressDeviceId, egressPortNumber);
 
 
-        TrafficSelector selector = DefaultTrafficSelector.builder().build();
+        TrafficSelector selector = DefaultTrafficSelector.builder()
+                .matchEthType(Ethernet.TYPE_IPV4)
+                .build();
         TrafficTreatment treatment = DefaultTrafficTreatment.builder().build();
         TrafficTreatment treatment = DefaultTrafficTreatment.builder().build();
 
 
         Intent intent =
         Intent intent =

@@ -344,7 +344,7 @@ public class OpenFlowRuleProvider extends AbstractProvider implements FlowRulePr
 
 
         public void satisfyRequirement(Dpid dpid) {
         public void satisfyRequirement(Dpid dpid) {
             log.warn("Satisfaction from switch {}", dpid);
             log.warn("Satisfaction from switch {}", dpid);
-            sws.remove(controller.getSwitch(dpid));
+            sws.remove(dpid);
             countDownLatch.countDown();
             countDownLatch.countDown();
         }
         }