commit d35f89c1aae122df256562658fe60fe682c04005
author andrea <andrea@onlab.us> Mon Nov 23 10:02:07 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Mon Nov 30 19:07:33 2015 +0000
tree 5dc106ffab3a7f3448179e6afddd40cc355917fd
parent 8a0732e8ae5c2808113c85a2c54b3ffafac513df

[ONOS-3405] Change EthType Json encoding to Hex and extend decoding with Hex support alongside int

Change-Id: I629f52016256d6c5cc258ab9e1c5a7b916991d5b

core/common/src/test/resources/org/onosproject/codec/impl/criteria-flow.json

diff --git a/core/common/src/test/resources/org/onosproject/codec/impl/criteria-flow.json b/core/common/src/test/resources/org/onosproject/codec/impl/criteria-flow.json
index ccb2e16..82c0f59 100644
--- a/core/common/src/test/resources/org/onosproject/codec/impl/criteria-flow.json
+++ b/core/common/src/test/resources/org/onosproject/codec/impl/criteria-flow.json
@@ -9,7 +9,7 @@
             {"type":"IN_PORT", "port":23},
             {"type":"IN_PHY_PORT", "port":44},
             {"type":"METADATA", "metadata":123456},
-            {"type":"ETH_TYPE","ethType":2054},
+            {"type":"ETH_TYPE","ethType":"0x806"},
             {"type":"ETH_SRC","mac":"00:11:22:33:44:55"},
             {"type":"ETH_DST","mac":"00:11:22:33:44:55"},
             {"type":"VLAN_VID","vlanId":777},

core/common/src/test/resources/org/onosproject/codec/impl/instructions-flow.json

diff --git a/core/common/src/test/resources/org/onosproject/codec/impl/instructions-flow.json b/core/common/src/test/resources/org/onosproject/codec/impl/instructions-flow.json
index 74b9546..2a184b3 100644
--- a/core/common/src/test/resources/org/onosproject/codec/impl/instructions-flow.json
+++ b/core/common/src/test/resources/org/onosproject/codec/impl/instructions-flow.json
@@ -35,5 +35,5 @@
       ],
       "deferred":[]
   },
-  "selector": {"criteria":[{"type":"ETH_TYPE","ethType":2054}]}
+  "selector": {"criteria":[{"type":"ETH_TYPE","ethType":"0x806"}]}
 }