commit | 9553bb88b3d7d2fa9a03b102f55959475365e781 | [log] [tgz] |
---|---|---|
author | Sho SHIMIZU <sshimizu@us.fujitsu.com> | Tue Jun 30 16:02:45 2015 -0700 |
committer | Gerrit Code Review <gerrit@onlab.us> | Wed Jul 01 02:18:07 2015 +0000 |
tree | 2769ee8d76ebc7909f9b267621e8435fecfa6472 | |
parent | 6cd3330007b5e5c30ec0f959622e6f1d8eae49d3 [diff] |
Make TrafficTreatment.Builder.setLambda() deprecated It is recommended to avoid to use a raw integer value to specify a lambda. Replace uses of the deprecated method with the alternative Change-Id: I108f0d15f4503df2a6a75c4f7c77aa0c678ff541
diff --git a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java index 9562a73..96abbe9 100644 --- a/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java +++ b/core/api/src/main/java/org/onosproject/net/flow/DefaultTrafficTreatment.java
@@ -330,6 +330,7 @@ return add(Instructions.decMplsTtl()); } + @Deprecated @Override public Builder setLambda(short lambda) { return add(Instructions.modL0Lambda(new IndexedLambda(lambda)));
diff --git a/core/api/src/main/java/org/onosproject/net/flow/TrafficTreatment.java b/core/api/src/main/java/org/onosproject/net/flow/TrafficTreatment.java index 9be4b52..3802bf2 100644 --- a/core/api/src/main/java/org/onosproject/net/flow/TrafficTreatment.java +++ b/core/api/src/main/java/org/onosproject/net/flow/TrafficTreatment.java
@@ -230,7 +230,9 @@ * * @param lambda optical channel ID * @return a treatment builder + * @deprecated in Drake Release */ + @Deprecated Builder setLambda(short lambda); /**
diff --git a/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficTreatmentTest.java b/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficTreatmentTest.java index fcf6d9c..288f5f2 100644 --- a/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficTreatmentTest.java +++ b/core/api/src/test/java/org/onosproject/net/flow/DefaultTrafficTreatmentTest.java
@@ -69,7 +69,7 @@ .setEthSrc(MacAddress.BROADCAST) .setIpDst(IpAddress.valueOf("1.1.1.1")) .setIpSrc(IpAddress.valueOf("2.2.2.2")) - .setLambda((short) 4) + .add(Instructions.modL0Lambda(new IndexedLambda(4))) .setOutput(PortNumber.portNumber(2)) .setVlanId(VlanId.vlanId((short) 4)) .setVlanPcp((byte) 3);