commit 62ce5c19fb9338516db1ba668722b71b59c27884
author Sangho Shin <sangho@onlab.us> Wed Oct 08 16:24:40 2014 -0700
committer Sangho Shin <sangho@onlab.us> Wed Oct 08 16:24:40 2014 -0700
tree 9c704383be1c890b7efa7ca4d1bbea60aada334f
parent 6814430b675e641c69259a7502062b8afb94b4f9

 - Application do not push or pop the label.
 - Set the MPLS ID correctly in the driver.

Change-Id: I40ab5286a0ca44865f10bb7d8901e29b49cbe24c

src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java

diff --git a/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java b/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java
index 9a4519d..5a57b86 100644
--- a/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java
+++ b/src/main/java/net/onrc/onos/core/drivermanager/OFSwitchImplCPqD13.java
@@ -874,8 +874,10 @@
             if (b.mplsLabel != -1) {
                 OFAction pushLabel = factory.actions().buildPushMpls()
                         .setEthertype(EthType.MPLS_UNICAST).build();
-                OFAction setLabel = factory.actions().buildSetMplsLabel()
-                        .setMplsLabel(b.mplsLabel).build();
+                OFOxmMplsLabel lid = factory.oxms()
+                        .mplsLabel(U32.of(b.mplsLabel));
+                OFAction setLabel = factory.actions().buildSetField()
+                        .setField(lid).build();
                 OFAction copyTtl = factory.actions().copyTtlOut();
                 OFAction decrTtl = factory.actions().decMplsTtl();
                 actions.add(pushLabel);