Renamed onos core package
net.onrc.onos.ofcontroller.core.* => net.onrc.onos.core.main.*
Change-Id: I780858cfc599ec56a5b60b31c774beba6b280d02
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/IOFSwitchPortListener.java b/src/main/java/net/onrc/onos/ofcontroller/core/IOFSwitchPortListener.java
deleted file mode 100644
index 5deae69..0000000
--- a/src/main/java/net/onrc/onos/ofcontroller/core/IOFSwitchPortListener.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- *
- */
-package net.onrc.onos.ofcontroller.core;
-
-import org.openflow.protocol.OFPhysicalPort;
-
-import net.floodlightcontroller.core.IOFSwitchListener;
-
-/**
- * @author y-higuchi
- *
- */
-public interface IOFSwitchPortListener extends IOFSwitchListener {
-
- /**
- * Fired when ports on a switch area added
- */
- public void switchPortAdded(Long switchId, OFPhysicalPort port);
-
- /**
- * Fired when ports on a switch area removed
- */
- public void switchPortRemoved(Long switchId, OFPhysicalPort port);
-
-}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/IOnosRemoteSwitch.java b/src/main/java/net/onrc/onos/ofcontroller/core/IOnosRemoteSwitch.java
deleted file mode 100644
index c9b0e2f..0000000
--- a/src/main/java/net/onrc/onos/ofcontroller/core/IOnosRemoteSwitch.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- *
- */
-package net.onrc.onos.ofcontroller.core;
-
-import net.floodlightcontroller.core.IOFSwitch;
-
-/**
- * @author y-higuchi
- *
- */
-public interface IOnosRemoteSwitch extends IOFSwitch {
-
- /**
- * Setup an unconnected switch with the info required.
- * @param dpid of the switch
- */
- public void setupRemoteSwitch(Long dpid);
-
-}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/Main.java b/src/main/java/net/onrc/onos/ofcontroller/core/Main.java
deleted file mode 100644
index a80ac36..0000000
--- a/src/main/java/net/onrc/onos/ofcontroller/core/Main.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package net.onrc.onos.ofcontroller.core;
-
-import org.kohsuke.args4j.CmdLineException;
-import org.kohsuke.args4j.CmdLineParser;
-
-import net.floodlightcontroller.core.IFloodlightProviderService;
-import net.floodlightcontroller.core.internal.CmdLineSettings;
-import net.floodlightcontroller.core.module.FloodlightModuleException;
-import net.floodlightcontroller.core.module.FloodlightModuleLoader;
-import net.floodlightcontroller.core.module.IFloodlightModuleContext;
-import net.floodlightcontroller.restserver.IRestApiService;
-
-/**
- * Host for the ONOS main method
- * @author alexreimers
- */
-public class Main {
-
- /**
- * Main method to load configuration and modules
- * @param args
- * @throws FloodlightModuleException
- */
- public static void main(String[] args) throws FloodlightModuleException {
- // Setup logger
- System.setProperty("org.restlet.engine.loggerFacadeClass",
- "org.restlet.ext.slf4j.Slf4jLoggerFacade");
-
- CmdLineSettings settings = new CmdLineSettings();
- CmdLineParser parser = new CmdLineParser(settings);
- try {
- parser.parseArgument(args);
- } catch (CmdLineException e) {
- parser.printUsage(System.out);
- System.exit(1);
- }
-
- // Load modules
- FloodlightModuleLoader fml = new FloodlightModuleLoader();
- IFloodlightModuleContext moduleContext = fml.loadModulesFromConfig(settings.getModuleFile());
- // Run REST server
- IRestApiService restApi = moduleContext.getServiceImpl(IRestApiService.class);
- restApi.run();
- // Run the main floodlight module
- IFloodlightProviderService controller =
- moduleContext.getServiceImpl(IFloodlightProviderService.class);
- // This call blocks, it has to be the last line in the main
- controller.run();
- }
-}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/config/DefaultConfiguration.java b/src/main/java/net/onrc/onos/ofcontroller/core/config/DefaultConfiguration.java
deleted file mode 100644
index e4a9b26..0000000
--- a/src/main/java/net/onrc/onos/ofcontroller/core/config/DefaultConfiguration.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package net.onrc.onos.ofcontroller.core.config;
-
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import net.floodlightcontroller.core.module.FloodlightModuleContext;
-import net.floodlightcontroller.core.module.FloodlightModuleException;
-import net.floodlightcontroller.core.module.IFloodlightModule;
-import net.floodlightcontroller.core.module.IFloodlightService;
-import net.floodlightcontroller.util.MACAddress;
-import net.onrc.onos.apps.bgproute.Interface;
-
-import org.openflow.util.HexString;
-
-public class DefaultConfiguration implements IConfigInfoService, IFloodlightModule {
-
- @Override
- public boolean isInterfaceAddress(InetAddress address) {
- return false;
- }
-
- @Override
- public boolean inConnectedNetwork(InetAddress address) {
- return false;
- }
-
- @Override
- public boolean fromExternalNetwork(long inDpid, short inPort) {
- return false;
- }
-
- @Override
- public Interface getOutgoingInterface(InetAddress dstIpAddress) {
- return null;
- }
-
- @Override
- public boolean hasLayer3Configuration() {
- return false;
- }
-
- @Override
- public MACAddress getRouterMacAddress() {
- return MACAddress.valueOf(HexString.fromHexString("000000000001"));
- }
-
- @Override
- public short getVlan() {
- return 0;
- }
-
- @Override
- public Collection<Class<? extends IFloodlightService>> getModuleServices() {
- Collection<Class<? extends IFloodlightService>> l
- = new ArrayList<Class<? extends IFloodlightService>>();
- l.add(IConfigInfoService.class);
- return l;
- }
-
- @Override
- public Map<Class<? extends IFloodlightService>, IFloodlightService> getServiceImpls() {
- Map<Class<? extends IFloodlightService>, IFloodlightService> m
- = new HashMap<Class<? extends IFloodlightService>, IFloodlightService>();
- m.put(IConfigInfoService.class, this);
- return m;
- }
-
- @Override
- public Collection<Class<? extends IFloodlightService>> getModuleDependencies() {
- return null;
- }
-
- @Override
- public void init(FloodlightModuleContext context)
- throws FloodlightModuleException {
- // no-op
- }
-
- @Override
- public void startUp(FloodlightModuleContext context) {
- // no-op
- }
-
-}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/core/config/IConfigInfoService.java b/src/main/java/net/onrc/onos/ofcontroller/core/config/IConfigInfoService.java
deleted file mode 100644
index 5f646a4..0000000
--- a/src/main/java/net/onrc/onos/ofcontroller/core/config/IConfigInfoService.java
+++ /dev/null
@@ -1,48 +0,0 @@
-package net.onrc.onos.ofcontroller.core.config;
-
-import java.net.InetAddress;
-
-import net.floodlightcontroller.core.module.IFloodlightService;
-import net.floodlightcontroller.util.MACAddress;
-import net.onrc.onos.apps.bgproute.Interface;
-
-/**
- * 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 IFloodlightService {
- 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();
-
-
-}
diff --git a/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java b/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
index d71848b..4134101 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/floodlightlistener/NetworkGraphPublisher.java
@@ -15,7 +15,7 @@
import net.floodlightcontroller.core.module.IFloodlightService;
import net.floodlightcontroller.core.util.SingletonTask;
import net.floodlightcontroller.threadpool.IThreadPoolService;
-import net.onrc.onos.ofcontroller.core.IOFSwitchPortListener;
+import net.onrc.onos.core.main.IOFSwitchPortListener;
import net.onrc.onos.ofcontroller.devicemanager.IOnosDeviceListener;
import net.onrc.onos.ofcontroller.devicemanager.IOnosDeviceService;
import net.onrc.onos.ofcontroller.devicemanager.OnosDevice;
diff --git a/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/internal/LinkDiscoveryManager.java b/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
index 39444b9..aa6e1d4 100644
--- a/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
+++ b/src/main/java/net/onrc/onos/ofcontroller/linkdiscovery/internal/LinkDiscoveryManager.java
@@ -56,7 +56,7 @@
import net.floodlightcontroller.threadpool.IThreadPoolService;
import net.floodlightcontroller.util.EventHistory;
import net.floodlightcontroller.util.EventHistory.EvAction;
-import net.onrc.onos.ofcontroller.core.IOnosRemoteSwitch;
+import net.onrc.onos.core.main.IOnosRemoteSwitch;
import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscovery;
import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscovery.LDUpdate;
import net.onrc.onos.ofcontroller.linkdiscovery.ILinkDiscovery.UpdateOperation;