Added config app to read address config from json file
diff --git a/apps/config/src/main/java/org/onlab/onos/config/AddressConfiguration.java b/apps/config/src/main/java/org/onlab/onos/config/AddressConfiguration.java
new file mode 100644
index 0000000..580e950
--- /dev/null
+++ b/apps/config/src/main/java/org/onlab/onos/config/AddressConfiguration.java
@@ -0,0 +1,34 @@
+package org.onlab.onos.config;
+
+import java.util.Collections;
+import java.util.List;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+
+/**
+ * Object to store address configuration read from a JSON file.
+ */
+public class AddressConfiguration {
+
+ private List<AddressEntry> addresses;
+
+ /**
+ * Gets a list of addresses in the system.
+ *
+ * @return the list of addresses
+ */
+ public List<AddressEntry> getAddresses() {
+ return Collections.unmodifiableList(addresses);
+ }
+
+ /**
+ * Sets a list of addresses in the system.
+ *
+ * @param addresses the list of addresses
+ */
+ @JsonProperty("addresses")
+ public void setAddresses(List<AddressEntry> addresses) {
+ this.addresses = addresses;
+ }
+
+}
diff --git a/apps/config/src/main/java/org/onlab/onos/config/AddressEntry.java b/apps/config/src/main/java/org/onlab/onos/config/AddressEntry.java
new file mode 100644
index 0000000..318aebd
--- /dev/null
+++ b/apps/config/src/main/java/org/onlab/onos/config/AddressEntry.java
@@ -0,0 +1,53 @@
+package org.onlab.onos.config;
+
+import java.util.List;
+
+import org.codehaus.jackson.annotate.JsonProperty;
+import org.onlab.packet.IpPrefix;
+import org.onlab.packet.MacAddress;
+
+/**
+ * Represents a set of addresses bound to a port.
+ */
+public class AddressEntry {
+ private String dpid;
+ private short portNumber;
+ private List<IpPrefix> ipAddresses;
+ private MacAddress macAddress;
+
+ public String getDpid() {
+ return dpid;
+ }
+
+ @JsonProperty("dpid")
+ public void setDpid(String strDpid) {
+ this.dpid = strDpid;
+ }
+
+ public short getPortNumber() {
+ return portNumber;
+ }
+
+ @JsonProperty("port")
+ public void setPortNumber(short portNumber) {
+ this.portNumber = portNumber;
+ }
+
+ public List<IpPrefix> getIpAddresses() {
+ return ipAddresses;
+ }
+
+ @JsonProperty("ips")
+ public void setIpAddresses(List<IpPrefix> ipAddresses) {
+ this.ipAddresses = ipAddresses;
+ }
+
+ public MacAddress getMacAddress() {
+ return macAddress;
+ }
+
+ @JsonProperty("mac")
+ public void setMacAddress(MacAddress macAddress) {
+ this.macAddress = macAddress;
+ }
+}
diff --git a/apps/config/src/main/java/org/onlab/onos/config/NetworkConfigReader.java b/apps/config/src/main/java/org/onlab/onos/config/NetworkConfigReader.java
new file mode 100644
index 0000000..985c4a2
--- /dev/null
+++ b/apps/config/src/main/java/org/onlab/onos/config/NetworkConfigReader.java
@@ -0,0 +1,90 @@
+package org.onlab.onos.config;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.ReferenceCardinality;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.onlab.onos.net.ConnectPoint;
+import org.onlab.onos.net.DeviceId;
+import org.onlab.onos.net.PortNumber;
+import org.onlab.onos.net.host.HostAdminService;
+import org.onlab.onos.net.host.PortAddresses;
+import org.slf4j.Logger;
+
+import com.google.common.collect.Sets;
+
+/**
+ * Simple configuration module to read in supplementary network configuration
+ * from a file.
+ */
+@Component(immediate = true)
+public class NetworkConfigReader {
+
+ private final Logger log = getLogger(getClass());
+
+ private static final String DEFAULT_CONFIG_FILE = "config/addresses.json";
+ private String configFileName = DEFAULT_CONFIG_FILE;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ protected HostAdminService hostAdminService;
+
+ @Activate
+ protected void activate() {
+ log.info("Started network config reader");
+
+ log.info("Config file set to {}", configFileName);
+
+ AddressConfiguration config = readNetworkConfig();
+
+ if (config != null) {
+ for (AddressEntry entry : config.getAddresses()) {
+
+ ConnectPoint cp = new ConnectPoint(
+ DeviceId.deviceId(dpidToUri(entry.getDpid())),
+ PortNumber.portNumber(entry.getPortNumber()));
+
+ PortAddresses addresses = new PortAddresses(cp,
+ Sets.newHashSet(entry.getIpAddresses()),
+ entry.getMacAddress());
+
+ hostAdminService.bindAddressesToPort(addresses);
+ }
+ }
+ }
+
+ @Deactivate
+ protected void deactivate() {
+ log.info("Stopped");
+ }
+
+ private AddressConfiguration readNetworkConfig() {
+ File configFile = new File(configFileName);
+
+ ObjectMapper mapper = new ObjectMapper();
+
+ try {
+ AddressConfiguration config =
+ mapper.readValue(configFile, AddressConfiguration.class);
+
+ return config;
+ } catch (FileNotFoundException e) {
+ log.warn("Configuration file not found: {}", configFileName);
+ } catch (IOException e) {
+ log.error("Unable to read config from file:", e);
+ }
+
+ return null;
+ }
+
+ private static String dpidToUri(String dpid) {
+ return "of:" + dpid.replace(":", "");
+ }
+}
diff --git a/apps/config/src/main/java/org/onlab/onos/config/package-info.java b/apps/config/src/main/java/org/onlab/onos/config/package-info.java
new file mode 100644
index 0000000..514a47a
--- /dev/null
+++ b/apps/config/src/main/java/org/onlab/onos/config/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Simple configuration module to read in supplementary network configuration
+ * from a file.
+ */
+package org.onlab.onos.config;