Refactor to change packages' names

sfc-ios-xe-renderer package is replaced by more canonical name:
org.opendaylight.sfc.renderers.iosxe

Change-Id: I86e9f2e355e86823300c4de7003d4133f1dfe95e
Signed-off-by: David Suarez <[email protected]>

diff --git a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/renderer/IosXeRspProcessor.java b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/IosXeRspProcessor.java
similarity index 94%
rename from sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/renderer/IosXeRspProcessor.java
rename to sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/IosXeRspProcessor.java
index 3d114e4d0897f0d90cfcec8489546894b31c267a..c0de484fac3829e1db527a162a7ea56dfc32e836 100644 (file)
--- a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/renderer/IosXeRspProcessor.java
+++ b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/IosXeRspProcessor.java
@@ -6,11 +6,8 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.sfc.iosxe.provider.renderer;
+package org.opendaylight.sfc.renderers.iosxe;
 
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.DELETE_PATH;
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.WRITE_PATH;
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.WRITE_REMOTE;
 import static org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.rsp.manager.rev160421.renderer.path.states.renderer.path.state.configured.rendered.paths.ConfiguredRenderedPath.PathStatus.Failure;
 import static org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.rsp.manager.rev160421.renderer.path.states.renderer.path.state.configured.rendered.paths.ConfiguredRenderedPath.PathStatus.InProgress;
 import static org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.rsp.manager.rev160421.renderer.path.states.renderer.path.state.configured.rendered.paths.ConfiguredRenderedPath.PathStatus.Success;
@@ -23,11 +20,11 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI;
-import org.opendaylight.sfc.iosxe.provider.utils.RspStatus;
-import org.opendaylight.sfc.iosxe.provider.utils.SfcIosXeUtils;
 import org.opendaylight.sfc.provider.api.SfcProviderServiceForwarderAPI;
 import org.opendaylight.sfc.provider.api.SfcProviderServiceFunctionAPI;
+import org.opendaylight.sfc.renderers.iosxe.utils.IosXeDataStoreAPI;
+import org.opendaylight.sfc.renderers.iosxe.utils.RspStatus;
+import org.opendaylight.sfc.renderers.iosxe.utils.SfcIosXeUtils;
 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.rsp.rev140701.rendered.service.paths.RenderedServicePath;
@@ -148,8 +145,9 @@ public class IosXeRspProcessor {
                     status.writeStatus(Failure);
                     return;
                 }
-                new IosXeDataStoreAPI(previousMountPoint, currentRemoteForwarder, WRITE_REMOTE,
-                        LogicalDatastoreType.CONFIGURATION).call();
+                new IosXeDataStoreAPI(previousMountPoint, currentRemoteForwarder,
+                                      IosXeDataStoreAPI.Transaction.WRITE_REMOTE, LogicalDatastoreType.CONFIGURATION)
+                        .call();
                 // Create last service entry to previous node which sends
                 // traffic to current node
                 serviceTypeChoice = buildServiceFunctionForwarderChoice(currentSffName.getValue());
@@ -158,8 +156,8 @@ public class IosXeRspProcessor {
                 // List of services completed for last mountpoint, create
                 // service path entries and write it
                 ServicePath servicePath = createServicePath(pathId, services);
-                new IosXeDataStoreAPI(previousMountPoint, servicePath, WRITE_PATH, LogicalDatastoreType.CONFIGURATION)
-                        .call();
+                new IosXeDataStoreAPI(previousMountPoint, servicePath, IosXeDataStoreAPI.Transaction.WRITE_PATH,
+                                      LogicalDatastoreType.CONFIGURATION).call();
                 // Start with new services list
                 services = new ArrayList<>();
                 sfName = hop.getServiceFunctionName();
@@ -183,7 +181,8 @@ public class IosXeRspProcessor {
         // List of services completed for last mountpoint, create last service
         // path entries and write it
         ServicePath servicePath = createServicePath(pathId, services);
-        new IosXeDataStoreAPI(currentMountpoint, servicePath, WRITE_PATH, LogicalDatastoreType.CONFIGURATION).call();
+        new IosXeDataStoreAPI(currentMountpoint, servicePath, IosXeDataStoreAPI.Transaction.WRITE_PATH,
+                              LogicalDatastoreType.CONFIGURATION).call();
         LOG.info("Rendered service path {} successfully processed", renderedServicePath.getName().getValue());
         status.writeStatus(Success);
     }
@@ -195,8 +194,9 @@ public class IosXeRspProcessor {
         for (RenderedServicePathHop renderedServicePathHop : renderedServicePath.getRenderedServicePathHop()) {
             SffName sffName = renderedServicePathHop.getServiceFunctionForwarder();
             DataBroker sffDataBroker = getSffMountpoint(sffName);
-            boolean transaction = (boolean) new IosXeDataStoreAPI(sffDataBroker, servicePathKey, DELETE_PATH,
-                    LogicalDatastoreType.CONFIGURATION).call();
+            boolean transaction = (boolean) new IosXeDataStoreAPI(sffDataBroker, servicePathKey,
+                                                                  IosXeDataStoreAPI.Transaction.DELETE_PATH,
+                                                                  LogicalDatastoreType.CONFIGURATION).call();
             if (!transaction) {
                 success = false;
             }

diff --git a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/renderer/IosXeServiceForwarderMapper.java b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/IosXeServiceForwarderMapper.java
similarity index 86%
rename from sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/renderer/IosXeServiceForwarderMapper.java
rename to sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/IosXeServiceForwarderMapper.java
index b21ae42efd3bb944529df75463e74398f318dab6..cbb2f80aec47c3c3c5ee87ae281de652dd0acdbc 100644 (file)
--- a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/renderer/IosXeServiceForwarderMapper.java
+++ b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/IosXeServiceForwarderMapper.java
@@ -6,18 +6,15 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.sfc.iosxe.provider.renderer;
-
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.DELETE_LOCAL;
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.WRITE_LOCAL;
+package org.opendaylight.sfc.renderers.iosxe;
 
 import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI;
-import org.opendaylight.sfc.iosxe.provider.utils.SfcIosXeUtils;
+import org.opendaylight.sfc.renderers.iosxe.utils.IosXeDataStoreAPI;
+import org.opendaylight.sfc.renderers.iosxe.utils.SfcIosXeUtils;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sff.rev140701.service.function.forwarder.base.SffDataPlaneLocator;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sff.rev140701.service.function.forwarder.base.sff.data.plane.locator.DataPlaneLocator;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sff.rev140701.service.function.forwarders.ServiceFunctionForwarder;
@@ -71,8 +68,10 @@ public class IosXeServiceForwarderMapper {
                                     .ServiceFunctionForwarder localForwarder =
                                     SfcIosXeUtils.createLocalForwarder(ipAddress);
                                 if (localForwarder != null && !delete) {
-                                    IosXeDataStoreAPI writeServiceFunction = new IosXeDataStoreAPI(mountPoint,
-                                            localForwarder.getLocal(), WRITE_LOCAL, LogicalDatastoreType.CONFIGURATION);
+                                    IosXeDataStoreAPI writeServiceFunction =
+                                            new IosXeDataStoreAPI(mountPoint, localForwarder.getLocal(),
+                                                                  IosXeDataStoreAPI.Transaction.WRITE_LOCAL,
+                                                                  LogicalDatastoreType.CONFIGURATION);
                                     Object result = writeServiceFunction.call();
                                     if (Boolean.TRUE.equals(result)) {
                                         LOG.info("Local forwarder with ip {} created on node {}",
@@ -81,9 +80,10 @@ public class IosXeServiceForwarderMapper {
                                     }
                                 }
                                 if (localForwarder != null && delete) {
-                                    IosXeDataStoreAPI writeServiceFunction = new IosXeDataStoreAPI(mountPoint,
-                                            localForwarder.getLocal(), DELETE_LOCAL,
-                                            LogicalDatastoreType.CONFIGURATION);
+                                    IosXeDataStoreAPI writeServiceFunction =
+                                            new IosXeDataStoreAPI(mountPoint, localForwarder.getLocal(),
+                                                                  IosXeDataStoreAPI.Transaction.DELETE_LOCAL,
+                                                                  LogicalDatastoreType.CONFIGURATION);
                                     Object result = writeServiceFunction.call();
                                     if (Boolean.TRUE.equals(result)) {
                                         LOG.info("Local forwarder removed from node {}", netconfNode.getNodeId()

diff --git a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/renderer/IosXeServiceFunctionMapper.java b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/IosXeServiceFunctionMapper.java
similarity index 86%
rename from sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/renderer/IosXeServiceFunctionMapper.java
rename to sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/IosXeServiceFunctionMapper.java
index 36786c52648768630489197fe6146cfc3c1aeee9..a6cb7a6bd8cd63fbe17d648179bf2d0ef1a89c60 100644 (file)
--- a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/renderer/IosXeServiceFunctionMapper.java
+++ b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/IosXeServiceFunctionMapper.java
@@ -6,18 +6,15 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.sfc.iosxe.provider.renderer;
-
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.DELETE_FUNCTION;
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.WRITE_FUNCTION;
+package org.opendaylight.sfc.renderers.iosxe;
 
 import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI;
-import org.opendaylight.sfc.iosxe.provider.utils.SfcIosXeUtils;
+import org.opendaylight.sfc.renderers.iosxe.utils.IosXeDataStoreAPI;
+import org.opendaylight.sfc.renderers.iosxe.utils.SfcIosXeUtils;
 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.sf.rev140701.service.function.base.SfDataPlaneLocator;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.functions.ServiceFunction;
@@ -64,10 +61,10 @@ public class IosXeServiceFunctionMapper {
                         org.opendaylight.yang.gen.v1.urn.ios.rev160308._native.service.chain.ServiceFunction
                                 serviceFunction = createNetconfServiceFunction(function);
                         if (serviceFunction != null) {
-                            IosXeDataStoreAPI writeServiceFunction = new IosXeDataStoreAPI(mountPoint, serviceFunction,
-                                                                                           WRITE_FUNCTION,
-                                                                                           LogicalDatastoreType
-                                                                                                   .CONFIGURATION);
+                            IosXeDataStoreAPI writeServiceFunction =
+                                    new IosXeDataStoreAPI(mountPoint, serviceFunction,
+                                                          IosXeDataStoreAPI.Transaction.WRITE_FUNCTION,
+                                                          LogicalDatastoreType.CONFIGURATION);
                             Object result = writeServiceFunction.call();
                             if (Boolean.TRUE.equals(result)) {
                                 LOG.info("Service function {} created on node {}", serviceFunction.getName(),
@@ -79,9 +76,9 @@ public class IosXeServiceFunctionMapper {
                         org.opendaylight.yang.gen.v1.urn.ios.rev160308._native.service.chain.ServiceFunction
                                 serviceFunction = createNetconfServiceFunction(function);
                         if (serviceFunction != null) {
-                            IosXeDataStoreAPI writeServiceFunction = new IosXeDataStoreAPI(mountPoint,
-                                                                                           serviceFunction.getKey(),
-                                                                                           DELETE_FUNCTION,
+                            IosXeDataStoreAPI writeServiceFunction =
+                                    new IosXeDataStoreAPI(mountPoint, serviceFunction.getKey(),
+                                                          IosXeDataStoreAPI.Transaction.DELETE_FUNCTION,
                                                                                            LogicalDatastoreType
                                                                                                    .CONFIGURATION);
                             Object result = writeServiceFunction.call();

diff --git a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/renderer/NodeManager.java b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/NodeManager.java
similarity index 99%
rename from sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/renderer/NodeManager.java
rename to sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/NodeManager.java
index efae8ccc53b7f2985f4c59616ff48ef01e7b183e..91d921fb70f2054cca9b44c0c65f6af7f70208bc 100644 (file)
--- a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/renderer/NodeManager.java
+++ b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/NodeManager.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.sfc.iosxe.provider.renderer;
+package org.opendaylight.sfc.renderers.iosxe;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;

diff --git a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/listener/NodeListener.java b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/listeners/NodeListener.java
similarity index 94%
rename from sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/listener/NodeListener.java
rename to sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/listeners/NodeListener.java
index 1d9bd1a3227eb43ad3a0c9f6246965bd8154162a..9d1cbf70a8d3ed239e39a263bd2c2fb0a4aa284e 100755 (executable)
--- a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/listener/NodeListener.java
+++ b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/listeners/NodeListener.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.sfc.iosxe.provider.listener;
+package org.opendaylight.sfc.renderers.iosxe.listeners;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -14,7 +14,7 @@ import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.listeners.AbstractSyncDataTreeChangeListener;
-import org.opendaylight.sfc.iosxe.provider.renderer.NodeManager;
+import org.opendaylight.sfc.renderers.iosxe.NodeManager;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.Topology;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;

diff --git a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/listener/RenderedPathListener.java b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/listeners/RenderedPathListener.java
similarity index 93%
rename from sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/listener/RenderedPathListener.java
rename to sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/listeners/RenderedPathListener.java
index 8912c7e91d8d31176a7721f92e96ce1412e3962e..38b9ede3579fdfec9a5677bef3a713a7ed364f33 100644 (file)
--- a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/listener/RenderedPathListener.java
+++ b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/listeners/RenderedPathListener.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.sfc.iosxe.provider.listener;
+package org.opendaylight.sfc.renderers.iosxe.listeners;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -14,7 +14,7 @@ import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.listeners.AbstractSyncDataTreeChangeListener;
-import org.opendaylight.sfc.iosxe.provider.renderer.IosXeRspProcessor;
+import org.opendaylight.sfc.renderers.iosxe.IosXeRspProcessor;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.rsp.rev140701.RenderedServicePaths;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 

diff --git a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/listener/ServiceForwarderListener.java b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/listeners/ServiceForwarderListener.java
similarity index 94%
rename from sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/listener/ServiceForwarderListener.java
rename to sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/listeners/ServiceForwarderListener.java
index 0e32e9c3e5546fcd323bf036a3faa8ba7d21763f..68f77b04a1202213fcf5a90d961bfceedff542d7 100644 (file)
--- a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/listener/ServiceForwarderListener.java
+++ b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/listeners/ServiceForwarderListener.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.sfc.iosxe.provider.listener;
+package org.opendaylight.sfc.renderers.iosxe.listeners;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -14,7 +14,7 @@ import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.listeners.AbstractSyncDataTreeChangeListener;
-import org.opendaylight.sfc.iosxe.provider.renderer.IosXeServiceForwarderMapper;
+import org.opendaylight.sfc.renderers.iosxe.IosXeServiceForwarderMapper;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sff.rev140701.ServiceFunctionForwarders;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 

diff --git a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/listener/ServiceFunctionListener.java b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/listeners/ServiceFunctionListener.java
similarity index 93%
rename from sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/listener/ServiceFunctionListener.java
rename to sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/listeners/ServiceFunctionListener.java
index 63e66f6a090b3bd8d8a453d4d56ca6d3f15518f3..62ee7110096dfb3b8fae5755695d0547d860b957 100644 (file)
--- a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/listener/ServiceFunctionListener.java
+++ b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/listeners/ServiceFunctionListener.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.sfc.iosxe.provider.listener;
+package org.opendaylight.sfc.renderers.iosxe.listeners;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -14,7 +14,7 @@ import javax.inject.Singleton;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.genius.datastoreutils.listeners.AbstractSyncDataTreeChangeListener;
-import org.opendaylight.sfc.iosxe.provider.renderer.IosXeServiceFunctionMapper;
+import org.opendaylight.sfc.renderers.iosxe.IosXeServiceFunctionMapper;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.ServiceFunctions;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 

diff --git a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/utils/IosXeDataStoreAPI.java b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/utils/IosXeDataStoreAPI.java
similarity index 99%
rename from sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/utils/IosXeDataStoreAPI.java
rename to sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/utils/IosXeDataStoreAPI.java
index b3081c3767b9544029360f34b0268ae5fc82e266..92ff65e56a827797f95eb25b8ddb38a279bad562 100644 (file)
--- a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/utils/IosXeDataStoreAPI.java
+++ b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/utils/IosXeDataStoreAPI.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.sfc.iosxe.provider.utils;
+package org.opendaylight.sfc.renderers.iosxe.utils;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;

diff --git a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/utils/RspStatus.java b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/utils/RspStatus.java
similarity index 98%
rename from sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/utils/RspStatus.java
rename to sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/utils/RspStatus.java
index f0d5a46e28931071034dfa23e2e319653cd36eac..e68d1acc210a23e35dec118c7bd3f07e8e44312a 100644 (file)
--- a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/utils/RspStatus.java
+++ b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/utils/RspStatus.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.sfc.iosxe.provider.utils;
+package org.opendaylight.sfc.renderers.iosxe.utils;
 
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.CheckedFuture;

diff --git a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/utils/SfcIosXeUtils.java b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/utils/SfcIosXeUtils.java
similarity index 99%
rename from sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/utils/SfcIosXeUtils.java
rename to sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/utils/SfcIosXeUtils.java
index 7d772f3dda252d7763b33330ff7a94a2bfa4c96e..5225714421a9cdb0df61f3a30a4c684da1c97bf7 100644 (file)
--- a/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/iosxe/provider/utils/SfcIosXeUtils.java
+++ b/sfc-renderers/sfc-ios-xe-renderer/src/main/java/org/opendaylight/sfc/renderers/iosxe/utils/SfcIosXeUtils.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.sfc.iosxe.provider.utils;
+package org.opendaylight.sfc.renderers.iosxe.utils;
 
 import java.util.List;
 import javax.annotation.Nonnull;

diff --git a/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/renderer/IosXeRspProcessorTest.java b/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/IosXeRspProcessorTest.java
similarity index 95%
rename from sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/renderer/IosXeRspProcessorTest.java
rename to sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/IosXeRspProcessorTest.java
index 10a60d7fc3592cf0772f4ca430c8a8cee9d0ee36..6a9407f885d126fa22beb5e16ba6e334a924d878 100644 (file)
--- a/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/renderer/IosXeRspProcessorTest.java
+++ b/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/IosXeRspProcessorTest.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.sfc.iosxe.provider.test.renderer;
+package org.opendaylight.sfc.renderers.iosxe.test;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -14,21 +14,20 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.READ_PATH;
+import static org.opendaylight.sfc.renderers.iosxe.utils.IosXeDataStoreAPI.Transaction.READ_PATH;
 
 import java.util.ArrayList;
 import java.util.List;
 import org.junit.Before;
-//import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.sfc.iosxe.provider.renderer.IosXeRspProcessor;
-import org.opendaylight.sfc.iosxe.provider.renderer.NodeManager;
-import org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI;
 import org.opendaylight.sfc.provider.api.SfcDataStoreAPI;
 import org.opendaylight.sfc.provider.api.SfcProviderServiceForwarderAPI;
 import org.opendaylight.sfc.provider.api.SfcProviderServiceFunctionAPI;
+import org.opendaylight.sfc.renderers.iosxe.IosXeRspProcessor;
+import org.opendaylight.sfc.renderers.iosxe.NodeManager;
+import org.opendaylight.sfc.renderers.iosxe.utils.IosXeDataStoreAPI;
 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.SfName;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SffDataPlaneLocatorName;

diff --git a/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/renderer/IosXeServiceForwarderMapperTest.java b/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/IosXeServiceForwarderMapperTest.java
similarity index 97%
rename from sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/renderer/IosXeServiceForwarderMapperTest.java
rename to sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/IosXeServiceForwarderMapperTest.java
index 7a0d11358ccef6d7ceacd50ce2525f1f172722b5..0188f01b3617e30fa4244b947a3bf719f03a35ab 100644 (file)
--- a/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/renderer/IosXeServiceForwarderMapperTest.java
+++ b/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/IosXeServiceForwarderMapperTest.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.sfc.iosxe.provider.test.renderer;
+package org.opendaylight.sfc.renderers.iosxe.test;
 
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
@@ -21,8 +21,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.sfc.iosxe.provider.renderer.IosXeServiceForwarderMapper;
-import org.opendaylight.sfc.iosxe.provider.renderer.NodeManager;
+import org.opendaylight.sfc.renderers.iosxe.IosXeServiceForwarderMapper;
+import org.opendaylight.sfc.renderers.iosxe.NodeManager;
 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.sff.rev140701.service.function.forwarder.base.SffDataPlaneLocator;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sff.rev140701.service.function.forwarder.base.SffDataPlaneLocatorBuilder;

diff --git a/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/renderer/IosXeServiceFunctionMapperTest.java b/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/IosXeServiceFunctionMapperTest.java
similarity index 97%
rename from sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/renderer/IosXeServiceFunctionMapperTest.java
rename to sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/IosXeServiceFunctionMapperTest.java
index 7b1c0a1bccb63986fa409d6b715b22378f5bc61d..17c42fd96a5727230889896b9608280157a45a94 100644 (file)
--- a/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/renderer/IosXeServiceFunctionMapperTest.java
+++ b/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/IosXeServiceFunctionMapperTest.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.sfc.iosxe.provider.test.renderer;
+package org.opendaylight.sfc.renderers.iosxe.test;
 
 import static org.mockito.Matchers.any;
 import static org.mockito.Mockito.mock;
@@ -22,8 +22,8 @@ import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.sfc.iosxe.provider.renderer.IosXeServiceFunctionMapper;
-import org.opendaylight.sfc.iosxe.provider.renderer.NodeManager;
+import org.opendaylight.sfc.renderers.iosxe.IosXeServiceFunctionMapper;
+import org.opendaylight.sfc.renderers.iosxe.NodeManager;
 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.sf.rev140701.service.function.base.SfDataPlaneLocator;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sf.rev140701.service.function.base.SfDataPlaneLocatorBuilder;

diff --git a/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/renderer/NodeManagerTest.java b/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/NodeManagerTest.java
similarity index 98%
rename from sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/renderer/NodeManagerTest.java
rename to sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/NodeManagerTest.java
index b54282ce28da23a69528e1d9b12db4ceb119bc75..cfc6091e0079e3ad1b729cdcae806036b146255c 100644 (file)
--- a/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/renderer/NodeManagerTest.java
+++ b/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/NodeManagerTest.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.sfc.iosxe.provider.test.renderer;
+package org.opendaylight.sfc.renderers.iosxe.test;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -23,7 +23,7 @@ import org.opendaylight.controller.md.sal.binding.api.MountPoint;
 import org.opendaylight.controller.md.sal.binding.api.MountPointService;
 import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
 import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
-import org.opendaylight.sfc.iosxe.provider.renderer.NodeManager;
+import org.opendaylight.sfc.renderers.iosxe.NodeManager;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.netconf.node.topology.rev150114.NetconfNodeConnectionStatus;

diff --git a/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/utils/IosXeDataStoreAPITest.java b/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/utils/IosXeDataStoreAPITest.java
similarity index 91%
rename from sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/utils/IosXeDataStoreAPITest.java
rename to sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/utils/IosXeDataStoreAPITest.java
index a4780edab8ea8e4c5d8e1d6b81c75c501641f4b6..eb02af0108d11be97587741ccf33108d268ca797 100644 (file)
--- a/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/utils/IosXeDataStoreAPITest.java
+++ b/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/utils/IosXeDataStoreAPITest.java
@@ -6,29 +6,29 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.sfc.iosxe.provider.test.utils;
+package org.opendaylight.sfc.renderers.iosxe.test.utils;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.DELETE_FUNCTION;
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.DELETE_LOCAL;
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.DELETE_PATH;
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.DELETE_REMOTE;
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.READ_FUNCTION;
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.READ_LOCAL;
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.READ_REMOTE;
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.WRITE_FUNCTION;
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.WRITE_LOCAL;
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.WRITE_PATH;
-import static org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI.Transaction.WRITE_REMOTE;
+import static org.opendaylight.sfc.renderers.iosxe.utils.IosXeDataStoreAPI.Transaction.DELETE_FUNCTION;
+import static org.opendaylight.sfc.renderers.iosxe.utils.IosXeDataStoreAPI.Transaction.DELETE_LOCAL;
+import static org.opendaylight.sfc.renderers.iosxe.utils.IosXeDataStoreAPI.Transaction.DELETE_PATH;
+import static org.opendaylight.sfc.renderers.iosxe.utils.IosXeDataStoreAPI.Transaction.DELETE_REMOTE;
+import static org.opendaylight.sfc.renderers.iosxe.utils.IosXeDataStoreAPI.Transaction.READ_FUNCTION;
+import static org.opendaylight.sfc.renderers.iosxe.utils.IosXeDataStoreAPI.Transaction.READ_LOCAL;
+import static org.opendaylight.sfc.renderers.iosxe.utils.IosXeDataStoreAPI.Transaction.READ_REMOTE;
+import static org.opendaylight.sfc.renderers.iosxe.utils.IosXeDataStoreAPI.Transaction.WRITE_FUNCTION;
+import static org.opendaylight.sfc.renderers.iosxe.utils.IosXeDataStoreAPI.Transaction.WRITE_LOCAL;
+import static org.opendaylight.sfc.renderers.iosxe.utils.IosXeDataStoreAPI.Transaction.WRITE_PATH;
+import static org.opendaylight.sfc.renderers.iosxe.utils.IosXeDataStoreAPI.Transaction.WRITE_REMOTE;
 
 import org.junit.Before;
 import org.junit.Test;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.test.AbstractDataBrokerTest;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.sfc.iosxe.provider.utils.IosXeDataStoreAPI;
+import org.opendaylight.sfc.renderers.iosxe.utils.IosXeDataStoreAPI;
 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.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;

diff --git a/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/utils/SfcIosXeUtilsTest.java b/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/utils/SfcIosXeUtilsTest.java
similarity index 98%
rename from sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/utils/SfcIosXeUtilsTest.java
rename to sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/utils/SfcIosXeUtilsTest.java
index 1c936cb4da2b735786d48b1bf8bffe25d4443beb..8f1bc23fa62c6f8d2f703ebcc0d4fedc8b1442ed 100644 (file)
--- a/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/iosxe/provider/test/utils/SfcIosXeUtilsTest.java
+++ b/sfc-renderers/sfc-ios-xe-renderer/src/test/java/org/opendaylight/sfc/renderers/iosxe/test/utils/SfcIosXeUtilsTest.java
@@ -6,7 +6,7 @@
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
 
-package org.opendaylight.sfc.iosxe.provider.test.utils;
+package org.opendaylight.sfc.renderers.iosxe.test.utils;
 
 import static junit.framework.TestCase.assertEquals;
 import static junit.framework.TestCase.assertNotNull;
@@ -16,8 +16,8 @@ import java.util.ArrayList;
 import java.util.List;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.opendaylight.sfc.iosxe.provider.utils.SfcIosXeUtils;
 import org.opendaylight.sfc.provider.api.SfcProviderServiceForwarderAPI;
+import org.opendaylight.sfc.renderers.iosxe.utils.SfcIosXeUtils;
 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;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.sff.rev140701.service.function.forwarder.base.SffDataPlaneLocator;