Pulled ProxyArpManager out of the SDN-IP module. Most of the work is related to stubbing out an IConfigInfoService object that can provide default configuration to the ARP module when there's no SDN-IP config file to read it from
diff --git a/src/main/java/net/onrc/onos/ofcontroller/bgproute/BgpRoute.java b/src/main/java/net/onrc/onos/ofcontroller/bgproute/BgpRoute.java
index 5e2cb05..a3c8f1f 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/bgproute/BgpRoute.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/bgproute/BgpRoute.java
@@ -34,6 +34,7 @@
import net.floodlightcontroller.util.MACAddress;
import net.onrc.onos.ofcontroller.bgproute.RibUpdate.Operation;
import net.onrc.onos.ofcontroller.core.INetMapTopologyService.ITopoLinkService;
+import net.onrc.onos.ofcontroller.core.config.IConfigInfoService;
import net.onrc.onos.ofcontroller.core.internal.TopoLinkServiceImpl;
import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscovery;
import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscovery.LDUpdate;
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 7fabc72..4c81d1b 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/bgproute/Configuration.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/bgproute/Configuration.java
@@ -47,7 +47,7 @@
public void setBgpdMacAddress(String strMacAddress) {
this.bgpdMacAddress = MACAddress.valueOf(strMacAddress);
}
-
+
public List<String> getSwitches() {
return Collections.unmodifiableList(switches);
}
@@ -65,7 +65,7 @@
public void setSwitches(List<String> switches) {
this.switches = switches;
}
-
+
public List<Interface> getInterfaces() {
return Collections.unmodifiableList(interfaces);
}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/bgproute/IConfigInfoService.java b/src/main/java/net/onrc/onos/ofcontroller/bgproute/IConfigInfoService.java
deleted file mode 100644
index 4d80894..0000000
--- a/src/main/java/net/onrc/onos/ofcontroller/bgproute/IConfigInfoService.java
+++ /dev/null
@@ -1,47 +0,0 @@
-package net.onrc.onos.ofcontroller.bgproute;
-
-import java.net.InetAddress;
-
-import net.floodlightcontroller.util.MACAddress;
-import net.onrc.onos.ofcontroller.core.module.IOnosService;
-
-/**
- * Provides information about the layer 3 properties of the network.
- * This is based on IP addresses configured on ports in the network.
- *
- */
-public interface IConfigInfoService extends IOnosService {
- public boolean isInterfaceAddress(InetAddress address);
- public boolean inConnectedNetwork(InetAddress address);
- public boolean fromExternalNetwork(long inDpid, short inPort);
-
- /**
- * Retrieves the {@link Interface} object for the interface that packets
- * to dstIpAddress will be sent out of. Returns null if dstIpAddress is not
- * in a directly connected network, or if no interfaces are configured.
- * @param dstIpAddress Destination IP address that we want to match to
- * an outgoing interface
- * @return The {@link Interface} object if found, null if not
- */
- public Interface getOutgoingInterface(InetAddress dstIpAddress);
-
- /**
- * Returns whether this controller has a layer 3 configuration
- * (i.e. interfaces and IP addresses)
- * @return True if IP addresses are configured, false if not
- */
- public boolean hasLayer3Configuration();
-
- public MACAddress getRouterMacAddress();
-
- /**
- * We currently have basic vlan support for the situation when the contr
- * is running within a single vlan. In this case, packets sent from the
- * controller (e.g. ARP) need to be tagged with that vlan.
- * @return The vlan id configured in the config file,
- * or 0 if no vlan is configured.
- */
- public short getVlan();
-
-
-}