commit c4dfe85c6f5db9b8d81299a4538ea56378939c27
author alshabib <alshabibi.ali@gmail.com> Fri Jun 05 13:35:13 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Fri Jun 05 20:49:09 2015 +0000
tree 43358900df6f499ed742423526d7212af358f871
parent 8de884544e40da0caf112c9331676a0fad90478b

adding support for iptv

Change-Id: I903bc97581a9393ec8bb7973a722044669ae7470

src/main/java/org/onosproject/olt/OLT.java

diff --git a/src/main/java/org/onosproject/olt/OLT.java b/src/main/java/org/onosproject/olt/OLT.java
index 58150bc..d31ec05 100644
--- a/src/main/java/org/onosproject/olt/OLT.java
+++ b/src/main/java/org/onosproject/olt/OLT.java
@@ -87,10 +87,13 @@
     @Activate
     public void activate() {
         appId = coreService.registerApplication("org.onosproject.mobility");
+
         deviceService.getPorts(DeviceId.deviceId(oltDevice)).stream().forEach(
                 port -> {
                     if (port.isEnabled()) {
-                        provisionVlanOnPort(port.number());
+                        short vlanId = fetchVlanId(port.number());
+                        provisionVlanOnPort(port.number(), (short) 7);
+                        provisionVlanOnPort(port.number(), vlanId);
                     }
                 }
         );
@@ -115,22 +118,27 @@
 
     }
 
-    private void provisionVlanOnPort(PortNumber p) {
-        long port = p.toLong() + OFFSET;
-        if (port > 4095) {
+
+    private short fetchVlanId(PortNumber port) {
+        long p = port.toLong() + OFFSET;
+        if (p > 4095) {
             log.warn("Port Number {} exceeds vlan max", port);
-            return;
+            return -1;
         }
+        return (short) p;
+    }
+
+
+    private void provisionVlanOnPort(PortNumber p, short vlanId) {
+
 
         TrafficSelector upstream = DefaultTrafficSelector.builder()
-                .matchVlanId(
-                        VlanId.vlanId((short) port))
+                .matchVlanId(VlanId.vlanId(vlanId))
                 .matchInPort(p)
                 .build();
 
         TrafficSelector downStream = DefaultTrafficSelector.builder()
-                .matchVlanId(
-                        VlanId.vlanId((short) port))
+                .matchVlanId(VlanId.vlanId(vlanId))
                 .matchInPort(PortNumber.portNumber(uplinkPort))
                 .build();
 
@@ -174,7 +182,8 @@
                 case PORT_ADDED:
                 case PORT_UPDATED:
                     if (devId.equals(event.subject().id()) && event.port().isEnabled()) {
-                        provisionVlanOnPort(event.port().number());
+                        short vlanId = fetchVlanId(event.port().number());
+                        provisionVlanOnPort(event.port().number(), vlanId);
                     }
                     break;
                 case DEVICE_ADDED: