VOL-1256: Support for transparent flows (with different Vlan IDs) on a ONU for DT FTTB Use case, after merge

Change-Id: I1fa25d826d87658e6951a2aa90f4577be81f301d
diff --git a/api/src/main/java/org/opencord/olt/AccessDeviceService.java b/api/src/main/java/org/opencord/olt/AccessDeviceService.java
index 6387a03..2652a31 100644
--- a/api/src/main/java/org/opencord/olt/AccessDeviceService.java
+++ b/api/src/main/java/org/opencord/olt/AccessDeviceService.java
@@ -19,6 +19,7 @@
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 
 import org.onlab.packet.VlanId;
 import org.onosproject.event.ListenerService;
@@ -54,17 +55,21 @@
      * Provisions flows for the specific subscriber.
      *
      * @param subscriberId Identification of the subscriber
+     * @param sTag additional outer tag on this port
+     * @param cTag additional inner tag on this port
      * @return true if successful false otherwise
      */
-    boolean provisionSubscriber(AccessSubscriberId subscriberId);
+    boolean provisionSubscriber(AccessSubscriberId subscriberId, Optional<VlanId> sTag, Optional<VlanId> cTag);
 
     /**
      * Removes flows for the specific subscriber.
      *
      * @param subscriberId Identification of the subscriber
+     * @param sTag additional outer tag on this port
+     * @param cTag additional inner tag on this port
      * @return true if successful false otherwise
      */
-    boolean removeSubscriber(AccessSubscriberId subscriberId);
+    boolean removeSubscriber(AccessSubscriberId subscriberId, Optional<VlanId> sTag, Optional<VlanId> cTag);
 
     /**
      * Returns information about the provisioned subscribers.