From 75a11d0689ed5eeace41c86f7a67cd9d5528c70b Mon Sep 17 00:00:00 2001 From: David Suarez Date: Thu, 8 Mar 2018 10:11:20 +0100 Subject: [PATCH] Refactor to change packages' names org.opendaylight.sfc.ofrenderer package is replaced by a more canonical name: org.opendaylight.sfc.renderers.openflow Change-Id: I170fefdca841d7deeb86d42d587a4478c4073467 Signed-off-by: David Suarez --- .../openflow}/SfcOfRenderer.java | 22 +++---- .../listeners/SfcOfAbstractDataListener.java | 2 +- .../listeners/SfcOfRendererDataListener.java | 6 +- .../listeners/SfcOfRspDataListener.java | 4 +- .../listeners/SfcOfSfgDataListener.java | 8 +-- .../openflow/SfcIpv4PacketInHandler.java | 2 +- .../openflow/SfcOfFlowProgrammerImpl.java | 4 +- .../SfcOfFlowProgrammerInterface.java | 4 +- .../processors/SfcOfRspProcessor.java | 14 ++--- .../processors/SfcRenderingException.java | 2 +- .../processors/SfcRspProcessorLogicalSff.java | 8 +-- .../SfcRspProcessorMacChaining.java | 2 +- .../processors/SfcRspProcessorMpls.java | 4 +- .../processors/SfcRspProcessorNshEth.java | 4 +- .../processors/SfcRspProcessorNshVxgpe.java | 4 +- .../processors/SfcRspProcessorVlan.java | 7 +-- .../SfcRspTransportProcessorBase.java | 8 +-- .../openflow}/processors/SffGraph.java | 2 +- .../openflow}/sfg/GroupBucketInfo.java | 2 +- .../utils/SfcOfBaseProviderUtils.java | 2 +- .../openflow}/utils/SfcOfProviderUtils.java | 2 +- .../openflow}/utils/SfcSynchronizer.java | 2 +- .../OperDsUpdateHandlerInterface.java | 4 +- .../OperDsUpdateHandlerLSFFImpl.java | 13 ++--- .../blueprint/sfc-openflow-renderer.xml | 2 +- .../openflow}/RspBuilder.java | 4 +- .../openflow}/SfcIpv4PacketInHandlerTest.java | 6 +- .../openflow}/SfcOfFlowProgrammerTest.java | 4 +- .../SfcOfRspTransactionalProcessorTest.java | 12 ++-- .../SfcOfRendererDataListenerTest.java | 8 +-- .../listeners/SfcOfRspDataListenerTest.java | 4 +- .../SfcOfLogicalSffRspProcessorTest.java | 58 +++++++++---------- .../processors/SfcOfRspProcessorTest.java | 16 ++--- .../utils/SfcOfProviderUtilsTestMock.java | 2 +- 34 files changed, 121 insertions(+), 127 deletions(-) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/SfcOfRenderer.java (79%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/listeners/SfcOfAbstractDataListener.java (96%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/listeners/SfcOfRendererDataListener.java (96%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/listeners/SfcOfRspDataListener.java (96%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/listeners/SfcOfSfgDataListener.java (96%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/openflow/SfcIpv4PacketInHandler.java (99%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/openflow/SfcOfFlowProgrammerImpl.java (99%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/openflow/SfcOfFlowProgrammerInterface.java (98%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/processors/SfcOfRspProcessor.java (98%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/processors/SfcRenderingException.java (93%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/processors/SfcRspProcessorLogicalSff.java (98%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/processors/SfcRspProcessorMacChaining.java (99%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/processors/SfcRspProcessorMpls.java (98%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/processors/SfcRspProcessorNshEth.java (98%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/processors/SfcRspProcessorNshVxgpe.java (99%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/processors/SfcRspProcessorVlan.java (97%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/processors/SfcRspTransportProcessorBase.java (98%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/processors/SffGraph.java (99%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/sfg/GroupBucketInfo.java (95%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/utils/SfcOfBaseProviderUtils.java (99%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/utils/SfcOfProviderUtils.java (99%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/utils/SfcSynchronizer.java (95%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/utils/operdsupdate/OperDsUpdateHandlerInterface.java (90%) rename sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/utils/operdsupdate/OperDsUpdateHandlerLSFFImpl.java (96%) rename sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/RspBuilder.java (99%) rename sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/SfcIpv4PacketInHandlerTest.java (97%) rename sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/SfcOfFlowProgrammerTest.java (99%) rename sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/SfcOfRspTransactionalProcessorTest.java (97%) rename sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/listeners/SfcOfRendererDataListenerTest.java (95%) rename sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/listeners/SfcOfRspDataListenerTest.java (97%) rename sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/processors/SfcOfLogicalSffRspProcessorTest.java (95%) rename sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/processors/SfcOfRspProcessorTest.java (97%) rename sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/{ofrenderer => renderers/openflow}/utils/SfcOfProviderUtilsTestMock.java (99%) diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/SfcOfRenderer.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/SfcOfRenderer.java similarity index 79% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/SfcOfRenderer.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/SfcOfRenderer.java index a396a6183..8d1e4e5ac 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/SfcOfRenderer.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/SfcOfRenderer.java @@ -6,21 +6,21 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer; +package org.opendaylight.sfc.renderers.openflow; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.sal.binding.api.NotificationProviderService; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; -import org.opendaylight.sfc.ofrenderer.listeners.SfcOfRendererDataListener; -import org.opendaylight.sfc.ofrenderer.listeners.SfcOfRspDataListener; -import org.opendaylight.sfc.ofrenderer.listeners.SfcOfSfgDataListener; -import org.opendaylight.sfc.ofrenderer.openflow.SfcIpv4PacketInHandler; -import org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerImpl; -import org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerInterface; -import org.opendaylight.sfc.ofrenderer.processors.SfcOfRspProcessor; -import org.opendaylight.sfc.ofrenderer.utils.SfcOfBaseProviderUtils; -import org.opendaylight.sfc.ofrenderer.utils.SfcOfProviderUtils; -import org.opendaylight.sfc.ofrenderer.utils.SfcSynchronizer; +import org.opendaylight.sfc.renderers.openflow.listeners.SfcOfRendererDataListener; +import org.opendaylight.sfc.renderers.openflow.listeners.SfcOfRspDataListener; +import org.opendaylight.sfc.renderers.openflow.listeners.SfcOfSfgDataListener; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcIpv4PacketInHandler; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcOfFlowProgrammerImpl; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcOfFlowProgrammerInterface; +import org.opendaylight.sfc.renderers.openflow.processors.SfcOfRspProcessor; +import org.opendaylight.sfc.renderers.openflow.utils.SfcOfBaseProviderUtils; +import org.opendaylight.sfc.renderers.openflow.utils.SfcOfProviderUtils; +import org.opendaylight.sfc.renderers.openflow.utils.SfcSynchronizer; import org.opendaylight.sfc.util.openflow.writer.SfcOfFlowWriterImpl; import org.opendaylight.yangtools.concepts.Registration; import org.slf4j.Logger; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfAbstractDataListener.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfAbstractDataListener.java similarity index 96% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfAbstractDataListener.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfAbstractDataListener.java index 8ba7fd4d6..6b3ac0ab5 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfAbstractDataListener.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfAbstractDataListener.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.listeners; +package org.opendaylight.sfc.renderers.openflow.listeners; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfRendererDataListener.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfRendererDataListener.java similarity index 96% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfRendererDataListener.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfRendererDataListener.java index c647519d3..979d5cd5c 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfRendererDataListener.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfRendererDataListener.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.listeners; +package org.opendaylight.sfc.renderers.openflow.listeners; import java.util.Collection; import java.util.concurrent.ExecutorService; @@ -15,8 +15,8 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerInterface; -import org.opendaylight.sfc.ofrenderer.utils.SfcSynchronizer; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcOfFlowProgrammerInterface; +import org.opendaylight.sfc.renderers.openflow.utils.SfcSynchronizer; import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.sfc.of.renderer.rev151123.SfcOfRendererConfig; import org.opendaylight.yang.gen.v1.urn.opendaylight.table.types.rev131026.TableId; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfRspDataListener.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfRspDataListener.java similarity index 96% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfRspDataListener.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfRspDataListener.java index 03ef456fd..ab166fb4a 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfRspDataListener.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfRspDataListener.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.listeners; +package org.opendaylight.sfc.renderers.openflow.listeners; import java.util.Collection; import javax.annotation.Nonnull; @@ -16,8 +16,8 @@ import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener; import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier; import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.sfc.ofrenderer.processors.SfcOfRspProcessor; import org.opendaylight.sfc.provider.api.SfcInstanceIdentifiers; +import org.opendaylight.sfc.renderers.openflow.processors.SfcOfRspProcessor; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.rsp.rev140701.rendered.service.paths.RenderedServicePath; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.slf4j.Logger; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfSfgDataListener.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfSfgDataListener.java similarity index 96% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfSfgDataListener.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfSfgDataListener.java index aaba78192..2c8e1674d 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfSfgDataListener.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfSfgDataListener.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.listeners; +package org.opendaylight.sfc.renderers.openflow.listeners; import java.util.ArrayList; import java.util.Collection; @@ -15,13 +15,13 @@ import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerInterface; -import org.opendaylight.sfc.ofrenderer.sfg.GroupBucketInfo; -import org.opendaylight.sfc.ofrenderer.utils.SfcOfBaseProviderUtils; import org.opendaylight.sfc.provider.api.SfcInstanceIdentifiers; import org.opendaylight.sfc.provider.api.SfcProviderServiceForwarderAPI; import org.opendaylight.sfc.provider.api.SfcProviderServiceFunctionAPI; import org.opendaylight.sfc.provider.api.SfcProviderServiceFunctionGroupAlgAPI; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcOfFlowProgrammerInterface; +import org.opendaylight.sfc.renderers.openflow.sfg.GroupBucketInfo; +import org.opendaylight.sfc.renderers.openflow.utils.SfcOfBaseProviderUtils; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SffName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.function.base.SfDataPlaneLocator; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/openflow/SfcIpv4PacketInHandler.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/openflow/SfcIpv4PacketInHandler.java similarity index 99% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/openflow/SfcIpv4PacketInHandler.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/openflow/SfcIpv4PacketInHandler.java index 7f9cfb79f..d8b6f41fc 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/openflow/SfcIpv4PacketInHandler.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/openflow/SfcIpv4PacketInHandler.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.openflow; +package org.opendaylight.sfc.renderers.openflow.openflow; import java.math.BigInteger; import java.net.InetAddress; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/openflow/SfcOfFlowProgrammerImpl.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/openflow/SfcOfFlowProgrammerImpl.java similarity index 99% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/openflow/SfcOfFlowProgrammerImpl.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/openflow/SfcOfFlowProgrammerImpl.java index 3deaae552..e39c678ce 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/openflow/SfcOfFlowProgrammerImpl.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/openflow/SfcOfFlowProgrammerImpl.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.openflow; +package org.opendaylight.sfc.renderers.openflow.openflow; import com.google.common.net.InetAddresses; import java.math.BigInteger; @@ -19,8 +19,8 @@ import java.util.StringJoiner; import java.util.concurrent.ExecutionException; import org.opendaylight.genius.mdsalutil.NwConstants; import org.opendaylight.sfc.genius.util.appcoexistence.SfcTableIndexMapper; -import org.opendaylight.sfc.ofrenderer.sfg.GroupBucketInfo; import org.opendaylight.sfc.ovs.provider.SfcOvsUtil; +import org.opendaylight.sfc.renderers.openflow.sfg.GroupBucketInfo; import org.opendaylight.sfc.util.openflow.OpenflowConstants; import org.opendaylight.sfc.util.openflow.SfcOpenflowUtils; import org.opendaylight.sfc.util.openflow.writer.SfcOfFlowWriterInterface; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/openflow/SfcOfFlowProgrammerInterface.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/openflow/SfcOfFlowProgrammerInterface.java similarity index 98% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/openflow/SfcOfFlowProgrammerInterface.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/openflow/SfcOfFlowProgrammerInterface.java index 16ab0f966..8d8b3e3a3 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/openflow/SfcOfFlowProgrammerInterface.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/openflow/SfcOfFlowProgrammerInterface.java @@ -6,13 +6,13 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.openflow; +package org.opendaylight.sfc.renderers.openflow.openflow; import java.util.List; import java.util.Set; import java.util.concurrent.ExecutionException; import org.opendaylight.sfc.genius.util.appcoexistence.SfcTableIndexMapper; -import org.opendaylight.sfc.ofrenderer.sfg.GroupBucketInfo; +import org.opendaylight.sfc.renderers.openflow.sfg.GroupBucketInfo; import org.opendaylight.sfc.util.openflow.writer.SfcOfFlowWriterInterface; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcOfRspProcessor.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcOfRspProcessor.java similarity index 98% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcOfRspProcessor.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcOfRspProcessor.java index f50a159f5..054c49fb3 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcOfRspProcessor.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcOfRspProcessor.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.processors; +package org.opendaylight.sfc.renderers.openflow.processors; import java.util.HashMap; import java.util.Iterator; @@ -15,18 +15,17 @@ import java.util.Map; import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; - import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.opendaylight.genius.mdsalutil.NwConstants; import org.opendaylight.sfc.genius.util.SfcGeniusDataUtils; import org.opendaylight.sfc.genius.util.SfcGeniusRpcClient; -import org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerInterface; -import org.opendaylight.sfc.ofrenderer.utils.SfcOfBaseProviderUtils; -import org.opendaylight.sfc.ofrenderer.utils.SfcSynchronizer; -import org.opendaylight.sfc.ofrenderer.utils.operdsupdate.OperDsUpdateHandlerInterface; -import org.opendaylight.sfc.ofrenderer.utils.operdsupdate.OperDsUpdateHandlerLSFFImpl; import org.opendaylight.sfc.ovs.provider.SfcOvsUtil; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcOfFlowProgrammerInterface; +import org.opendaylight.sfc.renderers.openflow.utils.SfcOfBaseProviderUtils; +import org.opendaylight.sfc.renderers.openflow.utils.SfcSynchronizer; +import org.opendaylight.sfc.renderers.openflow.utils.operdsupdate.OperDsUpdateHandlerInterface; +import org.opendaylight.sfc.renderers.openflow.utils.operdsupdate.OperDsUpdateHandlerLSFFImpl; import org.opendaylight.sfc.util.openflow.OpenflowConstants; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SffDataPlaneLocatorName; @@ -50,7 +49,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - public class SfcOfRspProcessor { private static final Logger LOG = LoggerFactory.getLogger(SfcOfRspProcessor.class); private final SfcOfFlowProgrammerInterface sfcOfFlowProgrammer; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRenderingException.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRenderingException.java similarity index 93% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRenderingException.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRenderingException.java index 2a8766204..50fa4b12c 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRenderingException.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRenderingException.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.processors; +package org.opendaylight.sfc.renderers.openflow.processors; /** * Exception thrown when an error or other exception is encountered in the diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorLogicalSff.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorLogicalSff.java similarity index 98% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorLogicalSff.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorLogicalSff.java index 6684e2d33..136622f72 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorLogicalSff.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorLogicalSff.java @@ -5,7 +5,7 @@ * 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.sfc.ofrenderer.processors; +package org.opendaylight.sfc.renderers.openflow.processors; import java.util.List; import java.util.Optional; @@ -14,9 +14,9 @@ import org.opendaylight.sfc.genius.util.SfcGeniusDataUtils; import org.opendaylight.sfc.genius.util.SfcGeniusRpcClient; import org.opendaylight.sfc.genius.util.appcoexistence.SfcTableIndexMapper; import org.opendaylight.sfc.genius.util.appcoexistence.SfcTableIndexMapperBuilder; -import org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerImpl; -import org.opendaylight.sfc.ofrenderer.processors.SffGraph.SffGraphEntry; -import org.opendaylight.sfc.ofrenderer.utils.operdsupdate.OperDsUpdateHandlerInterface; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcOfFlowProgrammerImpl; +import org.opendaylight.sfc.renderers.openflow.processors.SffGraph.SffGraphEntry; +import org.opendaylight.sfc.renderers.openflow.utils.operdsupdate.OperDsUpdateHandlerInterface; import org.opendaylight.sfc.util.openflow.OpenflowConstants; import org.opendaylight.sfc.util.openflow.SfcOpenflowUtils; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfName; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorMacChaining.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorMacChaining.java similarity index 99% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorMacChaining.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorMacChaining.java index f8e7a645f..9b1be8f7e 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorMacChaining.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorMacChaining.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.processors; +package org.opendaylight.sfc.renderers.openflow.processors; import java.util.Iterator; import org.opendaylight.sfc.util.macchaining.SfcModelUtil; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorMpls.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorMpls.java similarity index 98% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorMpls.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorMpls.java index 23872b5a1..f1136ac8f 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorMpls.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorMpls.java @@ -6,11 +6,11 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.processors; +package org.opendaylight.sfc.renderers.openflow.processors; import java.util.Iterator; import java.util.concurrent.atomic.AtomicLong; -import org.opendaylight.sfc.ofrenderer.processors.SffGraph.SffGraphEntry; +import org.opendaylight.sfc.renderers.openflow.processors.SffGraph.SffGraphEntry; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.function.base.SfDataPlaneLocator; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.functions.ServiceFunction; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sff.rev140701.service.function.forwarder.base.SffDataPlaneLocator; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorNshEth.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorNshEth.java similarity index 98% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorNshEth.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorNshEth.java index 7ddfec70a..1c7364b41 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorNshEth.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorNshEth.java @@ -6,11 +6,11 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.processors; +package org.opendaylight.sfc.renderers.openflow.processors; import java.util.Iterator; -import org.opendaylight.sfc.ofrenderer.processors.SffGraph.SffGraphEntry; +import org.opendaylight.sfc.renderers.openflow.processors.SffGraph.SffGraphEntry; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SffDataPlaneLocatorName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SffName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.function.base.SfDataPlaneLocator; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorNshVxgpe.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorNshVxgpe.java similarity index 99% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorNshVxgpe.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorNshVxgpe.java index a2164d9c8..64a30971b 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorNshVxgpe.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorNshVxgpe.java @@ -6,11 +6,11 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.processors; +package org.opendaylight.sfc.renderers.openflow.processors; import java.util.Iterator; -import org.opendaylight.sfc.ofrenderer.processors.SffGraph.SffGraphEntry; +import org.opendaylight.sfc.renderers.openflow.processors.SffGraph.SffGraphEntry; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SffDataPlaneLocatorName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SffName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.function.base.SfDataPlaneLocator; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorVlan.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorVlan.java similarity index 97% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorVlan.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorVlan.java index 3c412d0cc..76834e436 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspProcessorVlan.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspProcessorVlan.java @@ -6,11 +6,10 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.processors; +package org.opendaylight.sfc.renderers.openflow.processors; import java.util.Iterator; import java.util.concurrent.atomic.AtomicInteger; -import org.opendaylight.sfc.ofrenderer.processors.SffGraph.SffGraphEntry; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.function.base.SfDataPlaneLocator; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.functions.ServiceFunction; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sff.rev140701.service.function.forwarder.base.SffDataPlaneLocator; @@ -70,7 +69,7 @@ public class SfcRspProcessorVlan extends SfcRspTransportProcessorBase { * - RSP hop info used to create the flow */ @Override - public void configureSfTransportIngressFlow(SffGraphEntry entry, SfDataPlaneLocator sfDpl) { + public void configureSfTransportIngressFlow(SffGraph.SffGraphEntry entry, SfDataPlaneLocator sfDpl) { String sffNodeName = sfcProviderUtils.getSffOpenFlowNodeName(entry.getDstSff(), entry.getPathId()); this.sfcFlowProgrammer.configureVlanTransportIngressFlow(sffNodeName); } @@ -82,7 +81,7 @@ public class SfcRspProcessorVlan extends SfcRspTransportProcessorBase { * - RSP hop info used to create the flow */ @Override - public void configureSffTransportIngressFlow(SffGraphEntry entry, SffDataPlaneLocator dstSffDpl) { + public void configureSffTransportIngressFlow(SffGraph.SffGraphEntry entry, SffDataPlaneLocator dstSffDpl) { String sffNodeName = sfcProviderUtils.getSffOpenFlowNodeName(entry.getDstSff(), entry.getPathId()); this.sfcFlowProgrammer.configureVlanTransportIngressFlow(sffNodeName); } diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspTransportProcessorBase.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspTransportProcessorBase.java similarity index 98% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspTransportProcessorBase.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspTransportProcessorBase.java index d5d54325c..6acd80223 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SfcRspTransportProcessorBase.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SfcRspTransportProcessorBase.java @@ -6,16 +6,16 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.processors; +package org.opendaylight.sfc.renderers.openflow.processors; import java.util.Iterator; import java.util.List; import java.util.Locale; import java.util.Optional; import org.opendaylight.sfc.genius.util.appcoexistence.SfcTableIndexMapper; -import org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerInterface; -import org.opendaylight.sfc.ofrenderer.utils.SfcOfBaseProviderUtils; -import org.opendaylight.sfc.ofrenderer.utils.operdsupdate.OperDsUpdateHandlerInterface; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcOfFlowProgrammerInterface; +import org.opendaylight.sfc.renderers.openflow.utils.SfcOfBaseProviderUtils; +import org.opendaylight.sfc.renderers.openflow.utils.operdsupdate.OperDsUpdateHandlerInterface; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SffDataPlaneLocatorName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.rsp.rev140701.rendered.service.paths.RenderedServicePath; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.function.base.SfDataPlaneLocator; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SffGraph.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SffGraph.java similarity index 99% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SffGraph.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SffGraph.java index ef0d54bcd..ebd4ba0db 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/processors/SffGraph.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/processors/SffGraph.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.processors; +package org.opendaylight.sfc.renderers.openflow.processors; import java.util.ArrayList; import java.util.HashMap; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/sfg/GroupBucketInfo.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/sfg/GroupBucketInfo.java similarity index 95% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/sfg/GroupBucketInfo.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/sfg/GroupBucketInfo.java index 5786ef9da..bbdd0f0bd 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/sfg/GroupBucketInfo.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/sfg/GroupBucketInfo.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.sfg; +package org.opendaylight.sfc.renderers.openflow.sfg; public class GroupBucketInfo { diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/utils/SfcOfBaseProviderUtils.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/utils/SfcOfBaseProviderUtils.java similarity index 99% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/utils/SfcOfBaseProviderUtils.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/utils/SfcOfBaseProviderUtils.java index d0c3ed4be..6ac974060 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/utils/SfcOfBaseProviderUtils.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/utils/SfcOfBaseProviderUtils.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.utils; +package org.opendaylight.sfc.renderers.openflow.utils; import java.util.List; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfDataPlaneLocatorName; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/utils/SfcOfProviderUtils.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/utils/SfcOfProviderUtils.java similarity index 99% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/utils/SfcOfProviderUtils.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/utils/SfcOfProviderUtils.java index eeb50c5e7..5b77fe949 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/utils/SfcOfProviderUtils.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/utils/SfcOfProviderUtils.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.utils; +package org.opendaylight.sfc.renderers.openflow.utils; import java.util.ArrayList; import java.util.Collections; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/utils/SfcSynchronizer.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/utils/SfcSynchronizer.java similarity index 95% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/utils/SfcSynchronizer.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/utils/SfcSynchronizer.java index 20540c2ee..8f618b68c 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/utils/SfcSynchronizer.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/utils/SfcSynchronizer.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.utils; +package org.opendaylight.sfc.renderers.openflow.utils; import java.util.concurrent.locks.ReentrantLock; diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/utils/operdsupdate/OperDsUpdateHandlerInterface.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/utils/operdsupdate/OperDsUpdateHandlerInterface.java similarity index 90% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/utils/operdsupdate/OperDsUpdateHandlerInterface.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/utils/operdsupdate/OperDsUpdateHandlerInterface.java index 05bfea67e..8efa468fc 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/utils/operdsupdate/OperDsUpdateHandlerInterface.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/utils/operdsupdate/OperDsUpdateHandlerInterface.java @@ -5,9 +5,9 @@ * 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.sfc.ofrenderer.utils.operdsupdate; +package org.opendaylight.sfc.renderers.openflow.utils.operdsupdate; -import org.opendaylight.sfc.ofrenderer.processors.SffGraph; +import org.opendaylight.sfc.renderers.openflow.processors.SffGraph; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.rsp.rev140701.rendered.service.paths.RenderedServicePath; /** diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/utils/operdsupdate/OperDsUpdateHandlerLSFFImpl.java b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/utils/operdsupdate/OperDsUpdateHandlerLSFFImpl.java similarity index 96% rename from sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/utils/operdsupdate/OperDsUpdateHandlerLSFFImpl.java rename to sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/utils/operdsupdate/OperDsUpdateHandlerLSFFImpl.java index 24a1d3eeb..3fc31d332 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/ofrenderer/utils/operdsupdate/OperDsUpdateHandlerLSFFImpl.java +++ b/sfc-renderers/sfc-openflow-renderer/src/main/java/org/opendaylight/sfc/renderers/openflow/utils/operdsupdate/OperDsUpdateHandlerLSFFImpl.java @@ -5,7 +5,7 @@ * 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.sfc.ofrenderer.utils.operdsupdate; +package org.opendaylight.sfc.renderers.openflow.utils.operdsupdate; import com.google.common.util.concurrent.ListenableFuture; import java.math.BigInteger; @@ -20,8 +20,7 @@ import java.util.concurrent.Executors; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.sfc.ofrenderer.processors.SffGraph; -import org.opendaylight.sfc.ofrenderer.processors.SffGraph.SffGraphEntry; +import org.opendaylight.sfc.renderers.openflow.processors.SffGraph; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SffName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfpName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.rsp.rev140701.RenderedServicePaths; @@ -82,9 +81,9 @@ public class OperDsUpdateHandlerLSFFImpl implements OperDsUpdateHandlerInterface */ private void updateSffStateWithDpnIds(SffGraph theGraph, RenderedServicePath rsp, WriteTransaction trans) { LOG.debug("updateSffStateWithDpnIds: starting addition of dpnids-rsps to RSP state"); - Iterator graphEntries = theGraph.getGraphEntryIterator(); + Iterator graphEntries = theGraph.getGraphEntryIterator(); Map> valuesMap = new HashMap<>(); - SffGraphEntry graphEntry; + SffGraph.SffGraphEntry graphEntry; while (graphEntries.hasNext()) { graphEntry = graphEntries.next(); if (graphEntry.getDstSff().equals(SffGraph.EGRESS) || graphEntry.getDstDpnId() == null) { @@ -172,8 +171,8 @@ public class OperDsUpdateHandlerLSFFImpl implements OperDsUpdateHandlerInterface private void updateRenderedServicePathOperationalStateWithDpnIds(SffGraph theGraph, RenderedServicePath rsp, WriteTransaction transaction) { LOG.debug("updateRenderedServicePathOperationalStateWithDpnIds: " + "starting addition of dpnids to the RSP"); - Iterator graphEntries = theGraph.getGraphEntryIterator(); - SffGraphEntry graphEntry; + Iterator graphEntries = theGraph.getGraphEntryIterator(); + SffGraph.SffGraphEntry graphEntry; RenderedServicePathKey rspKey = new RenderedServicePathKey(rsp.getName()); short hopIndex = 0; while (graphEntries.hasNext()) { diff --git a/sfc-renderers/sfc-openflow-renderer/src/main/resources/org/opendaylight/blueprint/sfc-openflow-renderer.xml b/sfc-renderers/sfc-openflow-renderer/src/main/resources/org/opendaylight/blueprint/sfc-openflow-renderer.xml index 828c5191f..a15545380 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/main/resources/org/opendaylight/blueprint/sfc-openflow-renderer.xml +++ b/sfc-renderers/sfc-openflow-renderer/src/main/resources/org/opendaylight/blueprint/sfc-openflow-renderer.xml @@ -12,7 +12,7 @@ interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry"/> diff --git a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/RspBuilder.java b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/RspBuilder.java similarity index 99% rename from sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/RspBuilder.java rename to sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/RspBuilder.java index 9a74930b8..0564af2ec 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/RspBuilder.java +++ b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/RspBuilder.java @@ -6,12 +6,12 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer; +package org.opendaylight.sfc.renderers.openflow; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.opendaylight.sfc.ofrenderer.utils.SfcOfProviderUtilsTestMock; +import org.opendaylight.sfc.renderers.openflow.utils.SfcOfProviderUtilsTestMock; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.RspName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfDataPlaneLocatorName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfName; diff --git a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/SfcIpv4PacketInHandlerTest.java b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/SfcIpv4PacketInHandlerTest.java similarity index 97% rename from sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/SfcIpv4PacketInHandlerTest.java rename to sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/SfcIpv4PacketInHandlerTest.java index 03dddd7d3..e8ce601a5 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/SfcIpv4PacketInHandlerTest.java +++ b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/SfcIpv4PacketInHandlerTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer; +package org.opendaylight.sfc.renderers.openflow; import static org.junit.Assert.assertEquals; import static org.mockito.Matchers.anyLong; @@ -22,8 +22,8 @@ import static org.mockito.Mockito.when; import java.math.BigInteger; import org.junit.Test; -import org.opendaylight.sfc.ofrenderer.openflow.SfcIpv4PacketInHandler; -import org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerImpl; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcIpv4PacketInHandler; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcOfFlowProgrammerImpl; import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.types.rev131026.FlowCookie; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorRef; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; diff --git a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/SfcOfFlowProgrammerTest.java b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/SfcOfFlowProgrammerTest.java similarity index 99% rename from sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/SfcOfFlowProgrammerTest.java rename to sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/SfcOfFlowProgrammerTest.java index acaaafe04..7d4fe9fbe 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/SfcOfFlowProgrammerTest.java +++ b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/SfcOfFlowProgrammerTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer; +package org.opendaylight.sfc.renderers.openflow; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; @@ -23,7 +23,7 @@ import java.util.List; import org.junit.Test; import org.opendaylight.genius.mdsalutil.NwConstants; -import org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerImpl; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcOfFlowProgrammerImpl; import org.opendaylight.sfc.util.macchaining.VirtualMacAddress; import org.opendaylight.sfc.util.openflow.OpenflowConstants; import org.opendaylight.sfc.util.openflow.SfcOpenflowUtils; diff --git a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/SfcOfRspTransactionalProcessorTest.java b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/SfcOfRspTransactionalProcessorTest.java similarity index 97% rename from sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/SfcOfRspTransactionalProcessorTest.java rename to sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/SfcOfRspTransactionalProcessorTest.java index 5ce23c147..02d16a817 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/SfcOfRspTransactionalProcessorTest.java +++ b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/SfcOfRspTransactionalProcessorTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer; +package org.opendaylight.sfc.renderers.openflow; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; @@ -33,11 +33,11 @@ import org.mockito.Matchers; import org.mockito.Mockito; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; -import org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerImpl; -import org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerInterface; -import org.opendaylight.sfc.ofrenderer.processors.SfcOfRspProcessor; -import org.opendaylight.sfc.ofrenderer.utils.SfcOfProviderUtilsTestMock; -import org.opendaylight.sfc.ofrenderer.utils.SfcSynchronizer; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcOfFlowProgrammerImpl; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcOfFlowProgrammerInterface; +import org.opendaylight.sfc.renderers.openflow.processors.SfcOfRspProcessor; +import org.opendaylight.sfc.renderers.openflow.utils.SfcOfProviderUtilsTestMock; +import org.opendaylight.sfc.renderers.openflow.utils.SfcSynchronizer; import org.opendaylight.sfc.util.openflow.OpenflowConstants; import org.opendaylight.sfc.util.openflow.writer.FlowDetails; import org.opendaylight.sfc.util.openflow.writer.SfcOfFlowWriterImpl; diff --git a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfRendererDataListenerTest.java b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfRendererDataListenerTest.java similarity index 95% rename from sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfRendererDataListenerTest.java rename to sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfRendererDataListenerTest.java index 9ea33d092..44831f7f9 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfRendererDataListenerTest.java +++ b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfRendererDataListenerTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.listeners; +package org.opendaylight.sfc.renderers.openflow.listeners; import static org.junit.Assert.assertEquals; import static org.mockito.Mockito.mock; @@ -21,9 +21,9 @@ import org.opendaylight.controller.md.sal.binding.api.DataObjectModification.Mod import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier; import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerImpl; -import org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerInterface; -import org.opendaylight.sfc.ofrenderer.utils.SfcSynchronizer; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcOfFlowProgrammerImpl; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcOfFlowProgrammerInterface; +import org.opendaylight.sfc.renderers.openflow.utils.SfcSynchronizer; import org.opendaylight.sfc.util.openflow.writer.SfcOfFlowWriterInterface; import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.sfc.of.renderer.rev151123.SfcOfRendererConfig; import org.opendaylight.yang.gen.v1.urn.ericsson.params.xml.ns.yang.sfc.of.renderer.rev151123.SfcOfRendererConfigBuilder; diff --git a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfRspDataListenerTest.java b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfRspDataListenerTest.java similarity index 97% rename from sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfRspDataListenerTest.java rename to sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfRspDataListenerTest.java index b8ff09325..906871d47 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/listeners/SfcOfRspDataListenerTest.java +++ b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/listeners/SfcOfRspDataListenerTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.listeners; +package org.opendaylight.sfc.renderers.openflow.listeners; import static org.mockito.Matchers.same; import static org.mockito.Mockito.verify; @@ -23,7 +23,7 @@ import org.mockito.runners.MockitoJUnitRunner; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; import org.opendaylight.controller.md.sal.binding.api.DataTreeModification; -import org.opendaylight.sfc.ofrenderer.processors.SfcOfRspProcessor; +import org.opendaylight.sfc.renderers.openflow.processors.SfcOfRspProcessor; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.RspName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.rsp.rev140701.rendered.service.paths.RenderedServicePath; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.rsp.rev140701.rendered.service.paths.RenderedServicePathBuilder; diff --git a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/processors/SfcOfLogicalSffRspProcessorTest.java b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/processors/SfcOfLogicalSffRspProcessorTest.java similarity index 95% rename from sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/processors/SfcOfLogicalSffRspProcessorTest.java rename to sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/processors/SfcOfLogicalSffRspProcessorTest.java index effa4de53..9eedba05d 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/processors/SfcOfLogicalSffRspProcessorTest.java +++ b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/processors/SfcOfLogicalSffRspProcessorTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.processors; +package org.opendaylight.sfc.renderers.openflow.processors; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.CoreMatchers.notNullValue; @@ -17,14 +17,6 @@ import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.mockito.MockitoAnnotations.initMocks; -import static org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerImpl.COOKIE_BIGINT_HEX_RADIX; -import static org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerImpl.TABLE_INDEX_CLASSIFIER; -import static org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerImpl.TRANSPORT_EGRESS_COOKIE_STR_BASE; -import static org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerImpl.TRANSPORT_EGRESS_NSH_ETH_LASTHOP_NSH_LOCAL_COOKIE; -import static org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerImpl.TRANSPORT_EGRESS_NSH_ETH_LASTHOP_NSH_REMOTE_COOKIE; -import static org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerImpl.TRANSPORT_EGRESS_NSH_ETH_LASTHOP_PIPELINE_COOKIE; -import static org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerImpl.TRANSPORT_EGRESS_NSH_ETH_LASTHOP_TUNNEL_LOCAL_COOKIE; -import static org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerImpl.TRANSPORT_EGRESS_NSH_ETH_LASTHOP_TUNNEL_REMOTE_COOKIE; import static org.powermock.api.support.membermodification.MemberMatcher.method; import static org.powermock.api.support.membermodification.MemberModifier.replace; import static org.powermock.api.support.membermodification.MemberModifier.suppress; @@ -53,12 +45,12 @@ import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; import org.opendaylight.genius.mdsalutil.NwConstants; import org.opendaylight.sfc.genius.util.SfcGeniusDataUtils; import org.opendaylight.sfc.genius.util.SfcGeniusRpcClient; -import org.opendaylight.sfc.ofrenderer.RspBuilder; -import org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerImpl; -import org.opendaylight.sfc.ofrenderer.utils.SfcOfProviderUtilsTestMock; -import org.opendaylight.sfc.ofrenderer.utils.SfcSynchronizer; -import org.opendaylight.sfc.ofrenderer.utils.operdsupdate.OperDsUpdateHandlerLSFFImpl; import org.opendaylight.sfc.ovs.provider.SfcOvsUtil; +import org.opendaylight.sfc.renderers.openflow.RspBuilder; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcOfFlowProgrammerImpl; +import org.opendaylight.sfc.renderers.openflow.utils.SfcOfProviderUtilsTestMock; +import org.opendaylight.sfc.renderers.openflow.utils.SfcSynchronizer; +import org.opendaylight.sfc.renderers.openflow.utils.operdsupdate.OperDsUpdateHandlerLSFFImpl; import org.opendaylight.sfc.util.openflow.OpenflowConstants; import org.opendaylight.sfc.util.openflow.SfcOpenflowUtils; import org.opendaylight.sfc.util.openflow.writer.FlowDetails; @@ -326,7 +318,8 @@ public class SfcOfLogicalSffRspProcessorTest { // genius, // which uses that table for service binding) Assert.assertEquals(0, - addedFlows.stream().filter(flow -> flow.getTableKey().getId().equals(TABLE_INDEX_CLASSIFIER)).count()); + addedFlows.stream().filter(flow -> flow.getTableKey().getId().equals( + SfcOfFlowProgrammerImpl.TABLE_INDEX_CLASSIFIER)).count()); // transport ingress: one (initialization in the only switch) + one per // (hops -1, this is the @@ -952,41 +945,46 @@ public class SfcOfLogicalSffRspProcessorTest { assertThat(theFlow.getCookie().getValue(), notNullValue()); BigInteger cookie = theFlow.getCookie().getValue(); - BigInteger egresspipelineCookie = new BigInteger( - TRANSPORT_EGRESS_COOKIE_STR_BASE + TRANSPORT_EGRESS_NSH_ETH_LASTHOP_PIPELINE_COOKIE, - COOKIE_BIGINT_HEX_RADIX); + BigInteger egresspipelineCookie = new BigInteger(SfcOfFlowProgrammerImpl.TRANSPORT_EGRESS_COOKIE_STR_BASE + + SfcOfFlowProgrammerImpl + .TRANSPORT_EGRESS_NSH_ETH_LASTHOP_PIPELINE_COOKIE, + SfcOfFlowProgrammerImpl.COOKIE_BIGINT_HEX_RADIX); if (cookie.equals(egresspipelineCookie)) { assertTransportEgressLastHopPipelineFlow(theFlow, theNsp, theNsi, theSfMacAddress); return; } - BigInteger remoteTunnelCookie = new BigInteger( - TRANSPORT_EGRESS_COOKIE_STR_BASE + TRANSPORT_EGRESS_NSH_ETH_LASTHOP_TUNNEL_REMOTE_COOKIE, - COOKIE_BIGINT_HEX_RADIX); + BigInteger remoteTunnelCookie = new BigInteger(SfcOfFlowProgrammerImpl.TRANSPORT_EGRESS_COOKIE_STR_BASE + + SfcOfFlowProgrammerImpl + .TRANSPORT_EGRESS_NSH_ETH_LASTHOP_TUNNEL_REMOTE_COOKIE, + SfcOfFlowProgrammerImpl.COOKIE_BIGINT_HEX_RADIX); if (cookie.equals(remoteTunnelCookie)) { assertTransportEgressLastHopRemoteTunnel(theFlow, theNsp, theNsi, theOutputPort); return; } - BigInteger localTunnelCookie = new BigInteger( - TRANSPORT_EGRESS_COOKIE_STR_BASE + TRANSPORT_EGRESS_NSH_ETH_LASTHOP_TUNNEL_LOCAL_COOKIE, - COOKIE_BIGINT_HEX_RADIX); + BigInteger localTunnelCookie = new BigInteger(SfcOfFlowProgrammerImpl.TRANSPORT_EGRESS_COOKIE_STR_BASE + + SfcOfFlowProgrammerImpl + .TRANSPORT_EGRESS_NSH_ETH_LASTHOP_TUNNEL_LOCAL_COOKIE, + SfcOfFlowProgrammerImpl.COOKIE_BIGINT_HEX_RADIX); if (cookie.equals(localTunnelCookie)) { assertTransportEgressLastHopLocalTunnel(theFlow, theNsp, theNsi, theSffIpAddress); return; } - BigInteger remoteNshCookie = new BigInteger( - TRANSPORT_EGRESS_COOKIE_STR_BASE + TRANSPORT_EGRESS_NSH_ETH_LASTHOP_NSH_REMOTE_COOKIE, - COOKIE_BIGINT_HEX_RADIX); + BigInteger remoteNshCookie = new BigInteger(SfcOfFlowProgrammerImpl.TRANSPORT_EGRESS_COOKIE_STR_BASE + + SfcOfFlowProgrammerImpl + .TRANSPORT_EGRESS_NSH_ETH_LASTHOP_NSH_REMOTE_COOKIE, + SfcOfFlowProgrammerImpl.COOKIE_BIGINT_HEX_RADIX); if (cookie.equals(remoteNshCookie)) { assertTransportEgressLastHopRemoteNsh(theFlow, theNsp, theNsi, theOutputPort); return; } - BigInteger localNshCookie = new BigInteger( - TRANSPORT_EGRESS_COOKIE_STR_BASE + TRANSPORT_EGRESS_NSH_ETH_LASTHOP_NSH_LOCAL_COOKIE, - COOKIE_BIGINT_HEX_RADIX); + BigInteger localNshCookie = new BigInteger(SfcOfFlowProgrammerImpl.TRANSPORT_EGRESS_COOKIE_STR_BASE + + SfcOfFlowProgrammerImpl + .TRANSPORT_EGRESS_NSH_ETH_LASTHOP_NSH_LOCAL_COOKIE, + SfcOfFlowProgrammerImpl.COOKIE_BIGINT_HEX_RADIX); if (cookie.equals(localNshCookie)) { assertTransportEgressLastHopLocalNsh(theFlow, theNsp, theNsi, theSffIpAddress); return; diff --git a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/processors/SfcOfRspProcessorTest.java b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/processors/SfcOfRspProcessorTest.java similarity index 97% rename from sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/processors/SfcOfRspProcessorTest.java rename to sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/processors/SfcOfRspProcessorTest.java index 82e9a1725..105fd64ee 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/processors/SfcOfRspProcessorTest.java +++ b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/processors/SfcOfRspProcessorTest.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.processors; +package org.opendaylight.sfc.renderers.openflow.processors; import static org.mockito.Matchers.anyBoolean; import static org.mockito.Matchers.anyInt; @@ -26,12 +26,12 @@ import java.util.List; import java.util.concurrent.ExecutionException; import org.junit.Before; import org.junit.Test; -import org.opendaylight.sfc.ofrenderer.RspBuilder; -import org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerImpl; -import org.opendaylight.sfc.ofrenderer.openflow.SfcOfFlowProgrammerInterface; -import org.opendaylight.sfc.ofrenderer.utils.SfcOfProviderUtilsTestMock; -import org.opendaylight.sfc.ofrenderer.utils.SfcSynchronizer; -import org.opendaylight.sfc.ofrenderer.utils.operdsupdate.OperDsUpdateHandlerInterface; +import org.opendaylight.sfc.renderers.openflow.RspBuilder; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcOfFlowProgrammerImpl; +import org.opendaylight.sfc.renderers.openflow.openflow.SfcOfFlowProgrammerInterface; +import org.opendaylight.sfc.renderers.openflow.utils.SfcOfProviderUtilsTestMock; +import org.opendaylight.sfc.renderers.openflow.utils.SfcSynchronizer; +import org.opendaylight.sfc.renderers.openflow.utils.operdsupdate.OperDsUpdateHandlerInterface; import org.opendaylight.sfc.util.openflow.writer.SfcOfFlowWriterInterface; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfName; import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SffName; @@ -79,7 +79,7 @@ public class SfcOfRspProcessorTest { this.flowProgrammerTestMoc.setFlowWriter(mock(SfcOfFlowWriterInterface.class)); this.sfcUtilsTestMock = new SfcOfProviderUtilsTestMock(); this.sfcOfRspProcessor = new SfcOfRspProcessor(this.flowProgrammerTestMoc, this.sfcUtilsTestMock, - new SfcSynchronizer(), null, null); + new SfcSynchronizer(), null, null); this.rspBuilder = new RspBuilder(this.sfcUtilsTestMock); this.sfTypes = new ArrayList<>(); diff --git a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/utils/SfcOfProviderUtilsTestMock.java b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/utils/SfcOfProviderUtilsTestMock.java similarity index 99% rename from sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/utils/SfcOfProviderUtilsTestMock.java rename to sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/utils/SfcOfProviderUtilsTestMock.java index 6b7bc7910..7a5f1bed2 100644 --- a/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/ofrenderer/utils/SfcOfProviderUtilsTestMock.java +++ b/sfc-renderers/sfc-openflow-renderer/src/test/java/org/opendaylight/sfc/renderers/openflow/utils/SfcOfProviderUtilsTestMock.java @@ -6,7 +6,7 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.sfc.ofrenderer.utils; +package org.opendaylight.sfc.renderers.openflow.utils; import java.util.ArrayList; import java.util.HashMap; -- 2.36.6