commit 6bd3510dd97c5ff78bce0b5c9b6ebd3fc978d14a
author Jian Li <pyguni@gmail.com> Sat Jun 09 00:18:47 2018 +0900
committer Jian Li <pyguni@gmail.com> Thu Jun 21 00:57:25 2018 +0000
tree 482b1b42f82c0439d40e039ea1da780f30d6c41b
parent 280feecf19c8810f49104150e86c05ce49dac998

[ONOS-7683] Add ByteBuffer codec of StatsInfo and FlowInfo w/ tests

Change-Id: Ifbc09093954c8f1c073febc8199b2013e3d01714

apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/DefaultFlowInfo.java

diff --git a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/DefaultFlowInfo.java b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/DefaultFlowInfo.java
index b7a9545..74a5016 100644
--- a/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/DefaultFlowInfo.java
+++ b/apps/openstacktelemetry/app/src/main/java/org/onosproject/openstacktelemetry/impl/DefaultFlowInfo.java
@@ -17,9 +17,9 @@
 
 import org.onlab.packet.IpPrefix;
 import org.onlab.packet.MacAddress;
+import org.onlab.packet.TpPort;
 import org.onlab.packet.VlanId;
 import org.onosproject.net.DeviceId;
-import org.onosproject.net.PortNumber;
 import org.onosproject.openstacktelemetry.api.FlowInfo;
 import org.onosproject.openstacktelemetry.api.StatsInfo;
 
@@ -41,8 +41,8 @@
     private final short vxlanId;
     private final IpPrefix srcIp;
     private final IpPrefix dstIp;
-    private final PortNumber srcPort;
-    private final PortNumber dstPort;
+    private final TpPort srcPort;
+    private final TpPort dstPort;
     private final byte protocol;
     private final MacAddress srcMac;
     private final MacAddress dstMac;
@@ -51,7 +51,7 @@
     private DefaultFlowInfo(byte flowType, DeviceId deviceId,
                             int inputInterfaceId, int outputInterfaceId,
                             VlanId vlanId, short vxlanId, IpPrefix srcIp,
-                            IpPrefix dstIp, PortNumber srcPort, PortNumber dstPort,
+                            IpPrefix dstIp, TpPort srcPort, TpPort dstPort,
                             byte protocol, MacAddress srcMac, MacAddress dstMac,
                             StatsInfo statsInfo) {
         this.flowType = flowType;
@@ -111,12 +111,12 @@
     }
 
     @Override
-    public PortNumber srcPort() {
+    public TpPort srcPort() {
         return srcPort;
     }
 
     @Override
-    public PortNumber dstPort() {
+    public TpPort dstPort() {
         return dstPort;
     }
 
@@ -206,8 +206,8 @@
         private short vxlanId;
         private IpPrefix srcIp;
         private IpPrefix dstIp;
-        private PortNumber srcPort;
-        private PortNumber dstPort;
+        private TpPort srcPort;
+        private TpPort dstPort;
         private byte protocol;
         private MacAddress srcMac;
         private MacAddress dstMac;
@@ -262,13 +262,13 @@
         }
 
         @Override
-        public Builder withSrcPort(PortNumber srcPort) {
+        public Builder withSrcPort(TpPort srcPort) {
             this.srcPort = srcPort;
             return this;
         }
 
         @Override
-        public Builder withDstPort(PortNumber dstPort) {
+        public Builder withDstPort(TpPort dstPort) {
             this.dstPort = dstPort;
             return this;
         }