Optical UC fixes for gui and for host2host intent provisoning

Change-Id: I5439583e92c44836632e381e0482bd485a1c5de4

@@ -30,9 +30,15 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
 import org.onlab.onos.core.ApplicationId;
 import org.onlab.onos.core.ApplicationId;
 import org.onlab.onos.core.CoreService;
 import org.onlab.onos.core.CoreService;
 import org.onlab.onos.net.ConnectPoint;
 import org.onlab.onos.net.ConnectPoint;
+import org.onlab.onos.net.Host;
 import org.onlab.onos.net.Link;
 import org.onlab.onos.net.Link;
 import org.onlab.onos.net.Path;
 import org.onlab.onos.net.Path;
 import org.onlab.onos.net.device.DeviceService;
 import org.onlab.onos.net.device.DeviceService;
+import org.onlab.onos.net.flow.DefaultTrafficSelector;
+import org.onlab.onos.net.flow.TrafficSelector;
+import org.onlab.onos.net.flow.TrafficTreatment;
+import org.onlab.onos.net.host.HostService;
+import org.onlab.onos.net.intent.HostToHostIntent;
 import org.onlab.onos.net.intent.Intent;
 import org.onlab.onos.net.intent.Intent;
 import org.onlab.onos.net.intent.IntentEvent;
 import org.onlab.onos.net.intent.IntentEvent;
 import org.onlab.onos.net.intent.IntentExtensionService;
 import org.onlab.onos.net.intent.IntentExtensionService;
@@ -47,9 +53,12 @@ import org.onlab.onos.net.topology.Topology;
 import org.onlab.onos.net.topology.TopologyEdge;
 import org.onlab.onos.net.topology.TopologyEdge;
 
 
 import org.onlab.onos.net.topology.TopologyService;
 import org.onlab.onos.net.topology.TopologyService;
+import org.onlab.packet.Ethernet;
 import org.slf4j.Logger;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.slf4j.LoggerFactory;
 
 
+import static org.onlab.onos.net.flow.DefaultTrafficTreatment.builder;
+
 /**
 /**
  * OpticalPathProvisioner listens event notifications from the Intent F/W.
  * OpticalPathProvisioner listens event notifications from the Intent F/W.
  * It generates one or more opticalConnectivityIntent(s) and submits (or withdraws) to Intent F/W
  * It generates one or more opticalConnectivityIntent(s) and submits (or withdraws) to Intent F/W
@@ -84,6 +93,9 @@ public class OpticalPathProvisioner {
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected LinkResourceService resourceService;
     protected LinkResourceService resourceService;
 
 
+    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+    protected HostService hostService;
+
     private ApplicationId appId;
     private ApplicationId appId;
 
 
     //protected <IntentId> intentIdGenerator;
     //protected <IntentId> intentIdGenerator;
@@ -125,7 +137,28 @@ public class OpticalPathProvisioner {
 
 
         private void setuplightpath(Intent intent) {
         private void setuplightpath(Intent intent) {
            // TODO support more packet intent types
            // TODO support more packet intent types
-           if (!intent.getClass().equals(PointToPointIntent.class)) {
+
+           if (intent instanceof HostToHostIntent) {
+               HostToHostIntent hostToHostIntent = (HostToHostIntent) intent;
+               Host one = hostService.getHost(hostToHostIntent.one());
+               Host two = hostService.getHost(hostToHostIntent.two());
+
+               TrafficSelector selector = buildTrafficSelector();
+               TrafficTreatment treatment = builder().build();
+
+               PointToPointIntent intentOneToTwo =
+                       new PointToPointIntent(appId, selector, treatment,
+                                              one.location(), two.location());
+               intentService.submit(intentOneToTwo);
+               log.info("Submitting P2P intent {} ", intentOneToTwo);
+
+               PointToPointIntent intentTwoToOne =
+                       new PointToPointIntent(appId, selector, treatment,
+                                              two.location(), one.location());
+               intentService.submit(intentTwoToOne);
+               log.info("Submitting P2P intent for {} ", intentTwoToOne);
+               return;
+           } else if (!intent.getClass().equals(PointToPointIntent.class)) {
                return;
                return;
            }
            }
 
 
@@ -162,7 +195,9 @@ public class OpticalPathProvisioner {
            Path firstPath = itrPath.next();
            Path firstPath = itrPath.next();
            log.info(firstPath.links().toString());
            log.info(firstPath.links().toString());
 
 
-           ArrayList<Map<ConnectPoint, ConnectPoint>> connectionList = new ArrayList<>();
+           ArrayList<Map<ConnectPoint, ConnectPoint>> connectionList =
+                   new ArrayList<>();
+
 
 
            Iterator<Link> itrLink = firstPath.links().iterator();
            Iterator<Link> itrLink = firstPath.links().iterator();
            while (itrLink.hasNext()) {
            while (itrLink.hasNext()) {
@@ -233,6 +268,15 @@ public class OpticalPathProvisioner {
           // TODO: tear down the idle lightpath if the utilization is close to zero.
           // TODO: tear down the idle lightpath if the utilization is close to zero.
         }
         }
 
 
+        private TrafficSelector buildTrafficSelector() {
+            TrafficSelector.Builder selectorBuilder = DefaultTrafficSelector.builder();
+            Short ethType = Ethernet.TYPE_IPV4;
+
+            selectorBuilder.matchEthType(ethType);
+
+            return selectorBuilder.build();
+        }
+
     }
     }
 
 
 }
 }

@@ -16,7 +16,7 @@ class NullIntf( Intf ):
 
 
 class NullLink( Link ):
 class NullLink( Link ):
     "A dummy link that doesn't touch either interface"
     "A dummy link that doesn't touch either interface"
-    def makeIntfPair( cls, intf1, intf2 ):
+    def makeIntfPair( cls, intf1, intf2, *args, **kwargs ):
         pass
         pass
     def delete( self ):
     def delete( self ):
         pass
         pass

@@ -174,7 +174,7 @@ public class TopologyWebSocket
                 requestDetails(event);
                 requestDetails(event);
             } else if (type.equals("updateMeta")) {
             } else if (type.equals("updateMeta")) {
                 updateMetaUi(event);
                 updateMetaUi(event);
-            } else if (type.equals("requestPath")) {
+            } else if (type.equals("addHostIntent")) {
                 createHostIntent(event);
                 createHostIntent(event);
             } else if (type.equals("requestTraffic")) {
             } else if (type.equals("requestTraffic")) {
                 requestTraffic(event);
                 requestTraffic(event);