Fixes [ONOS-5415] and [ONOS-5491]
Changes:
- Introduces ordering between core ports and egress ports;
- Introduces ordering between egress ports;
- Introduces ttl_in and tll_out in the link collection compiler logic;
- Optimized push/pop mpls/vlan actions;
- Optimizes dec ttl related actions;
- Optimizes ttl_in and ttl_out actions;
- Makes the optimizations configurable;
Change-Id: I60f187031e89c366ec9c79d1652a5fb0da96c206
diff --git a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/AbstractLinkCollectionTest.java b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/AbstractLinkCollectionTest.java
index 9a8324c..f7389e7 100644
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/AbstractLinkCollectionTest.java
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/compiler/AbstractLinkCollectionTest.java
@@ -53,7 +53,7 @@
final ConnectPoint d2p0 = connectPoint("s2", 0);
final ConnectPoint d2p1 = connectPoint("s2", 1);
- ConnectPoint d2p10 = connectPoint("s2", 10);
+ final ConnectPoint d2p10 = connectPoint("s2", 10);
final ConnectPoint d3p0 = connectPoint("s3", 0);
final ConnectPoint d3p1 = connectPoint("s3", 1);
@@ -78,6 +78,7 @@
final ConnectPoint d1p1 = connectPoint("s1", 1);
final ConnectPoint d1p10 = connectPoint("s1", 10);
final ConnectPoint d1p11 = connectPoint("s1", 11);
+ final ConnectPoint d1p12 = connectPoint("s1", 12);
final Set<Link> links = ImmutableSet.of(
link(d1p1, d2p0),
@@ -98,6 +99,8 @@
);
final TrafficTreatment treatment = emptyTreatment();
+ final TrafficTreatment ethDstTreatment = macDstTreatment("C0:FF:EE:C0:FF:EE");
+ final TrafficTreatment decTllTreatment = decTtlTreatment();
final TrafficSelector selector = emptySelector();
final TrafficSelector vlan69Selector = vlanSelector("69");
@@ -109,7 +112,6 @@
final TrafficSelector mpls100Selector = mplsSelector("100");
final TrafficSelector mpls200Selector = mplsSelector("200");
final TrafficSelector ipPrefixSelector = ipPrefixDstSelector("192.168.100.0/24");
- final TrafficTreatment ethDstTreatment = macDstTreatment("C0:FF:EE:C0:FF:EE");
final List<Constraint> constraintsForVlan = vlanConstraint();
final List<Constraint> constraintsForMPLS = mplsConstraint();