From 89a09ecd57a1ad7f590d06e775d4a5d082b1330d Mon Sep 17 00:00:00 2001 From: Sivachidambaram Subramanian Date: Tue, 11 Jul 2017 09:46:34 +0000 Subject: [PATCH] [ONOS-6409] Minor modification to fix the expectation count while posting flow objectives Change-Id: I9d882884afcacaff9179e9d8998687d13511d73a --- .../java/org/onosproject/demo/DemoInstaller.java | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/apps/test/demo/src/main/java/org/onosproject/demo/DemoInstaller.java b/apps/test/demo/src/main/java/org/onosproject/demo/DemoInstaller.java index ad29b6adfb..53dea1f43e 100644 --- a/apps/test/demo/src/main/java/org/onosproject/demo/DemoInstaller.java +++ b/apps/test/demo/src/main/java/org/onosproject/demo/DemoInstaller.java @@ -66,7 +66,7 @@ import org.onosproject.net.flow.FlowRuleOperationsContext; import org.onosproject.net.flow.FlowRuleService; import org.onosproject.net.flow.TrafficSelector; import org.onosproject.net.flow.TrafficTreatment; -import org.onosproject.net.flow.criteria.Criteria; +import org.onosproject.net.flow.criteria.Criterion; import org.onosproject.net.flow.instructions.Instructions; import org.onosproject.net.flowobjective.FlowObjectiveService; import org.onosproject.net.flowobjective.DefaultFilteringObjective; @@ -725,7 +725,7 @@ public class DemoInstaller implements DemoApi { private ObjectNode installForward() { ObjectNode node = mapper.createObjectNode(); long addStartTime = System.currentTimeMillis(); - int totalFlowObj = (flowObjPerDevice * deviceService.getDeviceCount()); + int totalFlowObj = (flowObjPerDevice * forwardingObj.keySet().size()); CountDownLatch installationLatch = new CountDownLatch(totalFlowObj); for (DeviceId dId : forwardingObj.keySet()) { Set fObjs = forwardingObj.get(dId); @@ -740,7 +740,7 @@ public class DemoInstaller implements DemoApi { } try { - installationLatch.await(); + installationLatch.await(10, TimeUnit.SECONDS); } catch (InterruptedException e) { Thread.interrupted(); } @@ -769,10 +769,14 @@ public class DemoInstaller implements DemoApi { for (int i = 0; i < flowObjPerDevice; i++) { TrafficTreatment.Builder tbuilder = DefaultTrafficTreatment.builder(); tbuilder.add(Instructions.createOutput(PortNumber.portNumber(2))); + TrafficSelector.Builder sbuilder = DefaultTrafficSelector.builder(); + sbuilder.matchInPort(PortNumber.portNumber(i + 3)); + sbuilder.matchEthDst(MacAddress.valueOf("12:00:00:00:00:10")); FilteringObjective.Builder fobBuilder = DefaultFilteringObjective.builder(); fobBuilder.fromApp(appId) - .addCondition(Criteria.matchEthType(2)) + .withKey(sbuilder.build().getCriterion(Criterion.Type.IN_PORT)) + .addCondition(sbuilder.build().getCriterion(Criterion.Type.ETH_DST)) .withMeta(tbuilder.build()) .permit() .withPriority(i + 1) @@ -790,7 +794,7 @@ public class DemoInstaller implements DemoApi { private ObjectNode installFilter() { ObjectNode node = mapper.createObjectNode(); long addStartTime = System.currentTimeMillis(); - int totalFlowObj = (flowObjPerDevice * deviceService.getDeviceCount()); + int totalFlowObj = (flowObjPerDevice * filteringObj.keySet().size()); CountDownLatch installationLatch = new CountDownLatch(totalFlowObj); for (DeviceId dId : filteringObj.keySet()) { Set fObjs = filteringObj.get(dId); @@ -805,7 +809,7 @@ public class DemoInstaller implements DemoApi { } try { - installationLatch.await(); + installationLatch.await(10, TimeUnit.SECONDS); } catch (InterruptedException e) { Thread.interrupted(); }