Added bytes in BNG upstream counters

Change-Id: Ia23ec444860ae8b5be0b6de3a9f141c886eae3c6

Author: daniele-moro

pipelines/fabric/impl/src/main/resources/include/bng.p4

@@ -33,8 +33,8 @@ control bng_ingress_upstream(
         inout fabric_metadata_t fmeta,
         inout standard_metadata_t smeta) {
 
-    counter(BNG_MAX_SUBSC, CounterType.packets) c_terminated;
-    counter(BNG_MAX_SUBSC, CounterType.packets) c_dropped;
+    counter(BNG_MAX_SUBSC, CounterType.bytes) c_terminated;
+    counter(BNG_MAX_SUBSC, CounterType.bytes) c_dropped;
     counter(BNG_MAX_SUBSC, CounterType.packets) c_control;
 
     // TABLE: t_pppoe_cp
@@ -146,7 +146,7 @@ control bng_ingress_downstream(
         inout fabric_metadata_t fmeta,
         inout standard_metadata_t smeta) {
 
-    counter(BNG_MAX_SUBSC, CounterType.packets_and_bytes) c_line_rx;
+    counter(BNG_MAX_SUBSC, CounterType.bytes) c_line_rx;
 
     meter(BNG_MAX_SUBSC, MeterType.bytes) m_besteff;
     meter(BNG_MAX_SUBSC, MeterType.bytes) m_prio;
@@ -261,7 +261,7 @@ control bng_egress_downstream(
         inout fabric_metadata_t fmeta,
         inout standard_metadata_t smeta) {
 
-    counter(BNG_MAX_SUBSC, CounterType.packets_and_bytes) c_line_tx;
+    counter(BNG_MAX_SUBSC, CounterType.bytes) c_line_tx;
 
     @hidden
     action encap() {

pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/bmv2.json

@@ -936,7 +936,7 @@
       "source_info" : {
         "filename" : "include/bng.p4",
         "line" : 36,
-        "column" : 39,
+        "column" : 37,
         "source_fragment" : "c_terminated"
       },
       "size" : 8192,
@@ -948,7 +948,7 @@
       "source_info" : {
         "filename" : "include/bng.p4",
         "line" : 37,
-        "column" : 39,
+        "column" : 37,
         "source_fragment" : "c_dropped"
       },
       "size" : 8192,
@@ -972,7 +972,7 @@
       "source_info" : {
         "filename" : "include/bng.p4",
         "line" : 149,
-        "column" : 49,
+        "column" : 37,
         "source_fragment" : "c_line_rx"
       },
       "size" : 8192,
@@ -1104,7 +1104,7 @@
       "source_info" : {
         "filename" : "include/bng.p4",
         "line" : 264,
-        "column" : 49,
+        "column" : 37,
         "source_fragment" : "c_line_tx"
       },
       "size" : 8192,

pipelines/fabric/impl/src/main/resources/p4c-out/fabric-bng/bmv2/default/p4info.txt

@@ -855,7 +855,7 @@ counters {
     alias: "c_terminated"
   }
   spec {
-    unit: PACKETS
+    unit: BYTES
   }
   size: 8192
 }
@@ -866,7 +866,7 @@ counters {
     alias: "c_dropped"
   }
   spec {
-    unit: PACKETS
+    unit: BYTES
   }
   size: 8192
 }
@@ -888,7 +888,7 @@ counters {
     alias: "c_line_rx"
   }
   spec {
-    unit: BOTH
+    unit: BYTES
   }
   size: 8192
 }
@@ -921,7 +921,7 @@ counters {
     alias: "c_line_tx"
   }
   spec {
-    unit: BOTH
+    unit: BYTES
   }
   size: 8192
 }

pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/bmv2.json

@@ -1807,7 +1807,7 @@
       "source_info" : {
         "filename" : "include/bng.p4",
         "line" : 36,
-        "column" : 39,
+        "column" : 37,
         "source_fragment" : "c_terminated"
       },
       "size" : 8192,
@@ -1819,7 +1819,7 @@
       "source_info" : {
         "filename" : "include/bng.p4",
         "line" : 37,
-        "column" : 39,
+        "column" : 37,
         "source_fragment" : "c_dropped"
       },
       "size" : 8192,
@@ -1843,7 +1843,7 @@
       "source_info" : {
         "filename" : "include/bng.p4",
         "line" : 149,
-        "column" : 49,
+        "column" : 37,
         "source_fragment" : "c_line_rx"
       },
       "size" : 8192,
@@ -2011,7 +2011,7 @@
       "source_info" : {
         "filename" : "include/bng.p4",
         "line" : 264,
-        "column" : 49,
+        "column" : 37,
         "source_fragment" : "c_line_tx"
       },
       "size" : 8192,

pipelines/fabric/impl/src/main/resources/p4c-out/fabric-full/bmv2/default/p4info.txt

@@ -1406,7 +1406,7 @@ counters {
     alias: "c_terminated"
   }
   spec {
-    unit: PACKETS
+    unit: BYTES
   }
   size: 8192
 }
@@ -1417,7 +1417,7 @@ counters {
     alias: "c_dropped"
   }
   spec {
-    unit: PACKETS
+    unit: BYTES
   }
   size: 8192
 }
@@ -1439,7 +1439,7 @@ counters {
     alias: "c_line_rx"
   }
   spec {
-    unit: BOTH
+    unit: BYTES
   }
   size: 8192
 }
@@ -1472,7 +1472,7 @@ counters {
     alias: "c_line_tx"
   }
   spec {
-    unit: BOTH
+    unit: BYTES
   }
   size: 8192
 }