commit c2999f30c69e50df905a9d175ef80b3f23a98514
author Marc De Leenheer <marc@onlab.us> Fri Nov 20 15:52:16 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Tue Dec 01 03:35:56 2015 +0000
tree 647c259f5326b40e69fe05327cbd5bb4aa7a53b4
parent fd44dc9c8015ca4226a7b8cdfbd517422188c9f4

LINC driver updated to always use LINC's non-standard OF optical extensions.

ONOS-3399

Change-Id: I7bbd39947facfbbd53a164ea34c7da50782bfd6a

providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java

diff --git a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
index 135150d..90def43 100644
--- a/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
+++ b/providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/FlowModBuilderVer13.java
@@ -320,7 +320,7 @@
     }
 
     private OFAction buildModLambdaInstruction(ModLambdaInstruction instruction) {
-        return factory().actions().circuit(factory().oxms().ochSigidBasic(
+        return factory().actions().circuit(factory().oxms().expOchSigId(
                 new CircuitSignalID((byte) 1, (byte) 2, instruction.lambda(), (short) 1)));
     }
 
@@ -329,7 +329,7 @@
         byte gridType = OpenFlowValueMapper.lookupGridType(signal.gridType());
         byte channelSpacing = OpenFlowValueMapper.lookupChannelSpacing(signal.channelSpacing());
 
-        return factory().actions().circuit(factory().oxms().ochSigidBasic(
+        return factory().actions().circuit(factory().oxms().expOchSigId(
                 new CircuitSignalID(gridType, channelSpacing,
                         (short) signal.spacingMultiplier(), (short) signal.slotGranularity())
         ));