commit 8758a431023c4914e461b80feabba0484f6ac784
author Phaneendra Manda <phaneendra.manda@huawei.com> Tue May 24 10:44:53 2016 +0530
committer Phaneendra-Huawei <phaneendra.manda@huawei.com> Wed May 25 05:28:52 2016 +0000
tree bb9e989eb98f485ad0a437425344e0ee14665311
parent 51a76bedf934c99b0fe4ded90662257b2c524e53

Nicira extension for setting nsh header fields is modified to set field

Change-Id: I4c9d39a2e83315324c23954e491b20d43a5c63cc
(cherry picked from commit 7ff0643f9d76d7617bcf27d11eac0780b0691dd5)

drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraExtensionTreatmentInterpreter.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraExtensionTreatmentInterpreter.java b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraExtensionTreatmentInterpreter.java
index f30680d..55f0c3e 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraExtensionTreatmentInterpreter.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/extensions/NiciraExtensionTreatmentInterpreter.java
@@ -136,30 +136,6 @@
             return factory.actions().niciraResubmitTable((int) resubmitTable.inPort().toLong(),
                                                          resubmitTable.table());
         }
-        if (type.equals(ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_SET_NSH_SPI.type())) {
-            NiciraSetNshSpi niciraNshSpi = (NiciraSetNshSpi) extensionTreatment;
-            return factory.actions().niciraSetNsp(niciraNshSpi.nshSpi().servicePathId());
-        }
-        if (type.equals(ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_SET_NSH_SI.type())) {
-            NiciraSetNshSi niciraNshSi = (NiciraSetNshSi) extensionTreatment;
-            return factory.actions().niciraSetNsp(niciraNshSi.nshSi().serviceIndex());
-        }
-        if (type.equals(ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_SET_NSH_CH1.type())) {
-            NiciraSetNshContextHeader niciraNshch = (NiciraSetNshContextHeader) extensionTreatment;
-            return factory.actions().niciraSetNshc1(niciraNshch.nshCh().nshContextHeader());
-        }
-        if (type.equals(ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_SET_NSH_CH2.type())) {
-            NiciraSetNshContextHeader niciraNshch = (NiciraSetNshContextHeader) extensionTreatment;
-            return factory.actions().niciraSetNshc2(niciraNshch.nshCh().nshContextHeader());
-        }
-        if (type.equals(ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_SET_NSH_CH3.type())) {
-            NiciraSetNshContextHeader niciraNshch = (NiciraSetNshContextHeader) extensionTreatment;
-            return factory.actions().niciraSetNshc3(niciraNshch.nshCh().nshContextHeader());
-        }
-        if (type.equals(ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_SET_NSH_CH4.type())) {
-            NiciraSetNshContextHeader niciraNshch = (NiciraSetNshContextHeader) extensionTreatment;
-            return factory.actions().niciraSetNshc4(niciraNshch.nshCh().nshContextHeader());
-        }
         if (type.equals(ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_MOV_ARP_SHA_TO_THA.type())
                 || type.equals(ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_MOV_ARP_SPA_TO_TPA.type())
                 || type.equals(ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_MOV_ETH_SRC_TO_DST.type())