commit 25bfe3706a0d99ccc4ccee8a52fcb1644899668a
author Yi Tseng <yi@opennetworking.org> Fri Nov 03 16:27:32 2017 -0700
committer Thomas Vachuska <tom@opennetworking.org> Tue Nov 14 19:02:03 2017 +0000
tree 4f92f793da1abe8a06fa7e211ca6406f941390ae
parent ba1bbaf1faa0b7246f3061a1188127da56783451

[CORD-1735] Add "relayAgentIps" option to DHCP relay application config

Change-Id: I8ea5a144694f510c93530c9107573b1cb1f5703b

apps/dhcprelay/src/test/resources/dhcp-relay.json

diff --git a/apps/dhcprelay/src/test/resources/dhcp-relay.json b/apps/dhcprelay/src/test/resources/dhcp-relay.json
index e77d8a7..fe5da9c 100644
--- a/apps/dhcprelay/src/test/resources/dhcp-relay.json
+++ b/apps/dhcprelay/src/test/resources/dhcp-relay.json
@@ -6,14 +6,28 @@
           "dhcpServerConnectPoint": "of:0000000000000002/2",
           "serverIps": ["172.168.10.2", "2000::200:1"],
           "gatewayIps": ["192.168.10.254", "1000::100:1"],
-          "relayAgentIps": ["10.0.0.1", "1000:100::100:1"]
+          "relayAgentIps": {
+            "of:0000000000000001": {
+              "ipv4": "10.0.0.10",
+              "ipv6": "2000::10"
+            },
+            "of:0000000000000002": {
+              "ipv4": "10.0.1.10",
+              "ipv6": "2000::1:10"
+            }
+          }
         }
       ],
       "indirect": [
         {
           "dhcpServerConnectPoint": "of:0000000000000002/3",
           "serverIps": ["172.168.10.3"],
-          "relayAgentIps": ["10.0.1.1"]
+          "relayAgentIps": {
+            "of:0000000000000001": {
+              "ipv4": "10.0.0.10",
+              "ipv6": "2000::10"
+            }
+          }
         }
       ],
       "ignoreDhcp": [