Fix for [ONOS-5824]

Changes:
- Redesigns DefaultSingleTablePipeline;
- Changes the timeout of test to reduce the false-negatives;

Change-Id: I15fa20fd8a15908e70bc22de7913367b9ef113c7
diff --git a/cli/src/main/java/org/onosproject/cli/net/IntentPushTestCommand.java b/cli/src/main/java/org/onosproject/cli/net/IntentPushTestCommand.java
index 2782b76..d6405f0 100644
--- a/cli/src/main/java/org/onosproject/cli/net/IntentPushTestCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/IntentPushTestCommand.java
@@ -165,7 +165,9 @@
         }
 
         try {
-            if (latch.await(1000 + count * 30, TimeUnit.MILLISECONDS)) {
+            // In this way with the tests in place the timeout will be
+            // 61 seconds.
+            if (latch.await(1000 + count * 60, TimeUnit.MILLISECONDS)) {
                 printResults(count);
             } else {
                 print("Failure: %d intents not installed", latch.getCount());