Some fixes for the optical app

Change-Id: Ib3e317ad080d822ac41b1cf113ba388a7ce78316

Some fixes for the optical app
Change-Id: Ib3e317ad080d822ac41b1cf113ba388a7ce78316
Brian O'Connor · Gerrit Code Review
Commit 772852ac32f41ee3a550aef9b07762678496dce2 772852ac 1 parent a071b1e9
Showing 2 changed files with 59 additions and 119 deletions
apps/optical/src/main/java/org/onlab/onos/optical/OpticalPathProvisioner.java
core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalPathIntentInstaller.java
--- a/apps/optical/src/main/java/org/onlab/onos/optical/OpticalPathProvisioner.java
View file @772852a
+++ b/apps/optical/src/main/java/org/onlab/onos/optical/OpticalPathProvisioner.java
View file @772852a
@@ -15,13 +15,7 @@
  */
 package org.onlab.onos.optical;
-import java.util.ArrayList;
+import com.google.common.collect.Lists;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -33,31 +27,25 @@ import org.onlab.onos.net.ConnectPoint;
 import org.onlab.onos.net.Host;
 import org.onlab.onos.net.Link;
 import org.onlab.onos.net.Path;
-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.IntentEvent;
-import org.onlab.onos.net.intent.IntentExtensionService;
 import org.onlab.onos.net.intent.IntentListener;
+import org.onlab.onos.net.intent.IntentOperations;
 import org.onlab.onos.net.intent.IntentService;
+import org.onlab.onos.net.intent.IntentState;
 import org.onlab.onos.net.intent.OpticalConnectivityIntent;
 import org.onlab.onos.net.intent.PointToPointIntent;
-import org.onlab.onos.net.link.LinkService;
-import org.onlab.onos.net.resource.LinkResourceService;
 import org.onlab.onos.net.topology.LinkWeight;
-import org.onlab.onos.net.topology.Topology;
+import org.onlab.onos.net.topology.PathService;
 import org.onlab.onos.net.topology.TopologyEdge;
-
-import org.onlab.onos.net.topology.TopologyService;
-import org.onlab.packet.Ethernet;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import static org.onlab.onos.net.flow.DefaultTrafficTreatment.builder;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
 /**
  * OpticalPathProvisioner listens event notifications from the Intent F/W.
@@ -76,24 +64,12 @@ public class OpticalPathProvisioner {
     private IntentService intentService;
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    private IntentExtensionService intentExtensionService;
+    protected PathService pathService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected LinkService linkService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected DeviceService deviceService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected TopologyService topologyService;
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected CoreService coreService;
     @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
-    protected LinkResourceService resourceService;
-
-    @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
     protected HostService hostService;
     private ApplicationId appId;
@@ -124,7 +100,7 @@ public class OpticalPathProvisioner {
                     break;
                 case FAILED:
                     log.info("packet intent {} failed, calling optical path provisioning APP.", event.subject());
-                    setuplightpath(event.subject());
+                    setupLightpath(event.subject());
                     break;
                 case WITHDRAWN:
                     log.info("intent {} withdrawn.", event.subject());
@@ -135,58 +111,44 @@ public class OpticalPathProvisioner {
             }
         }
-        private void setuplightpath(Intent intent) {
+        private void setupLightpath(Intent intent) {
             // TODO support more packet intent types
-
+            List<Intent> intents = Lists.newArrayList();
             if (intent instanceof HostToHostIntent) {
                 HostToHostIntent hostToHostIntent = (HostToHostIntent) intent;
                 Host one = hostService.getHost(hostToHostIntent.one());
                 Host two = hostService.getHost(hostToHostIntent.two());
-
+                // provision both directions
-               TrafficSelector selector = buildTrafficSelector();
+                intents.addAll(getOpticalPaths(one.location(), two.location()));
-               TrafficTreatment treatment = builder().build();
+                intents.addAll(getOpticalPaths(two.location(), one.location()));
-
+            } else if (intent instanceof PointToPointIntent) {
-               PointToPointIntent intentOneToTwo =
+                PointToPointIntent p2pIntent = (PointToPointIntent) intent;
-                       new PointToPointIntent(appId, selector, treatment,
+                intents.addAll(getOpticalPaths(p2pIntent.ingressPoint(), p2pIntent.egressPoint()));
-                                              one.location(), two.location());
+            } else {
-               intentService.submit(intentOneToTwo);
+                log.info("Unsupported intent type: {}", intent.getClass());
-               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;
             }
-           PointToPointIntent pktIntent = (PointToPointIntent) intent;
+            // Build the intent batch
-           if (pktIntent.ingressPoint() == null || pktIntent.egressPoint() == null) {
+            IntentOperations.Builder ops = IntentOperations.builder();
-               return;
+            for (Intent i : intents) {
+                // TODO: don't allow duplicate intents between the same points for now
+                // we may want to allow this carefully in future to increase capacity
+                Intent existing = intentService.getIntent(i.id());
+                if (existing == null ||
+                    !IntentState.WITHDRAWN.equals(intentService.getIntentState(i.id()))) {
+                    ops.addSubmitOperation(i);
                 }
-
-           Topology topology = topologyService.currentTopology();
-
-           LinkWeight weight = new LinkWeight() {
-               @Override
-               public double weight(TopologyEdge edge) {
-                   if (isOpticalLink(edge.link())) {
-                       return 1000.0;  // optical links
-                   } else {
-                       return 1.0;   // packet links
             }
+            intentService.execute(ops.build());
         }
-           };
-           Set<Path> paths = topologyService.getPaths(topology,
+        private List<Intent> getOpticalPaths(ConnectPoint ingress, ConnectPoint egress) {
-                   pktIntent.ingressPoint().deviceId(),
+            Set<Path> paths = pathService.getPaths(ingress.deviceId(),
-                   pktIntent.egressPoint().deviceId(),
+                                                   egress.deviceId(),
-                   weight);
+                                                   new OpticalLinkWeight());
             if (paths.isEmpty()) {
-               return;
+                return Lists.newArrayList();
             }
             ConnectPoint srcWdmPoint = null;
@@ -195,9 +157,7 @@ public class OpticalPathProvisioner {
             Path firstPath = itrPath.next();
             log.info(firstPath.links().toString());
-           ArrayList<Map<ConnectPoint, ConnectPoint>> connectionList =
+            List<Intent> connectionList = Lists.newArrayList();
-                   new ArrayList<>();
-
             Iterator<Link> itrLink = firstPath.links().iterator();
             while (itrLink.hasNext()) {
@@ -216,46 +176,25 @@ public class OpticalPathProvisioner {
                     } else {
                         break;
                     }
-
-                   /*
-                   if (itrLink.hasNext()) {
-                       Link link3 = itrLink.next();
-                       if (isOpticalLink(link3)) {
-                          break;
-                       }
-                   } else {
-                       break;
-                   }*/
-
-               }
-
-               Map<ConnectPoint, ConnectPoint> pair =
-                       new HashMap<ConnectPoint, ConnectPoint>();
-               pair.put(srcWdmPoint, dstWdmPoint);
-
-               connectionList.add(pair);
                 }
-           for (Map<ConnectPoint, ConnectPoint> map : connectionList) {
-               for (Entry<ConnectPoint, ConnectPoint> entry : map.entrySet()) {
-
-                   ConnectPoint src = entry.getKey();
-                   ConnectPoint dst = entry.getValue();
-
                 Intent opticalIntent = new OpticalConnectivityIntent(appId,
                                                                      srcWdmPoint,
                                                                      dstWdmPoint);
-
+                log.info("Creating optical intent from {} to {}", srcWdmPoint, dstWdmPoint);
-                   intentService.submit(opticalIntent);
+                connectionList.add(opticalIntent);
-
-                   log.info(srcWdmPoint.toString());
-                   log.info(dstWdmPoint.toString());
             }
+            return connectionList;
         }
+
+
+        private void teardownLightpath(Intent intent) {
+          // TODO: tear down the idle lightpath if the utilization is close to zero.
+        }
     }
-        private boolean isOpticalLink(Link link) {
+    private static boolean isOpticalLink(Link link) {
         boolean isOptical = false;
         Link.Type lt = link.type();
         if (lt == Link.Type.OPTICAL) {
@@ -264,19 +203,15 @@ public class OpticalPathProvisioner {
         return isOptical;
     }
-        private void teardownLightpath(Intent intent) {
+    private static class OpticalLinkWeight implements LinkWeight {
-          // TODO: tear down the idle lightpath if the utilization is close to zero.
+        @Override
+        public double weight(TopologyEdge edge) {
+            if (isOpticalLink(edge.link())) {
+                return 1000.0;  // optical links
+            } else {
+                return 1.0;   // packet links
             }
-
-        private TrafficSelector buildTrafficSelector() {
-            TrafficSelector.Builder selectorBuilder = DefaultTrafficSelector.builder();
-            Short ethType = Ethernet.TYPE_IPV4;
-
-            selectorBuilder.matchEthType(ethType);
-
-            return selectorBuilder.build();
         }
-
     }
 }
--- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalPathIntentInstaller.java
View file @772852a
+++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/OpticalPathIntentInstaller.java
View file @772852a
@@ -101,14 +101,19 @@ public class OpticalPathIntentInstaller implements IntentInstaller<OpticalPathIn
     @Override
     public List<FlowRuleBatchOperation> uninstall(OpticalPathIntent intent) {
         LinkResourceAllocations allocations = resourceService.getAllocations(intent.id());
-        return generateRules(intent, allocations, FlowRuleOperation.REMOVE);
+        List<FlowRuleBatchOperation> rules = generateRules(intent, allocations, FlowRuleOperation.REMOVE);
+        log.info("uninstall rules: {}", rules);
+        return rules;
     }
     @Override
-    public List<FlowRuleBatchOperation> replace(OpticalPathIntent intent,
+    public List<FlowRuleBatchOperation> replace(OpticalPathIntent oldIntent,
                                                 OpticalPathIntent newIntent) {
         // FIXME: implement this
-        return null;
+        List<FlowRuleBatchOperation> batches = Lists.newArrayList();
+        batches.addAll(uninstall(oldIntent));
+        batches.addAll(install(newIntent));
+        return batches;
     }
     private LinkResourceAllocations assignWavelength(OpticalPathIntent intent) {