commit 3d5817529aa477b71b4912cbfc8253d70b7e9fc0
author alshabib <alshabibi.ali@gmail.com> Fri Jun 05 15:32:15 2015 -0700
committer alshabib <alshabibi.ali@gmail.com> Fri Jun 05 15:32:15 2015 -0700
tree 7a94484c167d06ef36899e54ba3595b528334a06
parent de5538f96b0f533e7869c350a1319f2df6cad932

fixing uplink ports

Change-Id: Iab6116d10b603000878604c182b0e1a21c390a56

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 7d9780e..f3cbb1d 100644
--- a/src/main/java/org/onosproject/olt/OLT.java
+++ b/src/main/java/org/onosproject/olt/OLT.java
@@ -71,6 +71,7 @@
     public static final int OFFSET = 200;
 
     public static final int UPLINK_PORT = 129;
+    public static final int GFAST_UPLINK_PORT = 100;
 
     public static final String OLT_DEVICE = "of:90e2ba82f97791e9";
     public static final String GFAST_DEVICE = "of:0011223344551357";
@@ -79,6 +80,10 @@
             label = "The OLT's uplink port number")
     private int uplinkPort = UPLINK_PORT;
 
+    @Property(name = "gfastUplink", intValue = GFAST_UPLINK_PORT,
+            label = "The OLT's uplink port number")
+    private int gfastUplink = GFAST_UPLINK_PORT;
+
     //TODO: replace this with an annotation lookup
     @Property(name = "oltDevice", value = OLT_DEVICE,
             label = "The OLT device id")
@@ -98,8 +103,8 @@
                     if (!port.number().isLogical() && port.isEnabled()) {
                         short vlanId = fetchVlanId(port.number());
                         if (vlanId > 0) {
-                            provisionVlanOnPort(oltDevice, port.number(), (short) 7);
-                            provisionVlanOnPort(oltDevice, port.number(), vlanId);
+                            provisionVlanOnPort(oltDevice, uplinkPort, port.number(), (short) 7);
+                            provisionVlanOnPort(oltDevice, uplinkPort, port.number(), vlanId);
                         }
                     }
                 }
@@ -111,7 +116,7 @@
                     if (!port.number().isLogical() && port.isEnabled()) {
                         short vlanId = (short) (fetchVlanId(port.number()) + OFFSET);
                         if (vlanId > 0) {
-                            provisionVlanOnPort(gfastDevice, port.number(), vlanId);
+                            provisionVlanOnPort(gfastDevice, gfastUplink, port.number(), vlanId);
                         }
                     }
                 }
@@ -148,7 +153,7 @@
     }
 
 
-    private void provisionVlanOnPort(String deviceId, PortNumber p, short vlanId) {
+    private void provisionVlanOnPort(String deviceId, int uplinkPort, PortNumber p, short vlanId) {
         DeviceId did = DeviceId.deviceId(deviceId);
 
         TrafficSelector upstream = DefaultTrafficSelector.builder()
@@ -202,7 +207,7 @@
                 case PORT_UPDATED:
                     if (devId.equals(event.subject().id()) && event.port().isEnabled()) {
                         short vlanId = fetchVlanId(event.port().number());
-                        provisionVlanOnPort(gfastDevice, event.port().number(), vlanId);
+                        provisionVlanOnPort(gfastDevice, uplinkPort, event.port().number(), vlanId);
                     }
                     break;
                 case DEVICE_ADDED: