Bug-5562 - Ipv4 L3-ArbitraryMask patch 71/36571/1
authorSai MarapaReddy <sai.marapareddy@gmail.com>
Sat, 19 Mar 2016 06:36:20 +0000 (23:36 -0700)
committerSai MarapaReddy <sai.marapareddy@gmail.com>
Tue, 22 Mar 2016 19:27:10 +0000 (12:27 -0700)
commit5792fa1ecccf63cef4587d818d99d35018e7e2cf
tree8d206621830b67b777296d3fbf03f0b9daf30112
parent0712bdd50b485488a540d70b72c62ce6fe1ef5eb
Bug-5562 - Ipv4 L3-ArbitraryMask patch
Current code expects the Arbitrary Mask to be normalized from switch.
Example:- 3.3.3.3/255.0.255.0 to 3.0.3.0/255.0.255.0
Not all switches normalizes arbitrary bit mask in the flows when they are injected.
Example:- 3.3.3.3/255.0.255.0 to 3.3.3.3/255.0.255.0
This patch ensures that the operational data store is in congruent with the flows
that are shown on the switch. Patch is built on checking the mask & comparing the
normalized stores & stats flows which ensures Ipv4 L3-ArbitraryMask works independant
of how the switches normalizes the ip addresses when flows are pushed.

Conflicts:
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/IpConversionUtil.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java

Change-Id: Icfc6d4805c58f6483fc3ca0458b827b14c0a0cb1
Signed-off-by: Sai MarapaReddy <sai.marapareddy@gmail.com>
applications/statistics-manager/src/main/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/helper/MatchComparatorHelper.java
applications/statistics-manager/src/test/java/org/opendaylight/openflowplugin/applications/statistics/manager/impl/helper/MatchComparatorHelperTest.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/IpConversionUtil.java
openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImpl.java
openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/IpConversionUtilTest.java
openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/convertor/match/MatchConvertorImplV13Test.java