Add resources into intent toString() outputs.

Change-Id: Id3903a89e77073c5fa74b48851716b95adfc72de

@@ -126,6 +126,7 @@ public final class HostToHostIntent extends ConnectivityIntent {
         return MoreObjects.toStringHelper(getClass())
                 .add("id", id())
                 .add("appId", appId())
+                .add("resources", resources())
                 .add("selector", selector())
                 .add("treatment", treatment())
                 .add("constraints", constraints())

@@ -143,6 +143,7 @@ public final class LinkCollectionIntent extends ConnectivityIntent {
         return MoreObjects.toStringHelper(getClass())
                 .add("id", id())
                 .add("appId", appId())
+                .add("resources", resources())
                 .add("selector", selector())
                 .add("treatment", treatment())
                 .add("links", links())

@@ -125,6 +125,7 @@ public final class MultiPointToSinglePointIntent extends ConnectivityIntent {
         return MoreObjects.toStringHelper(getClass())
                 .add("id", id())
                 .add("appId", appId())
+                .add("resources", resources())
                 .add("selector", selector())
                 .add("treatment", treatment())
                 .add("ingress", ingressPoints())

@@ -15,15 +15,14 @@
  */
 package org.onosproject.net.intent;
 
-import java.util.Collection;
-
+import com.google.common.base.MoreObjects;
+import com.google.common.collect.ImmutableSet;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.Link;
 import org.onosproject.net.Path;
 
-import com.google.common.base.MoreObjects;
-import com.google.common.collect.ImmutableSet;
+import java.util.Collection;
 
 public class OpticalPathIntent extends Intent {
 
@@ -69,6 +68,8 @@ public class OpticalPathIntent extends Intent {
     public String toString() {
         return MoreObjects.toStringHelper(getClass())
                 .add("id", id())
+                .add("appId", appId())
+                .add("resources", resources())
                 .add("ingressPort", src)
                 .add("egressPort", dst)
                 .add("path", path)

@@ -15,9 +15,6 @@
  */
 package org.onosproject.net.intent;
 
-import java.util.Collections;
-import java.util.List;
-
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Predicate;
 import com.google.common.collect.Iterables;
@@ -27,6 +24,9 @@ import org.onosproject.net.Path;
 import org.onosproject.net.flow.TrafficSelector;
 import org.onosproject.net.flow.TrafficTreatment;
 
+import java.util.Collections;
+import java.util.List;
+
 import static com.google.common.base.Preconditions.checkArgument;
 
 /**
@@ -123,6 +123,7 @@ public class PathIntent extends ConnectivityIntent {
         return MoreObjects.toStringHelper(getClass())
                 .add("id", id())
                 .add("appId", appId())
+                .add("resources", resources())
                 .add("selector", selector())
                 .add("treatment", treatment())
                 .add("constraints", constraints())

@@ -118,6 +118,7 @@ public class PointToPointIntent extends ConnectivityIntent {
         return MoreObjects.toStringHelper(getClass())
                 .add("id", id())
                 .add("appId", appId())
+                .add("resources", resources())
                 .add("selector", selector())
                 .add("treatment", treatment())
                 .add("ingress", ingressPoint)

@@ -119,6 +119,7 @@ public class SinglePointToMultiPointIntent extends ConnectivityIntent {
         return MoreObjects.toStringHelper(getClass())
                 .add("id", id())
                 .add("appId", appId())
+                .add("resources", resources())
                 .add("selector", selector())
                 .add("treatment", treatment())
                 .add("ingress", ingressPoint)