Updated SDN-IP config to support 64-bit port numbers.

Fixes ONOS-776.

(cherry-picked from master)

Change-Id: I0629a140835cd3277eb362c1909b5b806c6fcec0

@@ -15,16 +15,16 @@
  */
  */
 package org.onosproject.config;
 package org.onosproject.config;
 
 
-import java.util.List;
-
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 
+import java.util.List;
+
 /**
 /**
  * Represents a set of addresses bound to a port.
  * Represents a set of addresses bound to a port.
  */
  */
 public class AddressEntry {
 public class AddressEntry {
     private String dpid;
     private String dpid;
-    private short portNumber;
+    private long portNumber;
     private List<String> ipAddresses;
     private List<String> ipAddresses;
     private String macAddress;
     private String macAddress;
 
 
@@ -37,12 +37,12 @@ public class AddressEntry {
         this.dpid = strDpid;
         this.dpid = strDpid;
     }
     }
 
 
-    public short getPortNumber() {
+    public long getPortNumber() {
         return portNumber;
         return portNumber;
     }
     }
 
 
     @JsonProperty("port")
     @JsonProperty("port")
-    public void setPortNumber(short portNumber) {
+    public void setPortNumber(long portNumber) {
         this.portNumber = portNumber;
         this.portNumber = portNumber;
     }
     }
 
 

@@ -15,15 +15,14 @@
  */
  */
 package org.onosproject.sdnip.config;
 package org.onosproject.sdnip.config;
 
 
-import java.util.Objects;
-
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.MoreObjects;
+import org.onlab.packet.IpAddress;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.PortNumber;
-import org.onlab.packet.IpAddress;
 
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.MoreObjects;
+import java.util.Objects;
 
 
 /**
 /**
  * Configuration details for a BGP peer.
  * Configuration details for a BGP peer.
@@ -40,7 +39,7 @@ public class BgpPeer {
      * @param ipAddress the IP address of the peer as a String
      * @param ipAddress the IP address of the peer as a String
      */
      */
     public BgpPeer(@JsonProperty("attachmentDpid") String dpid,
     public BgpPeer(@JsonProperty("attachmentDpid") String dpid,
-                   @JsonProperty("attachmentPort") int port,
+                   @JsonProperty("attachmentPort") long port,
                    @JsonProperty("ipAddress") String ipAddress) {
                    @JsonProperty("ipAddress") String ipAddress) {
         this.connectPoint = new ConnectPoint(
         this.connectPoint = new ConnectPoint(
                 DeviceId.deviceId(SdnIpConfigurationReader.dpidToUri(dpid)),
                 DeviceId.deviceId(SdnIpConfigurationReader.dpidToUri(dpid)),

@@ -15,17 +15,16 @@
  */
  */
 package org.onosproject.sdnip.config;
 package org.onosproject.sdnip.config;
 
 
-import java.util.List;
-import java.util.Objects;
-
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.google.common.base.MoreObjects;
+import org.onlab.packet.MacAddress;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.PortNumber;
 import org.onosproject.net.PortNumber;
-import org.onlab.packet.MacAddress;
 
 
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.google.common.base.MoreObjects;
+import java.util.List;
+import java.util.Objects;
 
 
 /**
 /**
  * Represents a BGP daemon in SDN network.
  * Represents a BGP daemon in SDN network.
@@ -58,7 +57,7 @@ public class BgpSpeaker {
     @JsonCreator
     @JsonCreator
     public BgpSpeaker(@JsonProperty("name") String name,
     public BgpSpeaker(@JsonProperty("name") String name,
             @JsonProperty("attachmentDpid") String attachmentDpid,
             @JsonProperty("attachmentDpid") String attachmentDpid,
-            @JsonProperty("attachmentPort") int attachmentPort,
+            @JsonProperty("attachmentPort") long attachmentPort,
             @JsonProperty("macAddress") String macAddress) {
             @JsonProperty("macAddress") String macAddress) {
 
 
         this.name = name;
         this.name = name;