Changed configuration file format to separate 'interfaces' from BGP peers. Also implemented procative paths for BGP traffic within the SDN domain
diff --git a/src/main/java/net/onrc/onos/ofcontroller/bgproute/Configuration.java b/src/main/java/net/onrc/onos/ofcontroller/bgproute/Configuration.java
index 5194584..65617c8 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/bgproute/Configuration.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/bgproute/Configuration.java
@@ -4,15 +4,38 @@
import java.util.Map;
import org.codehaus.jackson.annotate.JsonProperty;
+import org.openflow.util.HexString;
public class Configuration {
- List<String> switches;
- Map<String, GatewayRouter> gateways;
+ private long bgpdAttachmentDpid;
+ private short bgpdAttachmentPort;
+ private List<String> switches;
+ private Map<String, Interface> interfaces;
+ private List<BgpPeer> peers;
+ private Map<String, GatewayRouter> gateways;
public Configuration() {
// TODO Auto-generated constructor stub
}
+ public long getBgpdAttachmentDpid() {
+ return bgpdAttachmentDpid;
+ }
+
+ @JsonProperty("bgpdAttachmentDpid")
+ public void setBgpdAttachmentDpid(String bgpdAttachmentDpid) {
+ this.bgpdAttachmentDpid = HexString.toLong(bgpdAttachmentDpid);
+ }
+
+ public short getBgpdAttachmentPort() {
+ return bgpdAttachmentPort;
+ }
+
+ @JsonProperty("bgpdAttachmentPort")
+ public void setBgpdAttachmentPort(short bgpdAttachmentPort) {
+ this.bgpdAttachmentPort = bgpdAttachmentPort;
+ }
+
public List<String> getSwitches() {
return switches;
}
@@ -22,6 +45,24 @@
this.switches = switches;
}
+ public Map<String, Interface> getInterfaces() {
+ return interfaces;
+ }
+
+ @JsonProperty("interfaces")
+ public void setInterfaces(Map<String, Interface> interfaces) {
+ this.interfaces = interfaces;
+ }
+
+ public List<BgpPeer> getPeers() {
+ return peers;
+ }
+
+ @JsonProperty("bgpPeers")
+ public void setPeers(List<BgpPeer> peers) {
+ this.peers = peers;
+ }
+
public Map<String, GatewayRouter> getGateways() {
return gateways;
}