P2P intents have drop treatment if ethSrc&Dst not set
ONOS-1311
Change-Id: I62e4872a16bad29ba14fb74d2dc19cf443131dee
diff --git a/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java b/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
index 848b3a8..308bbf9 100644
--- a/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/ConnectivityIntentCommand.java
@@ -25,6 +25,7 @@
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.net.Link;
import org.onosproject.net.flow.DefaultTrafficSelector;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
import org.onosproject.net.flow.TrafficSelector;
import org.onosproject.net.flow.TrafficTreatment;
import org.onosproject.net.intent.Constraint;
@@ -155,13 +156,19 @@
* @return traffic treatment
*/
protected TrafficTreatment buildTrafficTreatment() {
- final TrafficTreatment.Builder builder = builder();
+ boolean hasEthSrc = !isNullOrEmpty(setEthSrcString);
+ boolean hasEthDst = !isNullOrEmpty(setEthDstString);
- if (!isNullOrEmpty(setEthSrcString)) {
+ if (!hasEthSrc && !hasEthDst) {
+ return DefaultTrafficTreatment.emptyTreatment();
+ }
+
+ final TrafficTreatment.Builder builder = builder();
+ if (hasEthSrc) {
final MacAddress setEthSrc = MacAddress.valueOf(setEthSrcString);
builder.setEthSrc(setEthSrc);
}
- if (!isNullOrEmpty(setEthDstString)) {
+ if (hasEthDst) {
final MacAddress setEthDst = MacAddress.valueOf(setEthDstString);
builder.setEthDst(setEthDst);
}