From b76fe17d4065439b3cab6f21845bc9a5fa407651 Mon Sep 17 00:00:00 2001 From: Brian O'Connor Date: Fri, 10 Oct 2014 16:15:21 -0700 Subject: [PATCH 1/2] adding onos-update-bundle command to push local bundles --- tools/test/bin/onos-update-bundle | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100755 tools/test/bin/onos-update-bundle diff --git a/tools/test/bin/onos-update-bundle b/tools/test/bin/onos-update-bundle new file mode 100755 index 0000000000..9998ea3f46 --- /dev/null +++ b/tools/test/bin/onos-update-bundle @@ -0,0 +1,16 @@ +#!/bin/bash +#------------------------------------------------------------------------------- +# Update bundle on locally running karaf. +#------------------------------------------------------------------------------- + +[ ! -d "$ONOS_ROOT" ] && echo "ONOS_ROOT is not defined" >&2 && exit 1 +. $ONOS_ROOT/tools/build/envDefaults + +cd ~/.m2/repository +jar=$(find org/onlab -type f -name '*.jar' | grep -e $1 | grep -v -e -tests | head -n 1) + +[ -z "$jar" ] && echo "No bundle $1 found for" && exit 1 + +bundle=$(echo $(basename $jar .jar) | sed 's/-[0-9].*//g') + +client "bundle:update -f $bundle" 2>/dev/null From 1aa99eb97306e9f3c5dcb8dc3b42f139abf361c5 Mon Sep 17 00:00:00 2001 From: Brian O'Connor Date: Fri, 10 Oct 2014 16:18:58 -0700 Subject: [PATCH 2/2] adding push-test-intents command to test intent performance --- .../onos/cli/net/IntentPushTestCommand.java | 140 ++++++++++++++++++ .../OSGI-INF/blueprint/shell-config.xml | 7 + 2 files changed, 147 insertions(+) create mode 100644 cli/src/main/java/org/onlab/onos/cli/net/IntentPushTestCommand.java diff --git a/cli/src/main/java/org/onlab/onos/cli/net/IntentPushTestCommand.java b/cli/src/main/java/org/onlab/onos/cli/net/IntentPushTestCommand.java new file mode 100644 index 0000000000..30c289e70a --- /dev/null +++ b/cli/src/main/java/org/onlab/onos/cli/net/IntentPushTestCommand.java @@ -0,0 +1,140 @@ +package org.onlab.onos.cli.net; + +import java.util.concurrent.CountDownLatch; +import java.util.concurrent.TimeUnit; + +import org.apache.karaf.shell.commands.Argument; +import org.apache.karaf.shell.commands.Command; +import org.onlab.onos.cli.AbstractShellCommand; +import org.onlab.onos.net.ConnectPoint; +import org.onlab.onos.net.DeviceId; +import org.onlab.onos.net.PortNumber; +import org.onlab.onos.net.flow.DefaultTrafficSelector; +import org.onlab.onos.net.flow.DefaultTrafficTreatment; +import org.onlab.onos.net.flow.TrafficSelector; +import org.onlab.onos.net.flow.TrafficTreatment; +import org.onlab.onos.net.intent.Intent; +import org.onlab.onos.net.intent.IntentEvent; +import org.onlab.onos.net.intent.IntentEvent.Type; +import org.onlab.onos.net.intent.IntentId; +import org.onlab.onos.net.intent.IntentListener; +import org.onlab.onos.net.intent.IntentService; +import org.onlab.onos.net.intent.PointToPointIntent; +import org.onlab.packet.Ethernet; +import org.onlab.packet.MacAddress; + +/** + * Installs point-to-point connectivity intents. + */ +@Command(scope = "onos", name = "push-test-intents", + description = "Installs random intents to test throughput") +public class IntentPushTestCommand extends AbstractShellCommand + implements IntentListener { + + @Argument(index = 0, name = "ingressDevice", + description = "Ingress Device/Port Description", + required = true, multiValued = false) + String ingressDeviceString = null; + + @Argument(index = 1, name = "egressDevice", + description = "Egress Device/Port Description", + required = true, multiValued = false) + String egressDeviceString = null; + + @Argument(index = 2, name = "count", + description = "Number of intents to push", + required = true, multiValued = false) + String countString = null; + + + private static long id = 0x7870001; + + private IntentService service; + private CountDownLatch latch; + private long start, end; + + @Override + protected void execute() { + service = get(IntentService.class); + + DeviceId ingressDeviceId = DeviceId.deviceId(getDeviceId(ingressDeviceString)); + PortNumber ingressPortNumber = + PortNumber.portNumber(getPortNumber(ingressDeviceString)); + ConnectPoint ingress = new ConnectPoint(ingressDeviceId, ingressPortNumber); + + DeviceId egressDeviceId = DeviceId.deviceId(getDeviceId(egressDeviceString)); + PortNumber egressPortNumber = + PortNumber.portNumber(getPortNumber(egressDeviceString)); + ConnectPoint egress = new ConnectPoint(egressDeviceId, egressPortNumber); + + TrafficSelector.Builder selector = DefaultTrafficSelector.builder() + .matchEthType(Ethernet.TYPE_IPV4); + TrafficTreatment treatment = DefaultTrafficTreatment.builder().build(); + + int count = Integer.parseInt(countString); + + service.addListener(this); + start = System.currentTimeMillis(); + for (int i = 0; i < count; i++) { + TrafficSelector s = selector + .matchEthSrc(MacAddress.valueOf(i)) + .build(); + Intent intent = + new PointToPointIntent(new IntentId(id++), + s, + treatment, + ingress, + egress); + service.submit(intent); + } + latch = new CountDownLatch(count); + try { + latch.await(3, TimeUnit.SECONDS); + printResults(count); + } catch (InterruptedException e) { + print(e.toString()); + } + service.removeListener(this); + } + + private void printResults(int count) { + long delta = end - start; + print("Time to install %d intents: %d ms", count, delta); + } + + /** + * Extracts the port number portion of the ConnectPoint. + * + * @param deviceString string representing the device/port + * @return port number as a string, empty string if the port is not found + */ + private String getPortNumber(String deviceString) { + int slash = deviceString.indexOf('/'); + if (slash <= 0) { + return ""; + } + return deviceString.substring(slash + 1, deviceString.length()); + } + + /** + * Extracts the device ID portion of the ConnectPoint. + * + * @param deviceString string representing the device/port + * @return device ID string + */ + private String getDeviceId(String deviceString) { + int slash = deviceString.indexOf('/'); + if (slash <= 0) { + return ""; + } + return deviceString.substring(0, slash); + } + + @Override + public void event(IntentEvent event) { + if (event.type() == Type.INSTALLED) { + end = event.time(); + latch.countDown(); + } + } +} diff --git a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml index 6120d30634..e13c5eaa76 100644 --- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml +++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml @@ -82,6 +82,13 @@ + + + + + + +