Adding resource-{available,allocated} CLI commands and lots of toStrings
Change-Id: Ib23eda2d9feb523e23dc33fb437994267b4cc555
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/BandwidthResourceAllocation.java b/core/api/src/main/java/org/onlab/onos/net/resource/BandwidthResourceAllocation.java
index e540db2..62051ad 100644
--- a/core/api/src/main/java/org/onlab/onos/net/resource/BandwidthResourceAllocation.java
+++ b/core/api/src/main/java/org/onlab/onos/net/resource/BandwidthResourceAllocation.java
@@ -15,6 +15,8 @@
*/
package org.onlab.onos.net.resource;
+import com.google.common.base.MoreObjects;
+
/**
* Representation of allocated bandwidth resource.
*/
@@ -35,4 +37,11 @@
public BandwidthResourceAllocation(Bandwidth bandwidth) {
super(bandwidth);
}
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this)
+ .add("bandwidth", bandwidth())
+ .toString();
+ }
}
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/BandwidthResourceRequest.java b/core/api/src/main/java/org/onlab/onos/net/resource/BandwidthResourceRequest.java
index cced791..52b4112 100644
--- a/core/api/src/main/java/org/onlab/onos/net/resource/BandwidthResourceRequest.java
+++ b/core/api/src/main/java/org/onlab/onos/net/resource/BandwidthResourceRequest.java
@@ -15,6 +15,8 @@
*/
package org.onlab.onos.net.resource;
+import com.google.common.base.MoreObjects;
+
/**
* Representation of a request for bandwidth resource.
*/
@@ -53,4 +55,11 @@
public ResourceType type() {
return ResourceType.BANDWIDTH;
}
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this)
+ .add("bandwidth", bandwidth)
+ .toString();
+ }
}
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LambdaResourceAllocation.java b/core/api/src/main/java/org/onlab/onos/net/resource/LambdaResourceAllocation.java
index 1c81f1f..9032cc4 100644
--- a/core/api/src/main/java/org/onlab/onos/net/resource/LambdaResourceAllocation.java
+++ b/core/api/src/main/java/org/onlab/onos/net/resource/LambdaResourceAllocation.java
@@ -15,6 +15,8 @@
*/
package org.onlab.onos.net.resource;
+import com.google.common.base.MoreObjects;
+
import java.util.Objects;
/**
@@ -64,4 +66,11 @@
final LambdaResourceAllocation other = (LambdaResourceAllocation) obj;
return Objects.equals(this.lambda, other.lambda);
}
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this)
+ .add("lambda", lambda)
+ .toString();
+ }
}
diff --git a/core/api/src/main/java/org/onlab/onos/net/resource/LambdaResourceRequest.java b/core/api/src/main/java/org/onlab/onos/net/resource/LambdaResourceRequest.java
index 382758a..dab8793 100644
--- a/core/api/src/main/java/org/onlab/onos/net/resource/LambdaResourceRequest.java
+++ b/core/api/src/main/java/org/onlab/onos/net/resource/LambdaResourceRequest.java
@@ -15,6 +15,8 @@
*/
package org.onlab.onos.net.resource;
+import com.google.common.base.MoreObjects;
+
/**
* Representation of a request for lambda resource.
*/
@@ -25,4 +27,9 @@
return ResourceType.LAMBDA;
}
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this)
+ .toString();
+ }
}
diff --git a/core/net/src/main/java/org/onlab/onos/net/resource/impl/DefaultLinkResourceAllocations.java b/core/net/src/main/java/org/onlab/onos/net/resource/impl/DefaultLinkResourceAllocations.java
index 28ace88..13e02e5 100644
--- a/core/net/src/main/java/org/onlab/onos/net/resource/impl/DefaultLinkResourceAllocations.java
+++ b/core/net/src/main/java/org/onlab/onos/net/resource/impl/DefaultLinkResourceAllocations.java
@@ -15,11 +15,7 @@
*/
package org.onlab.onos.net.resource.impl;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-
+import com.google.common.base.MoreObjects;
import org.onlab.onos.net.Link;
import org.onlab.onos.net.intent.IntentId;
import org.onlab.onos.net.resource.LinkResourceAllocations;
@@ -28,6 +24,11 @@
import org.onlab.onos.net.resource.ResourceRequest;
import org.onlab.onos.net.resource.ResourceType;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+
/**
* Implementation of {@link LinkResourceAllocations}.
*/
@@ -38,11 +39,11 @@
/**
* Creates a new link resource allocations.
*
- * @param request requested resources
+ * @param request requested resources
* @param allocations allocated resources
*/
DefaultLinkResourceAllocations(LinkResourceRequest request,
- Map<Link, Set<ResourceAllocation>> allocations) {
+ Map<Link, Set<ResourceAllocation>> allocations) {
this.request = request;
this.allocations = allocations;
}
@@ -76,4 +77,10 @@
return result;
}
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this)
+ .add("allocations", allocations)
+ .toString();
+ }
}