commit fa0dc66f7f17c32abe9ccfe49df92b904def6f63
author alshabib <alshabibi.ali@gmail.com> Wed Jan 13 11:23:53 2016 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Jan 14 06:55:18 2016 +0000
tree 2ad1b0aaacd3bcccad72715409c4adbc580c020d
parent 4cc4b953337bf5d2ac177576c051f39aab6e7d5c

adding a criterion for inner vlans
used by olt to match on the inner vlan

Change-Id: I7671b68d9860d598395cba134a589ca23f264c7e

apps/olt/src/main/java/org/onosproject/olt/Olt.java

diff --git a/apps/olt/src/main/java/org/onosproject/olt/Olt.java b/apps/olt/src/main/java/org/onosproject/olt/Olt.java
index bdff1fa..fdf82a0 100644
--- a/apps/olt/src/main/java/org/onosproject/olt/Olt.java
+++ b/apps/olt/src/main/java/org/onosproject/olt/Olt.java
@@ -147,7 +147,13 @@
         }
 
         provisionVlans(olt.deviceId(), olt.uplink(), port.port(), vlan, olt.vlan(),
-                olt.defaultVlan());
+                       olt.defaultVlan());
+    }
+
+    @Override
+    public void removeSubscriber(ConnectPoint port) {
+        throw new UnsupportedOperationException();
+
     }
 
     private void provisionVlans(DeviceId deviceId, PortNumber uplinkPort,
@@ -166,6 +172,7 @@
         TrafficSelector downstream = DefaultTrafficSelector.builder()
                 .matchVlanId(deviceVlan)
                 .matchInPort(uplinkPort)
+                .matchInnerVlanId(subscriberVlan)
                 .build();
 
         TrafficTreatment upstreamTreatment = DefaultTrafficTreatment.builder()
@@ -243,11 +250,6 @@
 
     }
 
-    @Override
-    public void removeSubscriber(ConnectPoint port) {
-        throw new UnsupportedOperationException("Not yet implemented");
-    }
-
     private class InternalDeviceListener implements DeviceListener {
         @Override
         public void event(DeviceEvent event) {