commit 2c58b506b73a1c7c855c1273c61c803ea183bc4d
author Yi Tseng <yi@opennetworking.org> Wed Aug 02 16:30:05 2017 -0700
committer Charles Chan <charles@opennetworking.org> Thu Aug 24 18:27:23 2017 +0000
tree a85f49594699169dcb7c1e86787e3201eee69986
parent d244e564d05ae1832e8905b545aeb58318227efb

New network config for DHCP relay app

Change-Id: I5f1a6934be2936c21cb754f6a951d87fffc065a4

trellis/trellis.json

diff --git a/trellis/trellis.json b/trellis/trellis.json
index e592753..1b4a5cd 100644
--- a/trellis/trellis.json
+++ b/trellis/trellis.json
@@ -182,11 +182,13 @@
         }
     },
     "apps" : {
-        "org.onosproject.dhcp-relay" : {
-            "dhcprelay" : {
-                "dhcpserverConnectPoint": "of:0000000000000205/7",
-                "serverip": "10.0.3.253"
-            }
+        "org.onosproject.dhcprelay" : {
+            "default": [
+                {
+                    "dhcpServerConnectPoint": "of:0000000000000205/7",
+                    "serverIps": ["10.0.3.253"]
+                }
+            ]
         }
     }
 }

trellis/trellis_dualhome.json

diff --git a/trellis/trellis_dualhome.json b/trellis/trellis_dualhome.json
index 90b342e..5f4cdef 100644
--- a/trellis/trellis_dualhome.json
+++ b/trellis/trellis_dualhome.json
@@ -250,11 +250,13 @@
         }
     },
     "apps" : {
-        "org.onosproject.dhcp-relay" : {
-            "dhcprelay" : {
-                "dhcpserverConnectPoint": "of:0000000000000205/10",
-                "serverip": "10.0.3.253"
-            }
+        "org.onosproject.dhcprelay" : {
+            "default": [
+                {
+                    "dhcpServerConnectPoint": "of:0000000000000205/10",
+                    "serverIps": ["10.0.3.253"]
+                }
+            ]
         }
     }
 }

trellis/trellis_remote_dhcp.json

diff --git a/trellis/trellis_remote_dhcp.json b/trellis/trellis_remote_dhcp.json
index cfc30fc..a836a0f 100644
--- a/trellis/trellis_remote_dhcp.json
+++ b/trellis/trellis_remote_dhcp.json
@@ -174,12 +174,14 @@
         }
     },
     "apps" : {
-        "org.onosproject.dhcp-relay" : {
-            "dhcprelay" : {
-                "dhcpserverConnectPoint": "of:0000000000000205/8",
-                "serverip": "10.0.99.3",
-                "gatewayip": "10.0.1.1"
-            }
+        "org.onosproject.dhcprelay" : {
+            "default" : [
+                {
+                    "dhcpServerConnectPoint": "of:0000000000000205/8",
+                    "serverIps": ["10.0.99.3"],
+                    "gatewayIps": ["10.0.1.1"]
+                }
+            ]
         }
     }
 }

trellis/trellis_vlan.json

diff --git a/trellis/trellis_vlan.json b/trellis/trellis_vlan.json
index 461c16e..b17a1a7 100644
--- a/trellis/trellis_vlan.json
+++ b/trellis/trellis_vlan.json
@@ -175,11 +175,13 @@
         }
     },
     "apps" : {
-        "org.onosproject.dhcp-relay" : {
-            "dhcprelay" : {
-                "dhcpserverConnectPoint": "of:0000000000000205/7",
-                "serverip": "10.0.3.253"
-            }
+        "org.onosproject.dhcprelay" : {
+            "default": [
+                {
+                    "dhcpServerConnectPoint": "of:0000000000000205/7",
+                    "serverIps": ["10.0.3.253"]
+                }
+            ]
         }
     }
 }