[VOL-4707] Expose programmed subscribers via REST and move classes and interfaces to the API.
Change-Id: Ibfb9caa48455fd349932297cb9191ee0f0341ffa
Signed-off-by: Gustavo Silva <gsilva@furukawalatam.com>
diff --git a/impl/src/main/java/org/opencord/olt/impl/OltUtils.java b/impl/src/main/java/org/opencord/olt/impl/OltUtils.java
index 869a01d..45d684e 100644
--- a/impl/src/main/java/org/opencord/olt/impl/OltUtils.java
+++ b/impl/src/main/java/org/opencord/olt/impl/OltUtils.java
@@ -19,15 +19,14 @@
import org.onlab.packet.VlanId;
import org.onosproject.net.AnnotationKeys;
import org.onosproject.net.Port;
+import org.opencord.olt.FlowOperation;
import org.opencord.sadis.SubscriberAndDeviceInformation;
import org.opencord.sadis.UniTagInformation;
-import static org.opencord.olt.impl.OltFlowService.FlowOperation.ADD;
-
/**
* Utility class for OLT app.
*/
-final class OltUtils {
+public final class OltUtils {
private OltUtils() {
}
@@ -37,7 +36,7 @@
* @param port the port
* @return the annotated port name
*/
- static String getPortName(Port port) {
+ public static String getPortName(Port port) {
String name = port.annotations().value(AnnotationKeys.PORT_NAME);
return name == null ? "" : name;
}
@@ -47,18 +46,18 @@
* @param port the port
* @return the formatted string
*/
- static String portWithName(Port port) {
+ public static String portWithName(Port port) {
return port.element().id().toString() + '/' +
port.number() + '[' +
getPortName(port) + ']';
}
- static String flowOpToString(OltFlowService.FlowOperation op) {
- return op == ADD ? "Adding" : "Removing";
+ public static String flowOpToString(FlowOperation op) {
+ return op == FlowOperation.ADD ? "Adding" : "Removing";
}
- static String completeFlowOpToString(OltFlowService.FlowOperation op) {
- return op == ADD ? "Added" : "Removed";
+ public static String completeFlowOpToString(FlowOperation op) {
+ return op == FlowOperation.ADD ? "Added" : "Removed";
}
/**
@@ -72,7 +71,7 @@
* @param tpId Techprofile Id
* @return UniTagInformation
*/
- static UniTagInformation getUniTagInformation(SubscriberAndDeviceInformation subInfo, VlanId innerVlan,
+ public static UniTagInformation getUniTagInformation(SubscriberAndDeviceInformation subInfo, VlanId innerVlan,
VlanId outerVlan, int tpId) {
UniTagInformation service = null;
for (UniTagInformation tagInfo : subInfo.uniTagList()) {