Fix [ONOS-5467]
We were missing the selector during the
building of the sp2mp and mp2sp.
Change-Id: Ica456e7c92ef346721ce3f4ceccaf55033d25029
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/MultiPointToSinglePointIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/MultiPointToSinglePointIntentCompiler.java
index 0ee6e83..f9b236f 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/MultiPointToSinglePointIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/MultiPointToSinglePointIntentCompiler.java
@@ -120,6 +120,7 @@
Intent result = LinkCollectionIntent.builder()
.appId(intent.appId())
.treatment(intent.treatment())
+ .selector(intent.selector())
.links(Sets.newHashSet(links.values()))
.filteredIngressPoints(intent.filteredIngressPoints())
.filteredEgressPoints(ImmutableSet.of(intent.filteredEgressPoint()))
diff --git a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/SinglePointToMultiPointIntentCompiler.java b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/SinglePointToMultiPointIntentCompiler.java
index dcfc6d0..22c4e89 100644
--- a/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/SinglePointToMultiPointIntentCompiler.java
+++ b/core/net/src/main/java/org/onosproject/net/intent/impl/compiler/SinglePointToMultiPointIntentCompiler.java
@@ -69,6 +69,7 @@
Intent result = LinkCollectionIntent.builder()
.appId(intent.appId())
.key(intent.key())
+ .selector(intent.selector())
.treatment(intent.treatment())
.links(links)
.filteredIngressPoints(ImmutableSet.of(intent.filteredIngressPoint()))
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MultiPointToSinglePointIntentCompilerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MultiPointToSinglePointIntentCompilerTest.java
index 8d49138..60da118 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MultiPointToSinglePointIntentCompilerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/MultiPointToSinglePointIntentCompilerTest.java
@@ -18,6 +18,7 @@
import com.google.common.collect.ImmutableSet;
import org.hamcrest.Matchers;
import org.junit.Test;
+import org.onlab.packet.IpPrefix;
import org.onlab.packet.VlanId;
import org.onosproject.TestApplicationId;
import org.onosproject.core.ApplicationId;
@@ -87,10 +88,12 @@
* @return
*/
private MultiPointToSinglePointIntent makeFilteredConnectPointIntent(Set<FilteredConnectPoint> ingress,
- FilteredConnectPoint egress) {
+ FilteredConnectPoint egress,
+ TrafficSelector trafficSelector) {
return MultiPointToSinglePointIntent.builder()
.appId(APPID)
.treatment(treatment)
+ .selector(trafficSelector)
.filteredIngressPoints(ingress)
.filteredEgressPoint(egress)
.build();
@@ -257,7 +260,7 @@
FilteredConnectPoint egress = new FilteredConnectPoint(connectPoint("of4", 1));
- MultiPointToSinglePointIntent intent = makeFilteredConnectPointIntent(ingress, egress);
+ MultiPointToSinglePointIntent intent = makeFilteredConnectPointIntent(ingress, egress, selector);
String[] hops = {"of3"};
MultiPointToSinglePointIntentCompiler compiler = makeCompiler(hops);
@@ -280,5 +283,48 @@
}
+ /**
+ * Tests selector, filtered ingress and egress.
+ */
+ @Test
+ public void testNonTrivialSelectorsIntent() {
+
+ Set<FilteredConnectPoint> ingress = ImmutableSet.of(
+ new FilteredConnectPoint(connectPoint("of1", 1),
+ DefaultTrafficSelector.builder().matchVlanId(VlanId.vlanId("100")).build()),
+ new FilteredConnectPoint(connectPoint("of2", 1),
+ DefaultTrafficSelector.builder().matchVlanId(VlanId.vlanId("200")).build())
+ );
+
+ TrafficSelector ipPrefixSelector = DefaultTrafficSelector.builder()
+ .matchIPDst(IpPrefix.valueOf("192.168.100.0/24"))
+ .build();
+
+ FilteredConnectPoint egress = new FilteredConnectPoint(connectPoint("of4", 1));
+
+ MultiPointToSinglePointIntent intent = makeFilteredConnectPointIntent(ingress, egress, ipPrefixSelector);
+ String[] hops = {"of3"};
+
+ MultiPointToSinglePointIntentCompiler compiler = makeCompiler(hops);
+ assertThat(compiler, is(notNullValue()));
+
+ List<Intent> result = compiler.compile(intent, null);
+ assertThat(result, is(notNullValue()));
+ assertThat(result, hasSize(1));
+
+ Intent resultIntent = result.get(0);
+ assertThat(resultIntent, instanceOf(LinkCollectionIntent.class));
+
+ if (resultIntent instanceof LinkCollectionIntent) {
+ LinkCollectionIntent linkIntent = (LinkCollectionIntent) resultIntent;
+ assertThat(linkIntent.links(), hasSize(3));
+ assertThat(linkIntent.links(), linksHasPath("of1", "of3"));
+ assertThat(linkIntent.links(), linksHasPath("of2", "of3"));
+ assertThat(linkIntent.links(), linksHasPath("of3", "of4"));
+ assertThat(linkIntent.selector(), is(ipPrefixSelector));
+ }
+
+ }
+
}
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/SinglePointToMultiPointIntentCompilerTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/SinglePointToMultiPointIntentCompilerTest.java
index 6270f5c..cb13c68 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/SinglePointToMultiPointIntentCompilerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/SinglePointToMultiPointIntentCompilerTest.java
@@ -19,6 +19,7 @@
import com.google.common.collect.ImmutableSet;
import org.hamcrest.Matchers;
import org.junit.Test;
+import org.onlab.packet.IpPrefix;
import org.onlab.packet.VlanId;
import org.onosproject.TestApplicationId;
import org.onosproject.core.ApplicationId;
@@ -91,10 +92,12 @@
* @return
*/
private SinglePointToMultiPointIntent makeFilteredConnectPointIntent(FilteredConnectPoint ingress,
- Set<FilteredConnectPoint> egress) {
+ Set<FilteredConnectPoint> egress,
+ TrafficSelector trafficSelector) {
return SinglePointToMultiPointIntent.builder()
.appId(APPID)
.treatment(treatment)
+ .selector(trafficSelector)
.filteredIngressPoint(ingress)
.filteredEgressPoints(egress)
.build();
@@ -260,7 +263,7 @@
);
- SinglePointToMultiPointIntent intent = makeFilteredConnectPointIntent(ingress, egress);
+ SinglePointToMultiPointIntent intent = makeFilteredConnectPointIntent(ingress, egress, selector);
String[] hops = {"of2"};
SinglePointToMultiPointIntentCompiler compiler = makeCompiler(hops);
@@ -290,4 +293,55 @@
}
}
+
+ /**
+ * Tests selector, filtered ingress and egress.
+ */
+ @Test
+ public void testNonTrivialSelectorsIntent() {
+
+ FilteredConnectPoint ingress = new FilteredConnectPoint(connectPoint("of1", 1));
+
+ Set<FilteredConnectPoint> egress = ImmutableSet.of(
+ new FilteredConnectPoint(connectPoint("of3", 1),
+ DefaultTrafficSelector.builder().matchVlanId(VlanId.vlanId("100")).build()),
+ new FilteredConnectPoint(connectPoint("of4", 1),
+ DefaultTrafficSelector.builder().matchVlanId(VlanId.vlanId("200")).build())
+ );
+
+ TrafficSelector ipPrefixSelector = DefaultTrafficSelector.builder()
+ .matchIPDst(IpPrefix.valueOf("192.168.100.0/24"))
+ .build();
+
+ SinglePointToMultiPointIntent intent = makeFilteredConnectPointIntent(ingress, egress, ipPrefixSelector);
+ String[] hops = {"of2"};
+
+ SinglePointToMultiPointIntentCompiler compiler = makeCompiler(hops);
+ assertThat(compiler, is(notNullValue()));
+
+ List<Intent> result = compiler.compile(intent, null);
+ assertThat(result, is(notNullValue()));
+ assertThat(result, hasSize(1));
+
+ Intent resultIntent = result.get(0);
+ assertThat(resultIntent, instanceOf(LinkCollectionIntent.class));
+
+ if (resultIntent instanceof LinkCollectionIntent) {
+ LinkCollectionIntent linkIntent = (LinkCollectionIntent) resultIntent;
+ assertThat(linkIntent.links(), hasSize(3));
+
+ assertThat(linkIntent.links(), linksHasPath("of1", "of2"));
+ assertThat(linkIntent.links(), linksHasPath("of2", "of3"));
+ assertThat(linkIntent.links(), linksHasPath("of2", "of4"));
+
+ Set<FilteredConnectPoint> ingressPoints = linkIntent.filteredIngressPoints();
+ assertThat("Link collection ingress points do not match base intent",
+ ingressPoints.size() == 1 && ingressPoints.contains(intent.filteredIngressPoint()));
+
+ assertThat("Link collection egress points do not match base intent",
+ linkIntent.filteredEgressPoints().equals(intent.filteredEgressPoints()));
+ assertThat(linkIntent.selector(), is(ipPrefixSelector));
+ }
+
+ }
}