Added WITHDRAW_REQ Intent State for ONOS-146

Fixed flow removed from other instance

Change-Id: I22c88a447e26770fea8b7e23f4a78b1389077ad1
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/IntentPushTestCommand.java b/cli/src/main/java/org/onlab/onos/cli/net/IntentPushTestCommand.java
index 5dd7736..ff347f0 100644
--- a/cli/src/main/java/org/onlab/onos/cli/net/IntentPushTestCommand.java
+++ b/cli/src/main/java/org/onlab/onos/cli/net/IntentPushTestCommand.java
@@ -245,7 +245,7 @@
             } else {
                 log.warn("install event latch is null");
             }
-        } else if (event.type() != Type.SUBMITTED) {
+        } else if (event.type() != Type.INSTALL_REQ) {
             log.info("Unexpected intent event: {}", event);
         }
     }
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/IntentsListCommand.java b/cli/src/main/java/org/onlab/onos/cli/net/IntentsListCommand.java
index fbcb5e9..911b5f8 100644
--- a/cli/src/main/java/org/onlab/onos/cli/net/IntentsListCommand.java
+++ b/cli/src/main/java/org/onlab/onos/cli/net/IntentsListCommand.java
@@ -246,7 +246,7 @@
             void update(IntentState intentState) {
                 total++;
                 switch (intentState) {
-                case SUBMITTED:
+                case INSTALL_REQ:
                     submitted++;
                     break;
                 case COMPILING: