add key parameter to PathIntent and MplsPathIntent constructors

Change-Id: I157c1e3e10dc3e3ebc1dbc6f9a1c9fe769337ee3

@@ -42,6 +42,7 @@ public final class MplsPathIntent extends PathIntent {
      * ports and using the specified explicit path.
      * ports and using the specified explicit path.
      *
      *
      * @param appId application identifier
      * @param appId application identifier
+     * @param key intent key
      * @param selector traffic selector
      * @param selector traffic selector
      * @param treatment treatment
      * @param treatment treatment
      * @param path traversed links
      * @param path traversed links
@@ -51,11 +52,11 @@ public final class MplsPathIntent extends PathIntent {
      * @param priority    priority to use for flows generated by this intent
      * @param priority    priority to use for flows generated by this intent
      * @throws NullPointerException {@code path} is null
      * @throws NullPointerException {@code path} is null
      */
      */
-    private MplsPathIntent(ApplicationId appId, TrafficSelector selector,
+    private MplsPathIntent(ApplicationId appId, Key key, TrafficSelector selector,
             TrafficTreatment treatment, Path path, Optional<MplsLabel> ingressLabel,
             TrafficTreatment treatment, Path path, Optional<MplsLabel> ingressLabel,
             Optional<MplsLabel> egressLabel, List<Constraint> constraints,
             Optional<MplsLabel> egressLabel, List<Constraint> constraints,
             int priority) {
             int priority) {
-        super(appId, selector, treatment, path, constraints,
+        super(appId, key, selector, treatment, path, constraints,
               priority);
               priority);
 
 
         this.ingressLabel = checkNotNull(ingressLabel);
         this.ingressLabel = checkNotNull(ingressLabel);
@@ -149,6 +150,7 @@ public final class MplsPathIntent extends PathIntent {
 
 
             return new MplsPathIntent(
             return new MplsPathIntent(
                     appId,
                     appId,
+                    key,
                     selector,
                     selector,
                     treatment,
                     treatment,
                     path,
                     path,

@@ -42,6 +42,7 @@ public class PathIntent extends ConnectivityIntent {
      * ports and using the specified explicit path.
      * ports and using the specified explicit path.
      *
      *
      * @param appId     application identifier
      * @param appId     application identifier
+     * @param key       intent key
      * @param selector  traffic selector
      * @param selector  traffic selector
      * @param treatment treatment
      * @param treatment treatment
      * @param path      traversed links
      * @param path      traversed links
@@ -50,12 +51,13 @@ public class PathIntent extends ConnectivityIntent {
      * @throws NullPointerException {@code path} is null
      * @throws NullPointerException {@code path} is null
      */
      */
     protected PathIntent(ApplicationId appId,
     protected PathIntent(ApplicationId appId,
+                         Key key,
                          TrafficSelector selector,
                          TrafficSelector selector,
                          TrafficTreatment treatment,
                          TrafficTreatment treatment,
                          Path path,
                          Path path,
                          List<Constraint> constraints,
                          List<Constraint> constraints,
                          int priority) {
                          int priority) {
-        super(appId, null, resources(path.links()), selector, treatment, constraints,
+        super(appId, key, resources(path.links()), selector, treatment, constraints,
                 priority);
                 priority);
         PathIntent.validate(path.links());
         PathIntent.validate(path.links());
         this.path = path;
         this.path = path;
@@ -138,6 +140,7 @@ public class PathIntent extends ConnectivityIntent {
 
 
             return new PathIntent(
             return new PathIntent(
                     appId,
                     appId,
+                    key,
                     selector,
                     selector,
                     treatment,
                     treatment,
                     path,
                     path,
@@ -184,6 +187,7 @@ public class PathIntent extends ConnectivityIntent {
     public String toString() {
     public String toString() {
         return MoreObjects.toStringHelper(getClass())
         return MoreObjects.toStringHelper(getClass())
                 .add("id", id())
                 .add("id", id())
+                .add("key", key())
                 .add("appId", appId())
                 .add("appId", appId())
                 .add("priority", priority())
                 .add("priority", priority())
                 .add("resources", resources())
                 .add("resources", resources())

@@ -33,6 +33,7 @@ import org.onosproject.net.flow.TrafficTreatment;
 public abstract class ConnectivityIntentTest extends IntentTest {
 public abstract class ConnectivityIntentTest extends IntentTest {
 
 
     public static final ApplicationId APPID = new TestApplicationId("foo");
     public static final ApplicationId APPID = new TestApplicationId("foo");
+    public static final Key KEY = Key.of(1L, APPID);
 
 
     public static final IntentId IID = new IntentId(123);
     public static final IntentId IID = new IntentId(123);
     public static final TrafficSelector MATCH = DefaultTrafficSelector.emptySelector();
     public static final TrafficSelector MATCH = DefaultTrafficSelector.emptySelector();

@@ -112,6 +112,5 @@ public class MplsIntentTest extends AbstractIntentTest {
         assertThat(intent1.selector(), equalTo(intent2.selector()));
         assertThat(intent1.selector(), equalTo(intent2.selector()));
         assertThat(intent1.treatment(), equalTo(intent2.treatment()));
         assertThat(intent1.treatment(), equalTo(intent2.treatment()));
         assertThat(intent1.priority(), is(PRIORITY));
         assertThat(intent1.priority(), is(PRIORITY));
-
     }
     }
 }
 }

@@ -47,6 +47,7 @@ public class MplsPathIntentTest extends AbstractIntentTest {
     Optional<MplsLabel> label2;
     Optional<MplsLabel> label2;
     TrafficSelector selector;
     TrafficSelector selector;
     TrafficTreatment treatment;
     TrafficTreatment treatment;
+    static final Key KEY1 = Key.of(5L, APP_ID);
 
 
     @Before
     @Before
     public void mplsPathIntentTestSetUp() {
     public void mplsPathIntentTestSetUp() {
@@ -58,6 +59,7 @@ public class MplsPathIntentTest extends AbstractIntentTest {
         label2 = Optional.of(MplsLabel.mplsLabel(2));
         label2 = Optional.of(MplsLabel.mplsLabel(2));
         intent1 = MplsPathIntent.builder()
         intent1 = MplsPathIntent.builder()
                 .appId(APP_ID)
                 .appId(APP_ID)
+                .key(KEY1)
                 .ingressLabel(label1)
                 .ingressLabel(label1)
                 .egressLabel(label2)
                 .egressLabel(label2)
                 .path(defaultPath)
                 .path(defaultPath)
@@ -105,6 +107,7 @@ public class MplsPathIntentTest extends AbstractIntentTest {
         assertThat(intent1.treatment(), equalTo(intent2.treatment()));
         assertThat(intent1.treatment(), equalTo(intent2.treatment()));
         assertThat(intent1.priority(), is(PRIORITY));
         assertThat(intent1.priority(), is(PRIORITY));
         assertThat(intent1.path(), is(defaultPath));
         assertThat(intent1.path(), is(defaultPath));
+        assertThat(intent1.key(), equalTo(KEY1));
     }
     }
 
 
 }
 }

@@ -62,12 +62,14 @@ public class PathIntentTest extends ConnectivityIntentTest {
         assertEquals("incorrect match", MATCH, intent.selector());
         assertEquals("incorrect match", MATCH, intent.selector());
         assertEquals("incorrect action", NOP, intent.treatment());
         assertEquals("incorrect action", NOP, intent.treatment());
         assertEquals("incorrect path", PATH1, intent.path());
         assertEquals("incorrect path", PATH1, intent.path());
+        assertEquals("incorrect key", KEY, intent.key());
     }
     }
 
 
     @Override
     @Override
     protected PathIntent createOne() {
     protected PathIntent createOne() {
         return PathIntent.builder()
         return PathIntent.builder()
                 .appId(APPID)
                 .appId(APPID)
+                .key(KEY)
                 .selector(MATCH)
                 .selector(MATCH)
                 .treatment(NOP)
                 .treatment(NOP)
                 .path(PATH1)
                 .path(PATH1)

@@ -63,6 +63,7 @@ public class PropertyPanelTest {
     private static final String KEY_C = "C";
     private static final String KEY_C = "C";
     private static final String SEP = "-";
     private static final String SEP = "-";
     private static final String KEY_Z = "Z";
     private static final String KEY_Z = "Z";
+
     private static final String VALUE_A = "Hay";
     private static final String VALUE_A = "Hay";
     private static final String VALUE_B = "Bee";
     private static final String VALUE_B = "Bee";
     private static final String VALUE_C = "Sea";
     private static final String VALUE_C = "Sea";
@@ -155,8 +156,8 @@ public class PropertyPanelTest {
     public void props() {
     public void props() {
         basic();
         basic();
         pp.addProp(KEY_A, VALUE_A)
         pp.addProp(KEY_A, VALUE_A)
-            .addProp(KEY_B, VALUE_B)
-            .addProp(KEY_C, VALUE_C);
+                .addProp(KEY_B, VALUE_B)
+                .addProp(KEY_C, VALUE_C);
         assertEquals("bad props", 3, pp.properties().size());
         assertEquals("bad props", 3, pp.properties().size());
         validateProps(KEY_A, KEY_B, KEY_C);
         validateProps(KEY_A, KEY_B, KEY_C);
     }
     }
@@ -165,7 +166,7 @@ public class PropertyPanelTest {
     public void separator() {
     public void separator() {
         props();
         props();
         pp.addSeparator()
         pp.addSeparator()
-            .addProp(KEY_Z, VALUE_Z);
+                .addProp(KEY_Z, VALUE_Z);
 
 
         assertEquals("bad props", 5, pp.properties().size());
         assertEquals("bad props", 5, pp.properties().size());
         validateProps(KEY_A, KEY_B, KEY_C, SEP, KEY_Z);
         validateProps(KEY_A, KEY_B, KEY_C, SEP, KEY_Z);
@@ -191,8 +192,8 @@ public class PropertyPanelTest {
     public void intValues() {
     public void intValues() {
         basic();
         basic();
         pp.addProp(KEY_A, 200)
         pp.addProp(KEY_A, 200)
-          .addProp(KEY_B, 2000)
-          .addProp(KEY_C, 1234567);
+                .addProp(KEY_B, 2000)
+                .addProp(KEY_C, 1234567);
 
 
         validateProp(KEY_A, "200");
         validateProp(KEY_A, "200");
         validateProp(KEY_B, "2,000");
         validateProp(KEY_B, "2,000");
@@ -203,9 +204,9 @@ public class PropertyPanelTest {
     public void longValues() {
     public void longValues() {
         basic();
         basic();
         pp.addProp(KEY_A, 200L)
         pp.addProp(KEY_A, 200L)
-          .addProp(KEY_B, 2000L)
-          .addProp(KEY_C, 1234567L)
-          .addProp(KEY_Z, Long.MAX_VALUE);
+                .addProp(KEY_B, 2000L)
+                .addProp(KEY_C, 1234567L)
+                .addProp(KEY_Z, Long.MAX_VALUE);
 
 
         validateProp(KEY_A, "200");
         validateProp(KEY_A, "200");
         validateProp(KEY_B, "2,000");
         validateProp(KEY_B, "2,000");
@@ -217,7 +218,7 @@ public class PropertyPanelTest {
     public void objectValue() {
     public void objectValue() {
         basic();
         basic();
         pp.addProp(KEY_A, new FooClass("a"))
         pp.addProp(KEY_A, new FooClass("a"))
-            .addProp(KEY_B, new FooClass("bxyyzy"), "[xz]");
+                .addProp(KEY_B, new FooClass("bxyyzy"), "[xz]");
 
 
         validateProp(KEY_A, ">a<");
         validateProp(KEY_A, ">a<");
         validateProp(KEY_B, ">byyy<");
         validateProp(KEY_B, ">byyy<");