Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyClientCommand.java b/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyClientCommand.java
index b63f9c1..d308171 100644
--- a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyClientCommand.java
+++ b/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyClientCommand.java
@@ -10,7 +10,7 @@
* Test Netty client performance.
*/
@Command(scope = "onos", name = "simple-netty-client",
- description = "Starts the simple Netty client")
+ description = "Starts simple Netty client")
public class SimpleNettyClientCommand extends AbstractShellCommand {
//FIXME: replace these arguments with proper ones needed for the test.
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServer.java b/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServer.java
index 5578fcd..47b05cd 100644
--- a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServer.java
+++ b/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServer.java
@@ -18,7 +18,8 @@
}
public static void startStandalone(String[] args) throws Exception {
- NettyMessagingService server = new NettyMessagingService(8081);
+ int port = args.length > 0 ? Integer.parseInt(args[0]) : 8081;
+ NettyMessagingService server = new NettyMessagingService(port);
server.activate();
server.registerHandler("simple", new NettyLoggingHandler());
server.registerHandler("echo", new NettyEchoHandler());
diff --git a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServerCommand.java b/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServerCommand.java
index 17b2586..3190d10 100644
--- a/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServerCommand.java
+++ b/apps/foo/src/main/java/org/onlab/onos/foo/SimpleNettyServerCommand.java
@@ -10,26 +10,18 @@
* Starts the Simple Netty server.
*/
@Command(scope = "onos", name = "simple-netty-server",
- description = "Starts the simple netty server")
+ description = "Starts simple Netty server")
public class SimpleNettyServerCommand extends AbstractShellCommand {
//FIXME: Replace these with parameters for
- @Argument(index = 0, name = "serverIp", description = "Server IP address",
+ @Argument(index = 0, name = "port", description = "listen port",
required = false, multiValued = false)
- String serverIp = "127.0.0.1";
-
- @Argument(index = 1, name = "workers", description = "IO workers",
- required = false, multiValued = false)
- String workers = "6";
-
- @Argument(index = 2, name = "messageLength", description = "Message length (bytes)",
- required = false, multiValued = false)
- String messageLength = "128";
+ String port = "8081";
@Override
protected void execute() {
try {
- startStandalone(new String[]{serverIp, workers, messageLength});
+ startStandalone(new String[]{port});
} catch (Exception e) {
error("Unable to start server %s", e);
}