Release resources when intent is withdrawn (ONOS-2048).

Create optical circuits using CLI (ONOS-2049).

Change-Id: I8e52e698a897b869147afffdc0294956df76aa0c

@@ -140,7 +140,6 @@ public class OpticalPathProvisioner {
                 case INSTALL_REQ:
                 case INSTALL_REQ:
                     break;
                     break;
                 case INSTALLED:
                 case INSTALLED:
-                    // track h2h & p2p intents using our connectivity
                     break;
                     break;
                 case FAILED:
                 case FAILED:
                     log.info("Intent {} failed, calling optical path provisioning app.", event.subject());
                     log.info("Intent {} failed, calling optical path provisioning app.", event.subject());
@@ -407,8 +406,10 @@ public class OpticalPathProvisioner {
             if (intent instanceof OpticalConnectivityIntent) {
             if (intent instanceof OpticalConnectivityIntent) {
                 deviceResourceService.releasePorts(intent.id());
                 deviceResourceService.releasePorts(intent.id());
                 linkResourceService.releaseResources(linkResourceService.getAllocations(intent.id()));
                 linkResourceService.releaseResources(linkResourceService.getAllocations(intent.id()));
+            } else if (intent instanceof  OpticalCircuitIntent) {
+                deviceResourceService.releasePorts(intent.id());
+                deviceResourceService.releaseMapping(intent.id());
             }
             }
-            // TODO: add other layers
         }
         }
     }
     }
 
 

@@ -18,13 +18,18 @@ package org.onosproject.cli.net;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Argument;
 import org.apache.karaf.shell.commands.Command;
 import org.apache.karaf.shell.commands.Command;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.OchPort;
+import org.onosproject.net.OduCltPort;
 import org.onosproject.net.OduSignalType;
 import org.onosproject.net.OduSignalType;
+import org.onosproject.net.Port;
+import org.onosproject.net.device.DeviceService;
 import org.onosproject.net.intent.Intent;
 import org.onosproject.net.intent.Intent;
 import org.onosproject.net.intent.IntentService;
 import org.onosproject.net.intent.IntentService;
+import org.onosproject.net.intent.OpticalCircuitIntent;
 import org.onosproject.net.intent.OpticalConnectivityIntent;
 import org.onosproject.net.intent.OpticalConnectivityIntent;
 
 
 /**
 /**
- * Installs optical connectivity intents.
+ * Installs optical connectivity or circuit intents, depending on given port types.
  */
  */
 @Command(scope = "onos", name = "add-optical-intent",
 @Command(scope = "onos", name = "add-optical-intent",
          description = "Installs optical connectivity intent")
          description = "Installs optical connectivity intent")
@@ -48,14 +53,33 @@ public class AddOpticalIntentCommand extends ConnectivityIntentCommand {
 
 
         ConnectPoint egress = ConnectPoint.deviceConnectPoint(egressDeviceString);
         ConnectPoint egress = ConnectPoint.deviceConnectPoint(egressDeviceString);
 
 
-        // FIXME: Hardcoded ODU signal type
-        Intent intent = OpticalConnectivityIntent.builder()
+        DeviceService deviceService = get(DeviceService.class);
+        Port srcPort = deviceService.getPort(ingress.deviceId(), ingress.port());
+        Port dstPort = deviceService.getPort(egress.deviceId(), egress.port());
+
+        Intent intent;
+        // FIXME: Hardcoded signal types
+        if (srcPort instanceof OduCltPort && dstPort instanceof OduCltPort) {
+            intent = OpticalCircuitIntent.builder()
+                    .appId(appId())
+                    .key(key())
+                    .src(ingress)
+                    .dst(egress)
+                    .signalType(OduCltPort.SignalType.CLT_10GBE)
+                    .build();
+        } else if (srcPort instanceof OchPort && dstPort instanceof OchPort) {
+            intent = OpticalConnectivityIntent.builder()
                     .appId(appId())
                     .appId(appId())
                     .key(key())
                     .key(key())
                     .src(ingress)
                     .src(ingress)
                     .dst(egress)
                     .dst(egress)
                     .signalType(OduSignalType.ODU4)
                     .signalType(OduSignalType.ODU4)
                     .build();
                     .build();
+        } else {
+            print("Unable to create optical intent between connect points {} and {}", ingress, egress);
+            return;
+        }
+
         service.submit(intent);
         service.submit(intent);
         print("Optical intent submitted:\n%s", intent.toString());
         print("Optical intent submitted:\n%s", intent.toString());
     }
     }

@@ -67,7 +67,12 @@ public interface DeviceResourceService {
      */
      */
     Set<IntentId> getMapping(IntentId intentId);
     Set<IntentId> getMapping(IntentId intentId);
 
 
-    void releaseMapping(IntentId keyIntentId, IntentId valIntentId);
+    /**
+     * Release mapping of given intent.
+     *
+     * @param intentId intent ID
+     */
+    void releaseMapping(IntentId intentId);
 
 
     /**
     /**
      * Release ports associated with given intent ID.
      * Release ports associated with given intent ID.

@@ -66,12 +66,11 @@ public interface DeviceResourceStore {
     Set<IntentId> getMapping(IntentId intentId);
     Set<IntentId> getMapping(IntentId intentId);
 
 
     /**
     /**
-     * Releases the mapping between the given intents.
+     * Releases the mapping of the given intent.
      *
      *
-     * @param keyIntentId key intent ID
-     * @param valIntentId value intent ID
+     * @param intentId intent ID
      */
      */
-    void releaseMapping(IntentId keyIntentId, IntentId valIntentId);
+    void releaseMapping(IntentId intentId);
 
 
     /**
     /**
      * Releases the ports allocated to the given intent.
      * Releases the ports allocated to the given intent.

@@ -73,8 +73,8 @@ public class DeviceResourceManager implements DeviceResourceService {
     }
     }
 
 
     @Override
     @Override
-    public void releaseMapping(IntentId keyIntentId, IntentId valIntentId) {
-        store.releaseMapping(keyIntentId, valIntentId);
+    public void releaseMapping(IntentId intentId) {
+        store.releaseMapping(intentId);
     }
     }
 
 
     @Override
     @Override

@@ -168,21 +168,6 @@ public class ConsistentDeviceResourceStore implements DeviceResourceStore {
     }
     }
 
 
     @Override
     @Override
-    public void releaseMapping(IntentId keyIntentId, IntentId valIntentId) {
-        if (!intentMapping.containsKey(keyIntentId)) {
-            return;
-        }
-
-        Set<IntentId> intents = intentMapping.get(keyIntentId).value();
-
-        try {
-            intents.remove(valIntentId);
-        } catch (Exception e) {
-            log.error("Trying to remove non-existing mapping {} {}", keyIntentId, valIntentId);
-        }
-    }
-
-    @Override
     public boolean allocateMapping(IntentId keyIntentId, IntentId valIntentId) {
     public boolean allocateMapping(IntentId keyIntentId, IntentId valIntentId) {
         Set<IntentId> intents = intentMapping.get(keyIntentId).value();
         Set<IntentId> intents = intentMapping.get(keyIntentId).value();
 
 
@@ -198,6 +183,17 @@ public class ConsistentDeviceResourceStore implements DeviceResourceStore {
     }
     }
 
 
     @Override
     @Override
+    public void releaseMapping(IntentId intentId) {
+        for (IntentId intent : intentMapping.keySet()) {
+            // TODO: optimize by checking for identical src & dst
+            Set<IntentId> mapping = intentMapping.get(intent).value();
+            if (mapping.remove(intentId)) {
+                return;
+            }
+        }
+    }
+
+    @Override
     public boolean releasePorts(IntentId intentId) {
     public boolean releasePorts(IntentId intentId) {
         checkNotNull(intentId);
         checkNotNull(intentId);