Added WITHDRAW_REQ Intent State for ONOS-146

Fixed flow removed from other instance

Change-Id: I22c88a447e26770fea8b7e23f4a78b1389077ad1
diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentEvent.java b/core/api/src/main/java/org/onlab/onos/net/intent/IntentEvent.java
index 495f3ea..37261e9 100644
--- a/core/api/src/main/java/org/onlab/onos/net/intent/IntentEvent.java
+++ b/core/api/src/main/java/org/onlab/onos/net/intent/IntentEvent.java
@@ -24,9 +24,9 @@
 
     public enum Type {
         /**
-         * Signifies that a new intent has been submitted to the system.
+         * Signifies that an intent is to be installed or reinstalled.
          */
-        SUBMITTED,
+        INSTALL_REQ,
 
         /**
          * Signifies that an intent has been successfully installed.
@@ -39,6 +39,11 @@
         FAILED,
 
         /**
+         * Signifies that an intent will be withdrawn.
+         */
+        WITHDRAW_REQ,
+
+        /**
          * Signifies that an intent has been withdrawn from the system.
          */
         WITHDRAWN
@@ -70,12 +75,15 @@
     public static IntentEvent getEvent(IntentState state, Intent intent) {
         Type type;
         switch (state) {
-            case SUBMITTED:
-                type = Type.SUBMITTED;
+            case INSTALL_REQ:
+                type = Type.INSTALL_REQ;
                 break;
             case INSTALLED:
                 type = Type.INSTALLED;
                 break;
+            case WITHDRAW_REQ:
+                type = Type.WITHDRAW_REQ;
+                break;
             case WITHDRAWN:
                 type = Type.WITHDRAWN;
                 break;