Merge branch 'optical-integration' of ssh://gerrit.onlab.us:29418/onos-next into optical-integration

@@ -3,7 +3,14 @@ package org.onlab.onos.net.resource;
 /**
  * Representation of allocated bandwidth resource.
  */
-public class BandwidthResourceAllocation extends BandwidthResourceRequest {
+public class BandwidthResourceAllocation extends BandwidthResourceRequest
+        implements ResourceAllocation {
+
+    @Override
+    public ResourceType type() {
+        return ResourceType.BANDWIDTH;
+    }
+
     /**
      * Creates a new {@link BandwidthResourceAllocation} with {@link Bandwidth}
      * object.

@@ -30,7 +30,7 @@ public class BandwidthResourceRequest implements ResourceRequest {
      *
      * @return the bandwidth resource
      */
-    Bandwidth bandwidth() {
+    public Bandwidth bandwidth() {
         return bandwidth;
     }
 }

+package org.onlab.onos.net.resource;
+
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.onlab.onos.net.Link;
+import org.onlab.onos.net.intent.IntentId;
+
+import com.google.common.collect.ImmutableSet;
+
+/**
+ * Implementation of {@link LinkResourceRequest}.
+ */
+public final class DefaultLinkResourceRequest implements LinkResourceRequest {
+
+    private final IntentId intentId;
+    private final Collection<Link> links;
+    private final Set<ResourceRequest> resources;
+
+    /**
+     * Creates a new link resource request with the given ID, links, and
+     * resource requests.
+     *
+     * @param intentId intent ID related to this request
+     * @param links a set of links for the request
+     * @param resources a set of resources to be requested
+     */
+    private DefaultLinkResourceRequest(IntentId intentId,
+            Collection<Link> links,
+            Set<ResourceRequest> resources) {
+        this.intentId = intentId;
+        this.links = ImmutableSet.copyOf(links);
+        this.resources = ImmutableSet.copyOf(resources);
+    }
+
+    @Override
+    public IntentId intendId() {
+        return intentId;
+    }
+
+    @Override
+    public Collection<Link> links() {
+        return links;
+    }
+
+    @Override
+    public Set<ResourceRequest> resources() {
+        return resources;
+    }
+
+    /**
+     * Returns builder of link resource request.
+     *
+     * @param intentId intent ID related to this request
+     * @param links a set of links for the request
+     * @return builder of link resource request
+     */
+    public static LinkResourceRequest.Builder builder(
+            IntentId intentId, Collection<Link> links) {
+        return new Builder(intentId, links);
+    }
+
+    /**
+     * Builder of link resource request.
+     */
+    public static final class Builder implements LinkResourceRequest.Builder {
+        private IntentId intentId;
+        private Collection<Link> links;
+        private Set<ResourceRequest> resources;
+
+        /**
+         * Creates a new link resource request.
+         *
+         * @param intentId intent ID related to this request
+         * @param links a set of links for the request
+         */
+        private Builder(IntentId intentId, Collection<Link> links) {
+            this.intentId = intentId;
+            this.links = links;
+            this.resources = new HashSet<>();
+        }
+
+        /**
+         * Adds lambda request.
+         *
+         * @return self
+         */
+        @Override
+        public Builder addLambdaRequest() {
+            resources.add(new LambdaResourceRequest());
+            return this;
+        }
+
+        /**
+         * Adds bandwidth request with bandwidth value.
+         *
+         * @param bandwidth bandwidth value to be requested
+         * @return self
+         */
+        @Override
+        public Builder addBandwidthRequest(double bandwidth) {
+            resources.add(new BandwidthResourceRequest(bandwidth));
+            return this;
+        }
+
+        /**
+         * Returns link resource request.
+         *
+         * @return link resource request
+         */
+        @Override
+        public LinkResourceRequest build() {
+            return new DefaultLinkResourceRequest(intentId, links, resources);
+        }
+    }
+
+}

@@ -3,9 +3,15 @@ package org.onlab.onos.net.resource;
 /**
  * Representation of allocated lambda resource.
  */
-public class LambdaResourceAllocation extends LambdaResourceRequest {
+public class LambdaResourceAllocation extends LambdaResourceRequest
+        implements ResourceAllocation {
     private final Lambda lambda;
 
+    @Override
+    public ResourceType type() {
+        return ResourceType.LAMBDA;
+    }
+
     /**
      * Creates a new {@link LambdaResourceAllocation} with {@link Lambda}
      * object.
@@ -21,7 +27,7 @@ public class LambdaResourceAllocation extends LambdaResourceRequest {
      *
      * @return the lambda resource
      */
-    Lambda lambda() {
+    public Lambda lambda() {
         return lambda;
     }
 }

 package org.onlab.onos.net.resource;
 
+import java.util.Set;
+
 import org.onlab.onos.net.Link;
 
 /**
  * Representation of allocated link resources.
  */
-public interface LinkResourceAllocations {
+public interface LinkResourceAllocations extends LinkResourceRequest {
     /**
      * Returns allocated resource for the given link.
      *
      * @param link the target link
      * @return allocated resource for the link
      */
-    ResourceAllocation getResourceAllocation(Link link);
+    Set<ResourceAllocation> getResourceAllocation(Link link);
 }

 package org.onlab.onos.net.resource;
 
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.Set;
 
 import org.onlab.onos.net.Link;
 import org.onlab.onos.net.intent.IntentId;
 
-import com.google.common.collect.ImmutableSet;
-
 /**
  * Representation of a request for link resource.
  */
-public final class LinkResourceRequest implements ResourceRequest {
-    // TODO: should this class be interface?
-
-    private final IntentId intentId;
-    private final Collection<Link> links;
-    private final Set<ResourceRequest> resources;
-
-    /**
-     * Creates a new link resource request with the given ID, links, and
-     * resource requests.
-     *
-     * @param intentId intent ID related to this request
-     * @param links a set of links for the request
-     * @param resources a set of resources to be requested
-     */
-    private LinkResourceRequest(IntentId intentId,
-            Collection<Link> links,
-            Set<ResourceRequest> resources) {
-        this.intentId = intentId;
-        this.links = ImmutableSet.copyOf(links);
-        this.resources = ImmutableSet.copyOf(resources);
-    }
+public interface LinkResourceRequest extends ResourceRequest {
 
     /**
      * Returns the {@link IntentId} associated with the request.
      *
      * @return the {@link IntentId} associated with the request
      */
-    IntentId intendId() {
-        return intentId;
-    }
+    IntentId intendId();
 
     /**
      * Returns the set of target links.
      *
      * @return the set of target links
      */
-    Collection<Link> links() {
-        return links;
-    }
+    Collection<Link> links();
 
     /**
      * Returns the set of resource requests.
      *
      * @return the set of resource requests
      */
-    Set<ResourceRequest> resources() {
-        return resources;
-    }
-
-    /**
-     * Returns builder of link resource request.
-     *
-     * @param intentId intent ID related to this request
-     * @param links a set of links for the request
-     * @return builder of link resource request
-     */
-    public static LinkResourceRequest.Builder builder(
-            IntentId intentId, Collection<Link> links) {
-        return new Builder(intentId, links);
-    }
+    Set<ResourceRequest> resources();
 
     /**
      * Builder of link resource request.
      */
-    public static final class Builder {
-        private IntentId intentId;
-        private Collection<Link> links;
-        private Set<ResourceRequest> resources;
-
-        /**
-         * Creates a new link resource request.
-         *
-         * @param intentId intent ID related to this request
-         * @param links a set of links for the request
-         */
-        private Builder(IntentId intentId, Collection<Link> links) {
-            this.intentId = intentId;
-            this.links = links;
-            this.resources = new HashSet<>();
-        }
-
-        /**
+    interface Builder {
+         /**
          * Adds lambda request.
          *
          * @return self
          */
-        public Builder addLambdaRequest() {
-            resources.add(new LambdaResourceRequest());
-            return this;
-        }
+        public Builder addLambdaRequest();
 
         /**
          * Adds bandwidth request with bandwidth value.
@@ -110,18 +49,13 @@ public final class LinkResourceRequest implements ResourceRequest {
          * @param bandwidth bandwidth value to be requested
          * @return self
          */
-        public Builder addBandwidthRequest(double bandwidth) {
-            resources.add(new BandwidthResourceRequest(bandwidth));
-            return this;
-        }
+        public Builder addBandwidthRequest(double bandwidth);
 
         /**
          * Returns link resource request.
          *
          * @return link resource request
          */
-        public LinkResourceRequest build() {
-            return new LinkResourceRequest(intentId, links, resources);
-        }
+        public LinkResourceRequest build();
     }
 }

@@ -5,4 +5,10 @@ package org.onlab.onos.net.resource;
  */
 public interface ResourceAllocation extends ResourceRequest {
 
+    /**
+     * Returns the type of the allocated resource.
+     *
+     * @return the type of the allocated resource
+     */
+    ResourceType type();
 }

+package org.onlab.onos.net.resource;
+
+public enum ResourceType {
+    LAMBDA,
+    BANDWIDTH,
+}