commit 483ac6f0689220425061056e748230efe6d8a1b2
author Yi Tseng <a86487817@gmail.com> Wed Aug 02 15:03:31 2017 -0700
committer Thomas Vachuska <tom@opennetworking.org> Wed Aug 23 23:25:54 2017 +0000
tree 1548b168f9f1e4939a659980dc660f1c7591dcf7
parent 809b5d71fe216250c9018d3b591e9060b0f9316c

[CORD-1628] DHCP relay app configuration change for multiple servers

Change-Id: I13747d8e6451658dfd9344c428b6aad11bf5af62

apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayCommand.java

diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayCommand.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayCommand.java
index 089b8ba..5a4ecde 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayCommand.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/cli/DhcpRelayCommand.java
@@ -25,9 +25,10 @@
 import org.onosproject.cli.AbstractShellCommand;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.core.CoreService;
-import org.onosproject.dhcprelay.DhcpRelayConfig;
+import org.onosproject.dhcprelay.config.DefaultDhcpRelayConfig;
 import org.onosproject.dhcprelay.DhcpRelayManager;
 import org.onosproject.dhcprelay.api.DhcpRelayService;
+import org.onosproject.dhcprelay.config.DhcpServerConfig;
 import org.onosproject.dhcprelay.store.DhcpRecord;
 import org.onosproject.net.ConnectPoint;
 import org.onosproject.net.Host;
@@ -65,16 +66,20 @@
 
     @Override
     protected void execute() {
-        DhcpRelayConfig cfg = CFG_SERVICE.getConfig(APP_ID, DhcpRelayConfig.class);
-        if (cfg == null) {
+        DefaultDhcpRelayConfig cfg = CFG_SERVICE.getConfig(APP_ID, DefaultDhcpRelayConfig.class);
+        if (cfg == null || cfg.dhcpServerConfigs().size() == 0) {
             print(MISSING_SERVER_CFG);
             return;
         }
 
         // DHCP server information
-        ConnectPoint connectPoint = cfg.getDhcpServerConnectPoint();
-        Ip4Address gatewayAddress = cfg.getDhcpGatewayIp();
-        Ip4Address serverIp = cfg.getDhcpServerIp();
+        // TODO: currently we pick up first DHCP server config.
+        // Will use other server configs in the future.
+        DhcpServerConfig serverConfig = cfg.dhcpServerConfigs().get(0);
+
+        ConnectPoint connectPoint = serverConfig.getDhcpServerConnectPoint().orElse(null);
+        Ip4Address gatewayAddress = serverConfig.getDhcpGatewayIp4().orElse(null);
+        Ip4Address serverIp = serverConfig.getDhcpServerIp4().orElse(null);
         String serverMac = DHCP_RELAY_SERVICE.getDhcpServerMacAddress()
                 .map(MacAddress::toString).orElse(NA);
         if (gatewayAddress != null) {