mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-24 13:51:27 +02:00
Code Issues Projects Releases Wiki Activity

Fixing add intent commands.

Browse Source 
Use empty treatment if there are not explicit modifications.

Change-Id: I9062c592859adcaf3c9bb17f81de83f2778005de
This commit is contained in:
Brian O'Connor 2015-04-29 19:37:15 -07:00
parent 889648c910
commit 11ff870f7a
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
View File

@ -29,6 +29,7 @@ import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService; import org.onosproject.core.CoreService;
import org.onosproject.net.Link; import org.onosproject.net.Link;
import org.onosproject.net.flow.DefaultTrafficSelector; import org.onosproject.net.flow.DefaultTrafficSelector;
import org.onosproject.net.flow.DefaultTrafficTreatment;
import org.onosproject.net.flow.TrafficSelector; import org.onosproject.net.flow.TrafficSelector;
import org.onosproject.net.flow.TrafficTreatment; import org.onosproject.net.flow.TrafficTreatment;
import org.onosproject.net.intent.Constraint; import org.onosproject.net.intent.Constraint;
@ -265,24 +266,33 @@ public abstract class ConnectivityIntentCommand extends AbstractShellCommand {
*/ */
protected TrafficTreatment buildTrafficTreatment() { protected TrafficTreatment buildTrafficTreatment() {
final TrafficTreatment.Builder treatmentBuilder = builder(); final TrafficTreatment.Builder treatmentBuilder = builder();
boolean emptyTreatment = true;
if (!isNullOrEmpty(setEthSrcString)) { if (!isNullOrEmpty(setEthSrcString)) {
treatmentBuilder.setEthSrc(MacAddress.valueOf(setEthSrcString)); treatmentBuilder.setEthSrc(MacAddress.valueOf(setEthSrcString));
emptyTreatment = false;
} }
if (!isNullOrEmpty(setEthDstString)) { if (!isNullOrEmpty(setEthDstString)) {
treatmentBuilder.setEthDst(MacAddress.valueOf(setEthDstString)); treatmentBuilder.setEthDst(MacAddress.valueOf(setEthDstString));
emptyTreatment = false;
} }
if (!isNullOrEmpty(setIpSrcString)) { if (!isNullOrEmpty(setIpSrcString)) {
treatmentBuilder.setIpSrc(IpAddress.valueOf(setIpSrcString)); treatmentBuilder.setIpSrc(IpAddress.valueOf(setIpSrcString));
emptyTreatment = false;
} }
if (!isNullOrEmpty(setIpDstString)) { if (!isNullOrEmpty(setIpDstString)) {
treatmentBuilder.setIpSrc(IpAddress.valueOf(setIpDstString)); treatmentBuilder.setIpSrc(IpAddress.valueOf(setIpDstString));
emptyTreatment = false;
} }
return treatmentBuilder.build(); if (emptyTreatment) {
return DefaultTrafficTreatment.emptyTreatment();
} else {
return treatmentBuilder.build();
}
} }
/** /**