fixing flow rule service timeout and notion of identity

Change-Id: I10d0fb8a797c642ef8af65b605f86559e3206976

@@ -115,7 +115,7 @@ public class DefaultFlowRule implements FlowRule {
     }
     }
 
 
     public int hash() {
     public int hash() {
-        return Objects.hash(deviceId, selector, id);
+        return Objects.hash(deviceId, selector, treatment);
     }
     }
 
 
     @Override
     @Override
@@ -132,7 +132,7 @@ public class DefaultFlowRule implements FlowRule {
         if (obj instanceof DefaultFlowRule) {
         if (obj instanceof DefaultFlowRule) {
             DefaultFlowRule that = (DefaultFlowRule) obj;
             DefaultFlowRule that = (DefaultFlowRule) obj;
             return Objects.equals(deviceId, that.deviceId) &&
             return Objects.equals(deviceId, that.deviceId) &&
-                    //Objects.equals(id, that.id) &&
+                    Objects.equals(id, that.id) &&
                     Objects.equals(priority, that.priority) &&
                     Objects.equals(priority, that.priority) &&
                     Objects.equals(selector, that.selector);
                     Objects.equals(selector, that.selector);
 
 
@@ -154,7 +154,7 @@ public class DefaultFlowRule implements FlowRule {
 
 
     @Override
     @Override
     public int timeout() {
     public int timeout() {
-        return timeout > MAX_TIMEOUT ? MAX_TIMEOUT : this.timeout;
+        return timeout;
     }
     }
 
 
 }
 }

@@ -66,6 +66,8 @@ public interface FlowRuleService {
      */
      */
     Iterable<FlowRule> getFlowRulesById(ApplicationId id);
     Iterable<FlowRule> getFlowRulesById(ApplicationId id);
 
 
+    //Future<CompletedBatchOperation> applyBatch(BatchOperation<FlowRuleBatchEntry>)
+
     /**
     /**
      * Adds the specified flow rule listener.
      * Adds the specified flow rule listener.
      *
      *