From e27e50cedc94c59e3c8ffdc462dff1209cce9af5 Mon Sep 17 00:00:00 2001 From: Jozef Gloncak Date: Tue, 24 Feb 2015 14:00:56 +0100 Subject: [PATCH] Bug 2750 - migrate drop-test to drop-test-karaf. Move methods _showDropStats(....) and _clearDropStats(....) from drop-test artifact to drop-test-karaf artifact. Change-Id: Iaaa5cab7fd6f3774784a0121c7a98bbe3dbdfaae Signed-off-by: Jozef Gloncak --- .../ClearDropStatsCommandProvider.java | 35 +++++++++++++++++++ .../ShowDropStatsCommandProvider.java | 32 +++++++++++++++++ .../resources/OSGI-INF/blueprint/commands.xml | 8 ++++- 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 drop-test-karaf/src/main/java/org/opendaylight/openflowplugin/droptestkaraf/ClearDropStatsCommandProvider.java create mode 100644 drop-test-karaf/src/main/java/org/opendaylight/openflowplugin/droptestkaraf/ShowDropStatsCommandProvider.java diff --git a/drop-test-karaf/src/main/java/org/opendaylight/openflowplugin/droptestkaraf/ClearDropStatsCommandProvider.java b/drop-test-karaf/src/main/java/org/opendaylight/openflowplugin/droptestkaraf/ClearDropStatsCommandProvider.java new file mode 100644 index 0000000000..192092b7cf --- /dev/null +++ b/drop-test-karaf/src/main/java/org/opendaylight/openflowplugin/droptestkaraf/ClearDropStatsCommandProvider.java @@ -0,0 +1,35 @@ +/** + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + +package org.opendaylight.openflowplugin.droptestkaraf; + +import org.opendaylight.openflowplugin.testcommon.DropTestDsProvider; + +import java.io.PrintStream; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.console.OsgiCommandSupport; +import org.opendaylight.openflowplugin.testcommon.DropTestRpcProvider; + +@Command(scope = "drop-test", name = "clearDropStats", description = "Clear drop statistics.") +public class ClearDropStatsCommandProvider extends OsgiCommandSupport { + + @Override + protected Object doExecute() throws Exception { + PrintStream out = session.getConsole(); + final DropTestRpcProvider rpcProvider = DropTestActivator.getDropRpcProvider(); + final DropTestDsProvider provider = DropTestActivator.getDropDsProvider(); + + out.println("Clearing drop statistics... "); + rpcProvider.clearStats(); + provider.clearStats(); + out.println("Done."); + + return null; + } + +} diff --git a/drop-test-karaf/src/main/java/org/opendaylight/openflowplugin/droptestkaraf/ShowDropStatsCommandProvider.java b/drop-test-karaf/src/main/java/org/opendaylight/openflowplugin/droptestkaraf/ShowDropStatsCommandProvider.java new file mode 100644 index 0000000000..5f48d9873c --- /dev/null +++ b/drop-test-karaf/src/main/java/org/opendaylight/openflowplugin/droptestkaraf/ShowDropStatsCommandProvider.java @@ -0,0 +1,32 @@ +/** + * Copyright (c) 2013 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + +package org.opendaylight.openflowplugin.droptestkaraf; + +import java.io.PrintStream; +import org.apache.karaf.shell.commands.Command; +import org.apache.karaf.shell.console.OsgiCommandSupport; +import org.opendaylight.openflowplugin.testcommon.DropTestDsProvider; +import org.opendaylight.openflowplugin.testcommon.DropTestRpcProvider; + +@Command(scope = "drop-test", name = "showDropStats", description = "Show drop statistics.") +public class ShowDropStatsCommandProvider extends OsgiCommandSupport { + + @Override + protected Object doExecute() throws Exception { + PrintStream out = session.getConsole(); + final DropTestRpcProvider rpcProvider = DropTestActivator.getDropRpcProvider(); + final DropTestDsProvider provider = DropTestActivator.getDropDsProvider(); + + out.format("RPC Test Statistics: %s%n", rpcProvider.getStats().toString()); + out.format("FRM Test Statistics: %s%n", provider.getStats().toString()); + + return null; + } + +} diff --git a/drop-test-karaf/src/main/resources/OSGI-INF/blueprint/commands.xml b/drop-test-karaf/src/main/resources/OSGI-INF/blueprint/commands.xml index 0bbfafcc8e..4bb02855d5 100644 --- a/drop-test-karaf/src/main/resources/OSGI-INF/blueprint/commands.xml +++ b/drop-test-karaf/src/main/resources/OSGI-INF/blueprint/commands.xml @@ -16,8 +16,14 @@ + + + + + + - + \ No newline at end of file -- 2.36.6