From ba3a4c66dd9a757fd600f9531023281b71f3ffc9 Mon Sep 17 00:00:00 2001 From: Martin Bobak Date: Mon, 30 Mar 2015 16:41:04 +0200 Subject: [PATCH] unifying statistics manager api packages Change-Id: I29b495fd26c45ce50e73b96c9d23380eeb09f4c1 Signed-off-by: Martin Bobak --- .../api/openflow/md/core/session/SessionManager.java | 2 +- .../api/{ => openflow}/statistics/MessageCountDumper.java | 2 +- .../api/{ => openflow}/statistics/MessageObservatory.java | 2 +- .../api/{ => openflow}/statistics/MessageSpy.java | 2 +- openflowplugin-impl/src/main/yang/openflow-plugin-impl.yang | 2 +- .../openflowplugin/openflow/md/core/MDController.java | 2 +- .../openflow/md/core/NotificationPopListener.java | 2 +- .../openflow/md/core/RpcListeningExecutorService.java | 2 +- .../openflow/md/core/SwitchConnectionHandlerImpl.java | 2 +- .../openflow/md/core/sal/OFRpcTaskContext.java | 2 +- .../openflowplugin/openflow/md/core/sal/OFRpcTaskUtil.java | 2 +- .../openflow/md/core/sal/OpenflowPluginProvider.java | 4 ++-- .../openflow/md/core/session/SessionManagerOFImpl.java | 2 +- .../openflow/md/queue/QueueProcessorLightImpl.java | 4 ++-- .../openflow/md/queue/TicketProcessorFactory.java | 2 +- .../openflow/md/queue/TicketProcessorFactoryImpl.java | 2 +- .../openflowplugin/statistics/MessageSpyCounterImpl.java | 2 +- .../common/config/impl/rev140326/MsgSpyServiceModule.java | 6 ++---- openflowplugin/src/main/yang/openflow-plugin-cfg-impl.yang | 2 +- .../openflow/md/core/ConnectionConductorImplTest.java | 2 +- .../openflow/md/core/SwitchConnectionHandlerImplTest.java | 2 +- .../openflow/md/core/sal/ModelDrivenSwitchImplTest.java | 2 +- .../statistics/MessageSpyCounterImplTest.java | 2 +- 23 files changed, 26 insertions(+), 28 deletions(-) rename openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/{ => openflow}/statistics/MessageCountDumper.java (88%) rename openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/{ => openflow}/statistics/MessageObservatory.java (87%) rename openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/{ => openflow}/statistics/MessageSpy.java (96%) diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/session/SessionManager.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/session/SessionManager.java index 9b45a1a87a..b8aa9edf42 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/session/SessionManager.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/md/core/session/SessionManager.java @@ -18,7 +18,7 @@ import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter; import org.opendaylight.openflowplugin.api.openflow.md.core.ConnectionConductor; import org.opendaylight.openflowplugin.api.openflow.md.core.IMDMessageTranslator; import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher; -import org.opendaylight.openflowplugin.api.statistics.MessageSpy; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy; import org.opendaylight.openflowplugin.api.openflow.md.core.TranslatorKey; import org.opendaylight.openflowplugin.api.openflow.md.queue.PopListener; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/statistics/MessageCountDumper.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/MessageCountDumper.java similarity index 88% rename from openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/statistics/MessageCountDumper.java rename to openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/MessageCountDumper.java index a8f27c1670..d61b41670f 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/statistics/MessageCountDumper.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/MessageCountDumper.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.openflowplugin.api.statistics; +package org.opendaylight.openflowplugin.api.openflow.statistics; import java.util.List; diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/statistics/MessageObservatory.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/MessageObservatory.java similarity index 87% rename from openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/statistics/MessageObservatory.java rename to openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/MessageObservatory.java index 6aa573858f..1bc88b9df4 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/statistics/MessageObservatory.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/MessageObservatory.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.openflowplugin.api.statistics; +package org.opendaylight.openflowplugin.api.openflow.statistics; /** diff --git a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/statistics/MessageSpy.java b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/MessageSpy.java similarity index 96% rename from openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/statistics/MessageSpy.java rename to openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/MessageSpy.java index e4eb7926c0..078e1bb81a 100644 --- a/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/statistics/MessageSpy.java +++ b/openflowplugin-api/src/main/java/org/opendaylight/openflowplugin/api/openflow/statistics/MessageSpy.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.openflowplugin.api.statistics; +package org.opendaylight.openflowplugin.api.openflow.statistics; /** diff --git a/openflowplugin-impl/src/main/yang/openflow-plugin-impl.yang b/openflowplugin-impl/src/main/yang/openflow-plugin-impl.yang index 23af39125f..baa11b41a3 100644 --- a/openflowplugin-impl/src/main/yang/openflow-plugin-impl.yang +++ b/openflowplugin-impl/src/main/yang/openflow-plugin-impl.yang @@ -31,7 +31,7 @@ module openflow-plugin-provider-impl { description "MessageCountDumperServiceInterface as a MsgSpyService interface identity"; base config:service-type; - config:java-class "org.opendaylight.openflowplugin.api.statistics.MessageCountDumper"; + config:java-class "org.opendaylight.openflowplugin.api.openflow.statistics.MessageCountDumper"; } identity msg-spy-service-impl { diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/MDController.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/MDController.java index c425c08f37..eb2668bc6f 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/MDController.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/MDController.java @@ -47,7 +47,7 @@ import org.opendaylight.openflowplugin.openflow.md.core.translator.PacketInV10Tr import org.opendaylight.openflowplugin.openflow.md.core.translator.PortStatusMessageToNodeConnectorUpdatedTranslator; import org.opendaylight.openflowplugin.api.openflow.md.queue.PopListener; import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil; -import org.opendaylight.openflowplugin.api.statistics.MessageSpy; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.NodeErrorNotification; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SwitchFlowRemoved; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.statistics.rev130819.AggregateFlowStatisticsUpdate; diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/NotificationPopListener.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/NotificationPopListener.java index 28f2a72d15..9b6f40ba1c 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/NotificationPopListener.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/NotificationPopListener.java @@ -9,7 +9,7 @@ package org.opendaylight.openflowplugin.openflow.md.core; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.openflowplugin.api.openflow.md.queue.PopListener; -import org.opendaylight.openflowplugin.api.statistics.MessageSpy; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy; import org.opendaylight.yangtools.yang.binding.Notification; /** diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/RpcListeningExecutorService.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/RpcListeningExecutorService.java index a4d2ec3500..be1ae2cb46 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/RpcListeningExecutorService.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/RpcListeningExecutorService.java @@ -16,7 +16,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import org.opendaylight.openflowplugin.openflow.md.core.sal.OFRpcTask; -import org.opendaylight.openflowplugin.api.statistics.MessageSpy; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy; import org.opendaylight.yangtools.yang.binding.DataContainer; import com.google.common.util.concurrent.ListenableFuture; diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/SwitchConnectionHandlerImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/SwitchConnectionHandlerImpl.java index d279871957..287b605d55 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/SwitchConnectionHandlerImpl.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/SwitchConnectionHandlerImpl.java @@ -18,7 +18,7 @@ import org.opendaylight.openflowplugin.api.openflow.md.core.ConnectionConductor; import org.opendaylight.openflowplugin.api.openflow.md.core.ErrorHandler; import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil; import org.opendaylight.openflowplugin.openflow.md.queue.QueueProcessorLightImpl; -import org.opendaylight.openflowplugin.api.statistics.MessageSpy; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy; import org.opendaylight.yangtools.yang.binding.DataContainer; /** diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcTaskContext.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcTaskContext.java index c18ab92099..ab8e428428 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcTaskContext.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcTaskContext.java @@ -12,7 +12,7 @@ import java.util.concurrent.TimeUnit; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.openflowplugin.api.openflow.md.core.session.IMessageDispatchService; import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext; -import org.opendaylight.openflowplugin.api.statistics.MessageSpy; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy; import org.opendaylight.yangtools.yang.binding.DataContainer; import com.google.common.util.concurrent.ListeningExecutorService; diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcTaskUtil.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcTaskUtil.java index 53f7a86260..aa59636598 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcTaskUtil.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OFRpcTaskUtil.java @@ -17,7 +17,7 @@ import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.openflowplugin.api.OFConstants; import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher; import org.opendaylight.openflowplugin.api.openflow.md.core.sal.NotificationComposer; -import org.opendaylight.openflowplugin.api.statistics.MessageSpy; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy; import org.opendaylight.openflowplugin.openflow.md.util.RpcInputOutputTuple; import org.opendaylight.openflowplugin.openflow.md.util.TaskUtil; diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OpenflowPluginProvider.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OpenflowPluginProvider.java index 33b65a4bc2..08d0cb7f40 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OpenflowPluginProvider.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/sal/OpenflowPluginProvider.java @@ -18,8 +18,8 @@ import org.opendaylight.openflowplugin.openflow.md.core.extension.ExtensionConve import org.opendaylight.openflowplugin.openflow.md.core.extension.ExtensionConverterManagerImpl; import org.opendaylight.openflowplugin.openflow.md.core.session.OFRoleManager; import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil; -import org.opendaylight.openflowplugin.api.statistics.MessageCountDumper; -import org.opendaylight.openflowplugin.api.statistics.MessageObservatory; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageCountDumper; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageObservatory; import org.opendaylight.openflowplugin.statistics.MessageSpyCounterImpl; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.openflow.common.config.impl.rev140326.OfpRole; import org.opendaylight.yangtools.yang.binding.DataContainer; diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/SessionManagerOFImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/SessionManagerOFImpl.java index be2982195d..15c191b275 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/SessionManagerOFImpl.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/core/session/SessionManagerOFImpl.java @@ -25,7 +25,7 @@ import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionConte import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionListener; import org.opendaylight.openflowplugin.api.openflow.md.core.session.SwitchSessionKeyOF; import org.opendaylight.openflowplugin.api.openflow.md.queue.PopListener; -import org.opendaylight.openflowplugin.api.statistics.MessageSpy; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy; import org.opendaylight.openflowplugin.extension.api.core.extension.ExtensionConverterProvider; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; import org.opendaylight.yangtools.concepts.ListenerRegistration; diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueProcessorLightImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueProcessorLightImpl.java index 005237b027..2df8fb229e 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueProcessorLightImpl.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/QueueProcessorLightImpl.java @@ -25,8 +25,8 @@ import org.opendaylight.openflowplugin.api.openflow.md.queue.PopListener; import org.opendaylight.openflowplugin.api.openflow.md.queue.QueueItem; import org.opendaylight.openflowplugin.api.openflow.md.queue.QueueKeeper; import org.opendaylight.openflowplugin.api.openflow.md.queue.QueueProcessor; -import org.opendaylight.openflowplugin.api.statistics.MessageSpy; -import org.opendaylight.openflowplugin.api.statistics.MessageSpy.STATISTIC_GROUP; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy.STATISTIC_GROUP; import org.opendaylight.openflowplugin.api.openflow.md.core.IMDMessageTranslator; import org.opendaylight.openflowplugin.openflow.md.core.ThreadPoolLoggingExecutor; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketProcessorFactory.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketProcessorFactory.java index 23dabac11d..50cb775e67 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketProcessorFactory.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketProcessorFactory.java @@ -13,7 +13,7 @@ import java.util.Map; import org.opendaylight.openflowplugin.api.openflow.md.core.IMDMessageTranslator; import org.opendaylight.openflowplugin.api.openflow.md.core.TranslatorKey; -import org.opendaylight.openflowplugin.api.statistics.MessageSpy; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy; import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.binding.DataObject; diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketProcessorFactoryImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketProcessorFactoryImpl.java index 3bf375539c..b034693055 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketProcessorFactoryImpl.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/openflow/md/queue/TicketProcessorFactoryImpl.java @@ -16,7 +16,7 @@ import org.opendaylight.openflowplugin.api.openflow.md.core.ConnectionConductor; import org.opendaylight.openflowplugin.api.openflow.md.core.IMDMessageTranslator; import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher; import org.opendaylight.openflowplugin.api.openflow.md.core.TranslatorKey; -import org.opendaylight.openflowplugin.api.statistics.MessageSpy; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.protocol.rev130731.OfHeader; import org.opendaylight.yangtools.yang.binding.DataContainer; import org.opendaylight.yangtools.yang.binding.DataObject; diff --git a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/statistics/MessageSpyCounterImpl.java b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/statistics/MessageSpyCounterImpl.java index 5f3255b7f3..ef594bb7d3 100644 --- a/openflowplugin/src/main/java/org/opendaylight/openflowplugin/statistics/MessageSpyCounterImpl.java +++ b/openflowplugin/src/main/java/org/opendaylight/openflowplugin/statistics/MessageSpyCounterImpl.java @@ -16,7 +16,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLongFieldUpdater; -import org.opendaylight.openflowplugin.api.statistics.MessageObservatory; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageObservatory; import org.opendaylight.yangtools.yang.binding.DataContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/MsgSpyServiceModule.java b/openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/MsgSpyServiceModule.java index c30782928a..8e1179ba01 100644 --- a/openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/MsgSpyServiceModule.java +++ b/openflowplugin/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/openflow/common/config/impl/rev140326/MsgSpyServiceModule.java @@ -4,13 +4,11 @@ import java.text.SimpleDateFormat; import java.util.List; import org.opendaylight.openflowplugin.openflow.md.core.sal.OpenflowPluginProvider; -import org.opendaylight.openflowplugin.api.statistics.MessageCountDumper; -import org.opendaylight.openflowplugin.api.statistics.MessageObservatory; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageCountDumper; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageObservatory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Strings; - /** * MsgSpyServiceModul implements and register own MsgSpyServiceRuntimeMXBean * which is linked to {@link MessageObservatory} from {@link OpenflowPluginProvider} diff --git a/openflowplugin/src/main/yang/openflow-plugin-cfg-impl.yang b/openflowplugin/src/main/yang/openflow-plugin-cfg-impl.yang index ed459ece7e..bd9e968563 100644 --- a/openflowplugin/src/main/yang/openflow-plugin-cfg-impl.yang +++ b/openflowplugin/src/main/yang/openflow-plugin-cfg-impl.yang @@ -28,7 +28,7 @@ module openflow-provider-impl { description "MessageCountDumperServiceInterface as a MsgSpyService interface identity"; base config:service-type; - config:java-class "org.opendaylight.openflowplugin.api.statistics.MessageCountDumper"; + config:java-class "org.opendaylight.openflowplugin.api.openflow.statistics.MessageCountDumper"; } identity msg-spy-service-impl { diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImplTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImplTest.java index 5d586ca12a..df377d137d 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImplTest.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/ConnectionConductorImplTest.java @@ -40,7 +40,7 @@ import org.opendaylight.openflowplugin.openflow.md.core.plan.SwitchTestEvent; import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext; import org.opendaylight.openflowplugin.api.openflow.md.queue.PopListener; import org.opendaylight.openflowplugin.openflow.md.queue.QueueProcessorLightImpl; -import org.opendaylight.openflowplugin.api.statistics.MessageSpy; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.Capabilities; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeatures; import org.opendaylight.yang.gen.v1.urn.opendaylight.openflow.common.types.rev130731.PortFeaturesV10; diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/SwitchConnectionHandlerImplTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/SwitchConnectionHandlerImplTest.java index c360dcf80c..8d9b8a37f6 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/SwitchConnectionHandlerImplTest.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/SwitchConnectionHandlerImplTest.java @@ -16,7 +16,7 @@ import org.mockito.Mock; import org.mockito.runners.MockitoJUnitRunner; import org.opendaylight.openflowjava.protocol.api.connection.ConnectionAdapter; import org.opendaylight.openflowplugin.api.openflow.md.core.ErrorHandler; -import org.opendaylight.openflowplugin.api.statistics.MessageSpy; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy; import org.opendaylight.yangtools.yang.binding.DataContainer; /** diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImplTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImplTest.java index 16f8c88c1e..9d7bb99bba 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImplTest.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/openflow/md/core/sal/ModelDrivenSwitchImplTest.java @@ -29,7 +29,7 @@ import org.opendaylight.openflowplugin.api.openflow.md.core.ConnectionConductor; import org.opendaylight.openflowplugin.api.openflow.md.core.SwitchConnectionDistinguisher; import org.opendaylight.openflowplugin.api.openflow.md.core.session.IMessageDispatchService; import org.opendaylight.openflowplugin.api.openflow.md.core.session.SessionContext; -import org.opendaylight.openflowplugin.api.statistics.MessageSpy; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy; import org.opendaylight.openflowplugin.openflow.md.core.session.OFSessionUtil; import org.opendaylight.openflowplugin.openflow.md.util.OpenflowPortsUtil; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress; diff --git a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/statistics/MessageSpyCounterImplTest.java b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/statistics/MessageSpyCounterImplTest.java index b23c269aae..249803836a 100644 --- a/openflowplugin/src/test/java/org/opendaylight/openflowplugin/statistics/MessageSpyCounterImplTest.java +++ b/openflowplugin/src/test/java/org/opendaylight/openflowplugin/statistics/MessageSpyCounterImplTest.java @@ -12,7 +12,7 @@ import static org.junit.Assert.assertEquals; import java.util.List; import org.junit.Test; -import org.opendaylight.openflowplugin.api.statistics.MessageSpy; +import org.opendaylight.openflowplugin.api.openflow.statistics.MessageSpy; import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.Action; import org.opendaylight.yangtools.yang.binding.DataContainer; -- 2.36.6