From b45d19671324997dd5a42ec10d2cb7280cacc1cc Mon Sep 17 00:00:00 2001
From: alshabib <alshabibi.ali@gmail.com>
Date: Thu, 18 Sep 2014 14:25:45 -0700
Subject: [PATCH] flowrule builder

---
 .../org/onlab/onos/net/flow/FlowRuleProviderService.java | 2 +-
 .../java/org/onlab/onos/net/flow/criteria/Criteria.java  | 2 +-
 .../onos/provider/of/flow/impl/OpenFlowRuleProvider.java | 9 ++++-----
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java
index dc7b01e2b3..f5b31f89be 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java
@@ -36,6 +36,6 @@ public interface FlowRuleProviderService extends ProviderService<FlowRuleProvide
      * @param deviceId device identifier
      * @return collection of flow entries
      */
-    void pushFlowMetrics(Iterable<FlowEntry> flowEntries);
+    void pushFlowMetrics(Iterable<FlowRule> flowEntries);
 
 }
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java b/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java
index 9cae5f97fd..9a5fffa275 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java
@@ -75,7 +75,7 @@ public final class Criteria {
      * @param vlanPcp vlan pcp value
      * @return match criterion
      */
-    public static Criterion matchVlanId(Byte vlanPcp) {
+    public static Criterion matchVlanPcp(Byte vlanPcp) {
         return new VlanPcpCriterion(vlanPcp);
     }
 
diff --git a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/OpenFlowRuleProvider.java b/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/OpenFlowRuleProvider.java
index c03f119233..4899a0ef75 100644
--- a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/OpenFlowRuleProvider.java
+++ b/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/OpenFlowRuleProvider.java
@@ -2,6 +2,7 @@ package org.onlab.onos.provider.of.flow.impl;
 
 import static org.slf4j.LoggerFactory.getLogger;
 
+import java.util.List;
 import java.util.Map;
 
 import org.apache.felix.scr.annotations.Activate;
@@ -33,9 +34,6 @@ import org.projectfloodlight.openflow.protocol.OFStatsType;
 import org.slf4j.Logger;
 
 import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
-rt org.slf4j.Logger;
-
 import com.google.common.collect.Maps;
 
 /**
@@ -152,10 +150,11 @@ public class OpenFlowRuleProvider extends AbstractProvider implements FlowRulePr
                 return;
             }
             final OFFlowStatsReply replies = (OFFlowStatsReply) stats;
-            final List<FlowEntry> entries = Lists.newLinkedList();
+            final List<FlowRule> entries = Lists.newLinkedList();
             for (OFFlowStatsEntry reply : replies.getEntries()) {
-
+                entries.add(new FlowRuleBuilder(reply).build());
             }
+            providerService.pushFlowMetrics(entries);
 
 
         }