Adding STC scenario for testing host intent-based connectivity.

Change-Id: I7375a9fdb121a6a288df5d54a23cfbd9d54258f3

@@ -33,6 +33,7 @@ import java.util.Objects;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeUnit;
 
 
+import static com.google.common.base.Strings.isNullOrEmpty;
 import static org.onosproject.net.intent.IntentState.FAILED;
 import static org.onosproject.net.intent.IntentState.FAILED;
 import static org.onosproject.net.intent.IntentState.WITHDRAWN;
 import static org.onosproject.net.intent.IntentState.WITHDRAWN;
 
 
@@ -45,12 +46,12 @@ public class IntentRemoveCommand extends AbstractShellCommand {
 
 
     @Argument(index = 0, name = "app",
     @Argument(index = 0, name = "app",
             description = "Application ID",
             description = "Application ID",
-              required = true, multiValued = false)
+            required = false, multiValued = false)
     String applicationIdString = null;
     String applicationIdString = null;
 
 
     @Argument(index = 1, name = "key",
     @Argument(index = 1, name = "key",
             description = "Intent Key",
             description = "Intent Key",
-              required = true, multiValued = false)
+            required = false, multiValued = false)
     String keyString = null;
     String keyString = null;
 
 
     @Option(name = "-p", aliases = "--purge",
     @Option(name = "-p", aliases = "--purge",
@@ -69,7 +70,7 @@ public class IntentRemoveCommand extends AbstractShellCommand {
         CoreService coreService = get(CoreService.class);
         CoreService coreService = get(CoreService.class);
 
 
         ApplicationId appId = appId();
         ApplicationId appId = appId();
-        if (applicationIdString != null) {
+        if (!isNullOrEmpty(applicationIdString)) {
             appId = coreService.getAppId(applicationIdString);
             appId = coreService.getAppId(applicationIdString);
             if (appId == null) {
             if (appId == null) {
                 print("Cannot find application Id %s", applicationIdString);
                 print("Cannot find application Id %s", applicationIdString);
@@ -77,6 +78,14 @@ public class IntentRemoveCommand extends AbstractShellCommand {
             }
             }
         }
         }
 
 
+        if (isNullOrEmpty(keyString)) {
+            for (Intent intent : intentService.getIntents()) {
+                if (intent.appId().equals(appId)) {
+                    removeIntent(intentService, intent);
+                }
+            }
+
+        } else {
             final Key key;
             final Key key;
             if (keyString.startsWith("0x")) {
             if (keyString.startsWith("0x")) {
                 // The intent uses a LongKey
                 // The intent uses a LongKey
@@ -89,7 +98,14 @@ public class IntentRemoveCommand extends AbstractShellCommand {
 
 
             Intent intent = intentService.getIntent(key);
             Intent intent = intentService.getIntent(key);
             if (intent != null) {
             if (intent != null) {
+                removeIntent(intentService, intent);
+            }
+        }
+    }
+
+    private void removeIntent(IntentService intentService, Intent intent) {
         IntentListener listener = null;
         IntentListener listener = null;
+        Key key = intent.key();
         final CountDownLatch withdrawLatch, purgeLatch;
         final CountDownLatch withdrawLatch, purgeLatch;
         if (purgeAfterRemove || sync) {
         if (purgeAfterRemove || sync) {
             // set up latch and listener to track uninstall progress
             // set up latch and listener to track uninstall progress
@@ -145,5 +161,4 @@ public class IntentRemoveCommand extends AbstractShellCommand {
             intentService.removeListener(listener);
             intentService.removeListener(listener);
         }
         }
     }
     }
-    }
 }
 }

+<!--
+  ~ Copyright 2015 Open Networking Laboratory
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+<scenario name="net-host-intent" description="Network host intent connectivity test">
+    <!-- TODO: parametrize this via recipes -->
+    <group name="Host-Intent-Connectivity">
+        <step name="Uninstall-Reactive-Forwarding"
+              exec="onos ${OC1} app deactivate org.onosproject.fwd org.onosproject.ifwd"/>
+
+        <step name="Find-Host-1" requires="^"
+              exec="onos-mininet sendAndExpect h1 ping -c1 h4 --expect ."/>
+        <step name="Find-Host-2" requires="^"
+              exec="onos-mininet sendAndExpect h4 ping -c1 h1 --expect ."/>
+
+        <step name="Create-Intent" requires="^"
+              exec="onos ${OCI} add-host-intent 00:00:00:00:00:01/-1 00:00:00:00:00:04/-1"/>
+
+        <import file="${ONOS_SCENARIOS}/net-link-down-up.xml" namespace="Host-Intent"/>
+        <dependency name="Host-Intent.Net-Link-Down-Up" requires="Create-Intent"/>
+
+        <step name="Remove-Intent" requires="Host-Intent.Net-Link-Down-Up"
+              exec="onos ${OCI} remove-intent --purge"/>
+    </group>
+</scenario>
\ No newline at end of file

@@ -13,9 +13,9 @@
   ~ See the License for the specific language governing permissions and
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   ~ limitations under the License.
   -->
   -->
-<scenario name="net-link-up-down" description="Network link up-down test">
+<scenario name="net-link-down-up" description="Network link up-down test">
     <!-- TODO: parametrize this via recipes -->
     <!-- TODO: parametrize this via recipes -->
-    <group name="Net-Link-Up-Down">
+    <group name="Net-Link-Down-Up">
         <step name="Ping-1"
         <step name="Ping-1"
               exec="onos-mininet sendAndExpect h1 ping -c1 h4 --expect \ 0% packet loss"/>
               exec="onos-mininet sendAndExpect h1 ping -c1 h4 --expect \ 0% packet loss"/>
         <step name="Link-1-Down" requires="Ping-1"
         <step name="Link-1-Down" requires="Ping-1"

@@ -17,13 +17,16 @@
     <group name="Net-Smoke">
     <group name="Net-Smoke">
         <import file="${ONOS_SCENARIOS}/net-setup.xml"/>
         <import file="${ONOS_SCENARIOS}/net-setup.xml"/>
 
 
-        <import file="${ONOS_SCENARIOS}/net-pingall.xml"/>
-        <dependency name="Net-Pingall" requires="Net-Setup"/>
+        <import file="${ONOS_SCENARIOS}/net-pingall.xml" namespace="Reactive-Forwarding"/>
+        <dependency name="Reactive-Forwarding.Net-Pingall" requires="Net-Setup"/>
 
 
-        <import file="${ONOS_SCENARIOS}/net-link-up-down.xml"/>
-        <dependency name="Net-Link-Up-Down" requires="~Net-Pingall"/>
+        <import file="${ONOS_SCENARIOS}/net-link-down-up.xml" namespace="Reactive-Forwarding"/>
+        <dependency name="Reactive-Forwarding.Net-Link-Down-Up" requires="~Reactive-Forwarding.Net-Pingall"/>
+
+        <import file="${ONOS_SCENARIOS}/net-host-intent.xml"/>
+        <dependency name="Host-Intent-Connectivity" requires="~Reactive-Forwarding.Net-Link-Down-Up"/>
 
 
         <import file="${ONOS_SCENARIOS}/net-teardown.xml"/>
         <import file="${ONOS_SCENARIOS}/net-teardown.xml"/>
-        <dependency name="Net-Teardown" requires="~Net-Link-Up-Down"/>
+        <dependency name="Net-Teardown" requires="~Host-Intent-Connectivity"/>
     </group>
     </group>
 </scenario>
 </scenario>
\ No newline at end of file