update NetworkGraph objects

- Use Object type instead of built-in
- Port number to Long

Change-Id: I30847b6cca801e58ca49dd9d1667cfd33a8ffb92
diff --git a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/Link.java b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/Link.java
index 0fc72f6..ef74f73 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/networkgraph/Link.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/networkgraph/Link.java
@@ -12,13 +12,17 @@
 	public Port getDestinationPort();
 	public Switch getSourceSwitch();
 	public Switch getDestinationSwitch();
-
+		
 	public long getLastSeenTime();
+
 	public int getCost();
+	public Double getCapacity();
 
 	// Not sure if we want to expose these northbound
-	public long getSourceSwitchDpid();
-	public short getSourcePortNumber();
-	public long getDestinationSwitchDpid();
-	public short getDestinationPortNumber();
+	// Toshi: I think these are unnecessary because we can get them
+	// Toshi: like "this.getSourcePort().getSwitch()" etc.
+	public Long getSourceSwitchDpid();
+	public Long getSourcePortNumber();
+	public Long getDestinationSwitchDpid();
+	public Long getDestinationPortNumber();
 }