Make MPLS label request specifiable for a particular MPLS label

Change-Id: I4626229040c61e927a468ab5c486a907af0108ae

Make MPLS label request specifiable for a particular MPLS label
Change-Id: I4626229040c61e927a468ab5c486a907af0108ae
Sho SHIMIZU · Gerrit Code Review
Commit 81cdc395b77a4bbcbac279f22d54cbc02b17bcd2 81cdc395 1 parent 36163f94
Showing 4 changed files with 148 additions and 40 deletions
core/api/src/main/java/org/onosproject/net/resource/link/DefaultLinkResourceRequest.java
core/api/src/main/java/org/onosproject/net/resource/link/LinkResourceRequest.java
core/api/src/main/java/org/onosproject/net/resource/link/MplsLabelResourceRequest.java
core/net/src/main/java/org/onosproject/net/resource/impl/LinkResourceManager.java
--- a/core/api/src/main/java/org/onosproject/net/resource/link/DefaultLinkResourceRequest.java
View file @81cdc39
+++ b/core/api/src/main/java/org/onosproject/net/resource/link/DefaultLinkResourceRequest.java
View file @81cdc39
@@ -16,49 +16,47 @@
 package org.onosproject.net.resource.link;
 import java.util.Collection;
+import java.util.HashMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Set;
 import java.util.Objects;
+import java.util.stream.Collectors;
 import com.google.common.annotations.Beta;
+import com.google.common.collect.ImmutableMap;
 import org.onlab.util.Bandwidth;
 import org.onosproject.net.Link;
 import org.onosproject.net.intent.Constraint;
 import org.onosproject.net.intent.IntentId;
-import com.google.common.collect.ImmutableSet;
-
 import org.onosproject.net.intent.constraint.BandwidthConstraint;
 import org.onosproject.net.intent.constraint.LambdaConstraint;
 import org.onosproject.net.resource.ResourceRequest;
 import org.onosproject.net.resource.ResourceType;
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Implementation of {@link LinkResourceRequest}.
  */
 public final class DefaultLinkResourceRequest implements LinkResourceRequest {
     private final IntentId intentId;
-    private final Collection<Link> links;
+    protected final Map<Link, Set<ResourceRequest>> requests;
-    private final Set<ResourceRequest> resources;
     /**
-     * Creates a new link resource request with the given ID, links, and
+     * Creates a new link resource request with the specified Intent ID,
-     * resource requests.
+     * and resource requests over links.
      *
-     * @param intentId intent ID related to this request
+     * @param intentId intent ID associated with this request
-     * @param links a set of links for the request
+     * @param requests resource requests over links
-     * @param resources a set of resources to be requested
      */
-    private DefaultLinkResourceRequest(IntentId intentId,
+    private DefaultLinkResourceRequest(IntentId intentId, Map<Link, Set<ResourceRequest>> requests) {
-            Collection<Link> links,
+        this.intentId = checkNotNull(intentId);
-            Set<ResourceRequest> resources) {
+        this.requests = checkNotNull(ImmutableMap.copyOf(requests));
-        this.intentId = intentId;
-        this.links = ImmutableSet.copyOf(links);
-        this.resources = ImmutableSet.copyOf(resources);
     }
-
     @Override
     public ResourceType type() {
         return null;
@@ -71,12 +69,19 @@ public final class DefaultLinkResourceRequest implements LinkResourceRequest {
     @Override
     public Collection<Link> links() {
-        return links;
+        return requests.keySet();
     }
     @Override
     public Set<ResourceRequest> resources() {
-        return resources;
+        return requests.values().stream()
+                .flatMap(Collection::stream)
+                .collect(Collectors.toSet());
+    }
+
+    @Override
+    public Set<ResourceRequest> resources(Link link) {
+        return requests.get(link);
     }
     /**
@@ -96,8 +101,7 @@ public final class DefaultLinkResourceRequest implements LinkResourceRequest {
      */
     public static final class Builder implements LinkResourceRequest.Builder {
         private IntentId intentId;
-        private Collection<Link> links;
+        private Map<Link, Set<ResourceRequest>> requests;
-        private Set<ResourceRequest> resources;
         /**
          * Creates a new link resource request.
@@ -107,8 +111,10 @@ public final class DefaultLinkResourceRequest implements LinkResourceRequest {
          */
         private Builder(IntentId intentId, Collection<Link> links) {
             this.intentId = intentId;
-            this.links = links;
+            this.requests = new HashMap<>();
-            this.resources = new HashSet<>();
+            for (Link link : links) {
+                requests.put(link, new HashSet<>());
+            }
         }
         /**
@@ -120,14 +126,18 @@ public final class DefaultLinkResourceRequest implements LinkResourceRequest {
         @Deprecated
         @Override
         public Builder addLambdaRequest() {
-            resources.add(new LambdaResourceRequest());
+            for (Link link : requests.keySet()) {
+                requests.get(link).add(new LambdaResourceRequest());
+            }
             return this;
         }
         @Beta
         @Override
         public LinkResourceRequest.Builder addLambdaRequest(LambdaResource lambda) {
-            resources.add(new LambdaResourceRequest(lambda));
+            for (Link link : requests.keySet()) {
+                requests.get(link).add(new LambdaResourceRequest(lambda));
+            }
             return this;
         }
@@ -135,10 +145,36 @@ public final class DefaultLinkResourceRequest implements LinkResourceRequest {
          * Adds Mpls request.
          *
          * @return self
+         * @deprecated in Emu Release
          */
+        @Deprecated
         @Override
         public Builder addMplsRequest() {
-            resources.add(new MplsLabelResourceRequest());
+            for (Link link : requests.keySet()) {
+                requests.get(link).add(new MplsLabelResourceRequest());
+            }
+            return this;
+        }
+
+        @Beta
+        @Override
+        public Builder addMplsRequest(MplsLabel label) {
+            for (Link link : requests.keySet()) {
+                requests.get(link).add(new MplsLabelResourceRequest(label));
+            }
+            return this;
+        }
+
+        @Beta
+        @Override
+        public LinkResourceRequest.Builder addMplsRequest(Map<Link, MplsLabel> labels) {
+            for (Link link : labels.keySet()) {
+                if (!requests.containsKey(link)) {
+                    requests.put(link, new HashSet<>());
+                }
+                requests.get(link).add(new MplsLabelResourceRequest(labels.get(link)));
+            }
+
             return this;
         }
@@ -150,7 +186,9 @@ public final class DefaultLinkResourceRequest implements LinkResourceRequest {
          */
         @Override
         public Builder addBandwidthRequest(double bandwidth) {
-            resources.add(new BandwidthResourceRequest(new BandwidthResource(Bandwidth.bps(bandwidth))));
+            for (Link link : requests.keySet()) {
+                requests.get(link).add(new BandwidthResourceRequest(new BandwidthResource(Bandwidth.bps(bandwidth))));
+            }
             return this;
         }
@@ -172,13 +210,13 @@ public final class DefaultLinkResourceRequest implements LinkResourceRequest {
          */
         @Override
         public LinkResourceRequest build() {
-            return new DefaultLinkResourceRequest(intentId, links, resources);
+            return new DefaultLinkResourceRequest(intentId, requests);
         }
     }
     @Override
     public int hashCode() {
-        return Objects.hash(intentId, links);
+        return Objects.hash(intentId, links());
     }
     @Override
@@ -191,6 +229,6 @@ public final class DefaultLinkResourceRequest implements LinkResourceRequest {
         }
         final DefaultLinkResourceRequest other = (DefaultLinkResourceRequest) obj;
         return Objects.equals(this.intentId, other.intentId)
-                && Objects.equals(this.links, other.links);
+                && Objects.equals(this.links(), other.links());
     }
 }
--- a/core/api/src/main/java/org/onosproject/net/resource/link/LinkResourceRequest.java
View file @81cdc39
+++ b/core/api/src/main/java/org/onosproject/net/resource/link/LinkResourceRequest.java
View file @81cdc39
@@ -15,15 +15,16 @@
  */
 package org.onosproject.net.resource.link;
+import java.util.Collection;
+import java.util.Map;
+import java.util.Set;
+
 import com.google.common.annotations.Beta;
 import org.onosproject.net.Link;
 import org.onosproject.net.intent.Constraint;
 import org.onosproject.net.intent.IntentId;
 import org.onosproject.net.resource.ResourceRequest;
-import java.util.Collection;
-import java.util.Set;
-
 /**
  * Representation of a request for link resource.
  */
@@ -51,6 +52,15 @@ public interface LinkResourceRequest extends ResourceRequest {
     Set<ResourceRequest> resources();
     /**
+     * Returns the set of resource request against the specified link.
+     *
+     * @param link link whose associated resource request is to be returned
+     * @return set of resource request against the specified link
+     */
+    @Beta
+    Set<ResourceRequest> resources(Link link);
+
+    /**
      * Builder of link resource request.
      */
     interface Builder {
@@ -76,10 +86,30 @@ public interface LinkResourceRequest extends ResourceRequest {
          * Adds MPLS request.
          *
          * @return self
+         * @deprecated in Emu Release
          */
+        @Deprecated
         Builder addMplsRequest();
         /**
+         * Adds MPLS request.
+         *
+         * @param label MPLS label to be requested
+         * @return self
+         */
+        @Beta
+        Builder addMplsRequest(MplsLabel label);
+
+        /**
+         * Adds MPLS request against the specified links.
+         *
+         * @param labels MPLS labels to be requested against links
+         * @return self
+         */
+        @Beta
+        Builder addMplsRequest(Map<Link, MplsLabel> labels);
+
+        /**
          * Adds bandwidth request with bandwidth value.
          *
          * @param bandwidth bandwidth value to be requested
--- a/core/api/src/main/java/org/onosproject/net/resource/link/MplsLabelResourceRequest.java
View file @81cdc39
+++ b/core/api/src/main/java/org/onosproject/net/resource/link/MplsLabelResourceRequest.java
View file @81cdc39
@@ -15,15 +15,50 @@
  */
 package org.onosproject.net.resource.link;
+import com.google.common.annotations.Beta;
 import com.google.common.base.MoreObjects;
 import org.onosproject.net.resource.ResourceRequest;
 import org.onosproject.net.resource.ResourceType;
+import static com.google.common.base.Preconditions.checkNotNull;
+
 /**
  * Representation of a request for lambda resource.
  */
 public class MplsLabelResourceRequest implements ResourceRequest {
+    private final MplsLabel mplsLabel;
+
+    /**
+     * Constructs a request specifying the given MPLS label.
+     *
+     * @param mplsLabel MPLS label to be requested
+     */
+    @Beta
+    public MplsLabelResourceRequest(MplsLabel mplsLabel) {
+        this.mplsLabel = checkNotNull(mplsLabel);
+    }
+
+    /**
+     * Constructs a request asking an arbitrary available MPLS label.
+     *
+     * @deprecated in Emu Release
+     */
+    @Deprecated
+    public MplsLabelResourceRequest() {
+        this.mplsLabel = null;
+    }
+
+    /**
+     * Returns the MPLS label this request expects.
+     *
+     * @return the MPLS label this request expects
+     */
+    @Beta
+    public MplsLabel mplsLabel() {
+        return mplsLabel;
+    }
+
     @Override
     public ResourceType type() {
         return ResourceType.MPLS_LABEL;
@@ -32,6 +67,7 @@ public class MplsLabelResourceRequest implements ResourceRequest {
     @Override
     public String toString() {
         return MoreObjects.toStringHelper(this)
+                .add("mplsLabel", mplsLabel)
                 .toString();
     }
 }
--- a/core/net/src/main/java/org/onosproject/net/resource/impl/LinkResourceManager.java
View file @81cdc39
+++ b/core/net/src/main/java/org/onosproject/net/resource/impl/LinkResourceManager.java
View file @81cdc39
@@ -48,8 +48,8 @@ import org.slf4j.Logger;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import static org.onosproject.security.AppGuard.checkPermission;
@@ -130,12 +130,15 @@ public class LinkResourceManager
                     if (allocsPerLink.get(link) == null) {
                         allocsPerLink.put(link, new HashSet<>());
                     }
-                    Iterator<MplsLabel> mplsIter = getAvailableMplsLabels(link)
+
-                            .iterator();
+                    Optional<MplsLabel> label = req.resources(link).stream()
-                    if (mplsIter.hasNext()) {
+                            .filter(x -> x.type() == ResourceType.MPLS_LABEL)
-                        allocsPerLink.get(link)
+                            .map(x -> (MplsLabelResourceRequest) x)
-                                .add(new MplsLabelResourceAllocation(mplsIter
+                            .map(MplsLabelResourceRequest::mplsLabel)
-                                             .next()));
+                            .findFirst();
+
+                    if (label.isPresent()) {
+                        allocsPerLink.get(link).add(new MplsLabelResourceAllocation(label.get()));
                     } else {
                         log.info("Failed to allocate MPLS resource.");
                         break;
@@ -214,7 +217,8 @@ public class LinkResourceManager
                         ((LambdaResourceAllocation) alloc).lambda()));
                 break;
             case MPLS_LABEL:
-                result.add(new MplsLabelResourceRequest());
+                result.add(new MplsLabelResourceRequest(
+                        ((MplsLabelResourceAllocation) alloc).mplsLabel()));
                 break;
             default:
                 break;