commit e72358a2197b178e0bdc97577a1137c8d7b68a92
author Saurav Das <sauravdas@alumni.stanford.edu> Tue Nov 13 21:56:46 2018 -0800
committer Saurav Das <sauravdas@alumni.stanford.edu> Tue Nov 13 21:56:46 2018 -0800
tree 00abc4f7c09cc9ec0bf970bfa8a0065f1b82cd00
parent 987441af523ac468255671037f54bd782d8d2169

Adding AT&T specific Radius packet customizer. Currently it
avoids updating the nas ip attribute previously set from netcfg.

Change-Id: Ib2af6975c807a65e294e2a73c30a58535623cc26

src/main/java/org/opencord/aaa/SamplePacketCustomizer.java

diff --git a/src/main/java/org/opencord/aaa/SamplePacketCustomizer.java b/src/main/java/org/opencord/aaa/SamplePacketCustomizer.java
index bc8a0d4..6130073 100755
--- a/src/main/java/org/opencord/aaa/SamplePacketCustomizer.java
+++ b/src/main/java/org/opencord/aaa/SamplePacketCustomizer.java
@@ -15,23 +15,20 @@
  */
 package org.opencord.aaa;
 
-import org.onlab.packet.Ethernet;
-import org.onlab.packet.MacAddress;
-import org.onlab.packet.IPv4;
-import org.onlab.packet.RADIUS;
-import org.onlab.packet.RADIUSAttribute;
-
-
-import org.onosproject.net.AnnotationKeys;
-import org.onosproject.net.Port;
-import org.onosproject.net.packet.InboundPacket;
-
-import org.opencord.sadis.SubscriberAndDeviceInformation;
-import org.slf4j.Logger;
+import static org.slf4j.LoggerFactory.getLogger;
 
 import java.nio.ByteBuffer;
 
-import static org.slf4j.LoggerFactory.getLogger;
+import org.onlab.packet.Ethernet;
+import org.onlab.packet.IPv4;
+import org.onlab.packet.MacAddress;
+import org.onlab.packet.RADIUS;
+import org.onlab.packet.RADIUSAttribute;
+import org.onosproject.net.AnnotationKeys;
+import org.onosproject.net.Port;
+import org.onosproject.net.packet.InboundPacket;
+import org.opencord.sadis.SubscriberAndDeviceInformation;
+import org.slf4j.Logger;
 
 
 /**
@@ -47,6 +44,15 @@
     }
 
     /**
+     * Determines if NAS IP Attribute should be updated or not.
+     *
+     * @return true if updating NAS IP is desired
+     */
+    protected boolean updateNasIp() {
+        return true;
+    }
+
+    /**
      * Customize the packet as per specific Setup or RADIUS
      * server requirements.
      *
@@ -92,8 +98,10 @@
 
         log.info("Setting nasId={} nasPortId{}", nodeName, nasPortId);
 
-        inPkt.updateAttribute(RADIUSAttribute.RADIUS_ATTR_NAS_IP,
-                deviceInfo.ipAddress().toOctets());
+        if (updateNasIp()) {
+            inPkt.updateAttribute(RADIUSAttribute.RADIUS_ATTR_NAS_IP,
+                                  deviceInfo.ipAddress().toOctets());
+        }
 
         inPkt.setAttribute(RADIUSAttribute.RADIUS_ATTR_CALLING_STATION_ID,
                 srcMac.toString().getBytes());
@@ -125,6 +133,7 @@
      *                  RADIUS message is being created
      * @return Changed Ethernet packet
      */
+    @Override
     public Ethernet customizeEthernetIPHeaders(Ethernet inPkt,
                                                InboundPacket eapPacket) {