Remove dependency on PointToPointIntentCompiler

Create an installable intent, not relying on an IntentCompiler. This change enables IntentCompilers to be moved to a dedicated package. Reference: ONOS-1066 Change-Id: Ie5bca33720232afaa4d6642d4f9fda933f6d00e3

Remove dependency on PointToPointIntentCompiler
Create an installable intent, not relying on an IntentCompiler. This change enables IntentCompilers to be moved to a dedicated package. Reference: ONOS-1066 Change-Id: Ie5bca33720232afaa4d6642d4f9fda933f6d00e3
Sho SHIMIZU · Ray Milkey
Commit b70521702dd87e9df0de5e3fbb620d79001799a3 b7052170 1 parent 0e738806
Showing 2 changed files with 123 additions and 128 deletions
core/net/src/test/java/org/onosproject/net/intent/impl/PathConstraintCalculationTest.java
core/net/src/test/java/org/onosproject/net/intent/impl/PointToPointIntentCompilerTest.java
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/PathConstraintCalculationTest.java
View file @b705217
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/PathConstraintCalculationTest.java
View file @b705217
@@ -15,31 +15,38 @@
  */
 package org.onosproject.net.intent.impl;
+import org.junit.Before;
 import org.junit.Test;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DefaultLink;
+import org.onosproject.net.DefaultPath;
+import org.onosproject.net.Link;
 import org.onosproject.net.flow.FlowRuleOperation;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.TrafficTreatment;
 import org.onosproject.net.intent.AbstractIntentTest;
 import org.onosproject.net.intent.Constraint;
-import org.onosproject.net.intent.Intent;
 import org.onosproject.net.intent.IntentTestsMocks;
 import org.onosproject.net.intent.PathIntent;
-import org.onosproject.net.intent.PointToPointIntent;
 import org.onosproject.net.intent.constraint.BandwidthConstraint;
 import org.onosproject.net.intent.constraint.LambdaConstraint;
 import org.onosproject.net.resource.Bandwidth;
 import org.onosproject.net.resource.Lambda;
-import org.onosproject.net.resource.LinkResourceService;
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.LinkedList;
 import java.util.List;
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.*;
+import static org.hamcrest.Matchers.hasSize;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.notNullValue;
 import static org.junit.Assert.fail;
+import static org.onosproject.net.DefaultEdgeLink.createEdgeLink;
+import static org.onosproject.net.Link.Type.DIRECT;
 import static org.onosproject.net.NetTestTools.APP_ID;
+import static org.onosproject.net.NetTestTools.PID;
 import static org.onosproject.net.NetTestTools.connectPoint;
+import static org.onosproject.net.intent.IntentTestsMocks.MockResourceService.makeBandwidthResourceService;
+import static org.onosproject.net.intent.IntentTestsMocks.MockResourceService.makeLambdaResourceService;
 /**
  * Unit tests for calculating paths for intents with constraints.
@@ -47,63 +54,26 @@ import static org.onosproject.net.NetTestTools.connectPoint;
 public class PathConstraintCalculationTest extends AbstractIntentTest {
-    /**
+    private final IntentTestsMocks.MockSelector selector = new IntentTestsMocks.MockSelector();
-     * Creates a point to point intent compiler for a three switch linear
+    private final IntentTestsMocks.MockTreatment treatment = new IntentTestsMocks.MockTreatment();
-     * topology.
+    private final ConnectPoint d1p1 = connectPoint("s1", 0);
-     *
+    private final ConnectPoint d2p0 = connectPoint("s2", 0);
-     * @param resourceService service to use for resource allocation requests
+    private final ConnectPoint d2p1 = connectPoint("s2", 1);
-     * @return point to point compiler
+    private final ConnectPoint d3p1 = connectPoint("s3", 1);
-     */
+    private final ConnectPoint d3p0 = connectPoint("s3", 10);
-    private PointToPointIntentCompiler makeCompiler(LinkResourceService resourceService) {
+    private final ConnectPoint d1p0 = connectPoint("s1", 10);
-        final String[] hops = {"s1", "s2", "s3"};
+
-        final PointToPointIntentCompiler compiler = new PointToPointIntentCompiler();
+    private PathIntentInstaller sut;
-        compiler.resourceService = resourceService;
+
-        compiler.pathService = new IntentTestsMocks.MockPathService(hops);
+    @Before
-        return compiler;
+    public void setUpIntentInstaller() {
+        sut = new PathIntentInstaller();
+        sut.appId = APP_ID;
     }
-    /**
+    private PathIntent createPathIntent(List<Link> links, List<Constraint> constratins) {
-     * Creates an intent with a given constraint and compiles it. The compiler
+        int hops = links.size() - 1;
-     * will throw PathNotFoundException if the allocations cannot be satisfied.
+        return new PathIntent(APP_ID, selector, treatment, new DefaultPath(PID, links, hops), constratins);
-     *
-     * @param constraint constraint to apply to the created intent
-     * @param resourceService service to use for resource allocation requests
-     * @return List of compiled intents
-     */
-    private List<Intent> compileIntent(Constraint constraint,
-                                       LinkResourceService resourceService) {
-        final List<Constraint> constraints = new LinkedList<>();
-        constraints.add(constraint);
-        final TrafficSelector selector = new IntentTestsMocks.MockSelector();
-        final TrafficTreatment treatment = new IntentTestsMocks.MockTreatment();
-
-        final PointToPointIntent intent =
-                new PointToPointIntent(APP_ID,
-                                       selector,
-                                       treatment,
-                                       connectPoint("s1", 1),
-                                       connectPoint("s3", 1),
-                                       constraints);
-        final PointToPointIntentCompiler compiler = makeCompiler(resourceService);
-
-        return compiler.compile(intent, null, null);
-    }
-
-    /**
-     * Installs a compiled path intent and returns the flow rules it generates.
-     *
-     * @param compiledIntents list of compiled intents
-     * @param resourceService service to use for resource allocation requests
-     * @return fow rule entries
-     */
-    private List<Collection<FlowRuleOperation>> installIntents(List<Intent> compiledIntents,
-                                                        LinkResourceService resourceService) {
-        final PathIntent path = (PathIntent) compiledIntents.get(0);
-
-        final PathIntentInstaller installer = new PathIntentInstaller();
-        installer.resourceService = resourceService;
-        installer.appId = APP_ID;
-        return installer.install(path);
     }
     /**
@@ -113,16 +83,19 @@ public class PathConstraintCalculationTest extends AbstractIntentTest {
     @Test
     public void testInstallBandwidthConstrainedIntentSuccess() {
-        final IntentTestsMocks.MockResourceService resourceService =
-                IntentTestsMocks.MockResourceService.makeBandwidthResourceService(1000.0);
         final Constraint constraint = new BandwidthConstraint(Bandwidth.bps(100.0));
-        final List<Intent> compiledIntents = compileIntent(constraint, resourceService);
+        List<Link> links = Arrays.asList(
-        assertThat(compiledIntents, notNullValue());
+                createEdgeLink(d1p0, true),
-        assertThat(compiledIntents, hasSize(1));
+                new DefaultLink(PID, d1p1, d2p0, DIRECT),
+                new DefaultLink(PID, d2p1, d3p1, DIRECT),
+                createEdgeLink(d3p0, false)
+        );
+        PathIntent installable = createPathIntent(links, Arrays.asList(constraint));
+
+        sut.resourceService = makeBandwidthResourceService(1000.0);
-        final List<Collection<FlowRuleOperation>> flowOperations =
+        final List<Collection<FlowRuleOperation>> flowOperations = sut.install(installable);
-                installIntents(compiledIntents, resourceService);
         assertThat(flowOperations, notNullValue());
         assertThat(flowOperations, hasSize(1));
@@ -135,19 +108,23 @@ public class PathConstraintCalculationTest extends AbstractIntentTest {
     @Test
     public void testInstallBandwidthConstrainedIntentFailure() {
-        final IntentTestsMocks.MockResourceService resourceService =
-                IntentTestsMocks.MockResourceService.makeBandwidthResourceService(1000.0);
         final Constraint constraint = new BandwidthConstraint(Bandwidth.bps(100.0));
-        final List<Intent> compiledIntents = compileIntent(constraint, resourceService);
+        List<Link> links = Arrays.asList(
-        assertThat(compiledIntents, notNullValue());
+                createEdgeLink(d1p0, true),
-        assertThat(compiledIntents, hasSize(1));
+                new DefaultLink(PID, d1p1, d2p0, DIRECT),
+                new DefaultLink(PID, d2p1, d3p1, DIRECT),
+                createEdgeLink(d3p0, false)
+        );
+        PathIntent installable = createPathIntent(links, Arrays.asList(constraint));
         // Make it look like the available bandwidth was consumed
+        final IntentTestsMocks.MockResourceService resourceService = makeBandwidthResourceService(1000.0);
         resourceService.setAvailableBandwidth(1.0);
+        sut.resourceService = resourceService;
         try {
-            installIntents(compiledIntents, resourceService);
+            sut.install(installable);
             fail("Bandwidth request with no available bandwidth did not fail.");
         } catch (IntentTestsMocks.MockedAllocationFailure failure) {
             assertThat(failure,
@@ -162,16 +139,19 @@ public class PathConstraintCalculationTest extends AbstractIntentTest {
     @Test
     public void testInstallLambdaConstrainedIntentSuccess() {
-        final IntentTestsMocks.MockResourceService resourceService =
-                IntentTestsMocks.MockResourceService.makeLambdaResourceService(1);
         final Constraint constraint = new LambdaConstraint(Lambda.valueOf(1));
-        final List<Intent> compiledIntents = compileIntent(constraint, resourceService);
+        List<Link> links = Arrays.asList(
-        assertThat(compiledIntents, notNullValue());
+                createEdgeLink(d1p0, true),
-        assertThat(compiledIntents, hasSize(1));
+                new DefaultLink(PID, d1p1, d2p0, DIRECT),
+                new DefaultLink(PID, d2p1, d3p1, DIRECT),
+                createEdgeLink(d3p0, false)
+        );
+        PathIntent installable = createPathIntent(links, Arrays.asList(constraint));
+
+        sut.resourceService = makeLambdaResourceService(1);
-        final List<Collection<FlowRuleOperation>> flowOperations =
+        final List<Collection<FlowRuleOperation>> flowOperations = sut.install(installable);
-                installIntents(compiledIntents, resourceService);
         assertThat(flowOperations, notNullValue());
         assertThat(flowOperations, hasSize(1));
@@ -184,19 +164,23 @@ public class PathConstraintCalculationTest extends AbstractIntentTest {
     @Test
     public void testInstallLambdaConstrainedIntentFailure() {
-        final IntentTestsMocks.MockResourceService resourceService =
-                IntentTestsMocks.MockResourceService.makeLambdaResourceService(1);
         final Constraint constraint = new LambdaConstraint(Lambda.valueOf(1));
-        final List<Intent> compiledIntents = compileIntent(constraint, resourceService);
+        List<Link> links = Arrays.asList(
-        assertThat(compiledIntents, notNullValue());
+                createEdgeLink(d1p0, true),
-        assertThat(compiledIntents, hasSize(1));
+                new DefaultLink(PID, d1p1, d2p0, DIRECT),
+                new DefaultLink(PID, d2p1, d3p1, DIRECT),
+                createEdgeLink(d3p0, false)
+        );
+        PathIntent installable = createPathIntent(links, Arrays.asList(constraint));
         // Make it look like the available lambda was consumed
+        final IntentTestsMocks.MockResourceService resourceService = makeLambdaResourceService(1);
         resourceService.setAvailableLambda(0);
+        sut.resourceService = resourceService;
         try {
-            installIntents(compiledIntents, resourceService);
+            sut.install(installable);
             fail("Lambda request with no available lambda did not fail.");
         } catch (IntentTestsMocks.MockedAllocationFailure failure) {
             assertThat(failure,
--- a/core/net/src/test/java/org/onosproject/net/intent/impl/PointToPointIntentCompilerTest.java
View file @b705217
+++ b/core/net/src/test/java/org/onosproject/net/intent/impl/PointToPointIntentCompilerTest.java
View file @b705217
@@ -36,7 +36,7 @@ import org.onosproject.net.resource.Bandwidth;
 import org.onosproject.net.resource.Lambda;
 import org.onosproject.net.resource.LinkResourceService;
-import java.util.LinkedList;
+import java.util.Arrays;
 import java.util.List;
 import static org.hamcrest.CoreMatchers.instanceOf;
@@ -77,14 +77,29 @@ public class PointToPointIntentCompilerTest extends AbstractIntentTest {
     }
     /**
+     * Creates a PointToPoint intent based on ingress and egress deviceIds and constraints.
+     *
+     * @param ingressIdString string for id of ingress device
+     * @param egressIdString  string for id of egress device
+     * @param constraints     constraints
+     * @return PointToPointIntent for the two device with constraints
+     */
+    private PointToPointIntent makeIntent(String ingressIdString,
+                                          String egressIdString, List<Constraint> constraints) {
+        return new PointToPointIntent(APPID, selector, treatment,
+                connectPoint(ingressIdString, 1),
+                connectPoint(egressIdString, 1),
+                constraints);
+    }
+
+    /**
      * Creates a compiler for HostToHost intents.
      *
      * @param hops string array describing the path hops to use when compiling
      * @return HostToHost intent compiler
      */
     private PointToPointIntentCompiler makeCompiler(String[] hops) {
-        PointToPointIntentCompiler compiler =
+        PointToPointIntentCompiler compiler = new PointToPointIntentCompiler();
-                new PointToPointIntentCompiler();
         compiler.pathService = new IntentTestsMocks.MockPathService(hops);
         return compiler;
     }
@@ -96,8 +111,7 @@ public class PointToPointIntentCompilerTest extends AbstractIntentTest {
      * @param resourceService service to use for resource allocation requests
      * @return point to point compiler
      */
-    private PointToPointIntentCompiler makeCompiler(LinkResourceService resourceService) {
+    private PointToPointIntentCompiler makeCompiler(String[] hops, LinkResourceService resourceService) {
-        final String[] hops = {"s1", "s2", "s3"};
         final PointToPointIntentCompiler compiler = new PointToPointIntentCompiler();
         compiler.resourceService = resourceService;
         compiler.pathService = new IntentTestsMocks.MockPathService(hops);
@@ -105,33 +119,6 @@ public class PointToPointIntentCompilerTest extends AbstractIntentTest {
     }
     /**
-     * Creates an intent with a given constraint and compiles it. The compiler
-     * will throw PathNotFoundException if the allocations cannot be satisfied.
-     *
-     * @param constraint constraint to apply to the created intent
-     * @param resourceService service to use for resource allocation requests
-     * @return List of compiled intents
-     */
-    private List<Intent> compileIntent(Constraint constraint,
-                                       LinkResourceService resourceService) {
-        final List<Constraint> constraints = new LinkedList<>();
-        constraints.add(constraint);
-        final TrafficSelector selector = new IntentTestsMocks.MockSelector();
-        final TrafficTreatment treatment = new IntentTestsMocks.MockTreatment();
-
-        final PointToPointIntent intent =
-                new PointToPointIntent(APP_ID,
-                        selector,
-                        treatment,
-                        connectPoint("s1", 1),
-                        connectPoint("s3", 1),
-                        constraints);
-        final PointToPointIntentCompiler compiler = makeCompiler(resourceService);
-
-        return compiler.compile(intent, null, null);
-    }
-
-    /**
      * Tests a pair of devices in an 8 hop path, forward direction.
      */
     @Test
@@ -225,9 +212,15 @@ public class PointToPointIntentCompilerTest extends AbstractIntentTest {
         final LinkResourceService resourceService =
                 IntentTestsMocks.MockResourceService.makeBandwidthResourceService(1000.0);
-        final Constraint constraint = new BandwidthConstraint(Bandwidth.bps(100.0));
+        final List<Constraint> constraints = Arrays.asList(new BandwidthConstraint(Bandwidth.bps(100.0)));
+
+        final PointToPointIntent intent = makeIntent("s1", "s3", constraints);
+
+        String[] hops = {"s1", "s2", "s3"};
+        final PointToPointIntentCompiler compiler = makeCompiler(hops, resourceService);
+
+        final List<Intent> compiledIntents = compiler.compile(intent, null, null);
-        final List<Intent> compiledIntents = compileIntent(constraint, resourceService);
         assertThat(compiledIntents, Matchers.notNullValue());
         assertThat(compiledIntents, hasSize(1));
     }
@@ -240,10 +233,16 @@ public class PointToPointIntentCompilerTest extends AbstractIntentTest {
         final LinkResourceService resourceService =
                 IntentTestsMocks.MockResourceService.makeBandwidthResourceService(10.0);
-        final Constraint constraint = new BandwidthConstraint(Bandwidth.bps(100.0));
+        final List<Constraint> constraints = Arrays.asList(new BandwidthConstraint(Bandwidth.bps(100.0)));
         try {
-            compileIntent(constraint, resourceService);
+            final PointToPointIntent intent = makeIntent("s1", "s3", constraints);
+
+            String[] hops = {"s1", "s2", "s3"};
+            final PointToPointIntentCompiler compiler = makeCompiler(hops, resourceService);
+
+            compiler.compile(intent, null, null);
+
             fail("Point to Point compilation with insufficient bandwidth does "
                     + "not throw exception.");
         } catch (PathNotFoundException noPath) {
@@ -257,12 +256,18 @@ public class PointToPointIntentCompilerTest extends AbstractIntentTest {
     @Test
     public void testLambdaConstrainedIntentSuccess() {
-        final Constraint constraint = new LambdaConstraint(Lambda.valueOf(1));
+        final List<Constraint> constraints = Arrays.asList(new LambdaConstraint(Lambda.valueOf(1)));
         final LinkResourceService resourceService =
                 IntentTestsMocks.MockResourceService.makeLambdaResourceService(1);
+        final PointToPointIntent intent = makeIntent("s1", "s3", constraints);
+
+        String[] hops = {"s1", "s2", "s3"};
+        final PointToPointIntentCompiler compiler = makeCompiler(hops, resourceService);
+
         final List<Intent> compiledIntents =
-                compileIntent(constraint, resourceService);
+                compiler.compile(intent, null, null);
+
         assertThat(compiledIntents, Matchers.notNullValue());
         assertThat(compiledIntents, hasSize(1));
     }
@@ -274,11 +279,17 @@ public class PointToPointIntentCompilerTest extends AbstractIntentTest {
     @Test
     public void testLambdaConstrainedIntentFailure() {
-        final Constraint constraint = new LambdaConstraint(Lambda.valueOf(1));
+        final List<Constraint> constraints = Arrays.asList(new LambdaConstraint(Lambda.valueOf(1)));
         final LinkResourceService resourceService =
                 IntentTestsMocks.MockResourceService.makeBandwidthResourceService(10.0);
         try {
-            compileIntent(constraint, resourceService);
+            final PointToPointIntent intent = makeIntent("s1", "s3", constraints);
+
+            String[] hops = {"s1", "s2", "s3"};
+            final PointToPointIntentCompiler compiler = makeCompiler(hops, resourceService);
+
+            compiler.compile(intent, null, null);
+
             fail("Point to Point compilation with no available lambda does "
                     + "not throw exception.");
         } catch (PathNotFoundException noPath) {