summaryrefslogtreecommitdiffstats
path: root/dhcp/dhcp-impl/src/test/resources
diff options
context:
space:
mode:
authorMarek Gradzki <mgradzki@cisco.com>2017-03-02 13:40:22 +0100
committerMarek Gradzki <mgradzki@cisco.com>2017-03-08 09:34:41 +0100
commitf782c704854eac8cb5ffe04ed4addfeae5b2bdfe (patch)
treedb7968af76c072cc48edf25c972c982017ac0cf8 /dhcp/dhcp-impl/src/test/resources
parent7a583394d0e81993e31c830a9d22f3ebb2a6de3e (diff)
HC2VPP-43: support for multiple DHCP servers for relay
Depends on https://gerrit.fd.io/r/#/c/5515/ Change-Id: I76d1b37b9d9e866fc97f3cc35c1ac01e48b0ab57 Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
Diffstat (limited to 'dhcp/dhcp-impl/src/test/resources')
-rw-r--r--dhcp/dhcp-impl/src/test/resources/relay/ipv4DhcpRelay.json13
-rw-r--r--dhcp/dhcp-impl/src/test/resources/relay/ipv6DhcpRelay.json13
-rw-r--r--dhcp/dhcp-impl/src/test/resources/relay/ipv6DhcpRelayAfter.json17
-rw-r--r--dhcp/dhcp-impl/src/test/resources/relay/ipv6DhcpRelayBefore.json21
4 files changed, 49 insertions, 15 deletions
diff --git a/dhcp/dhcp-impl/src/test/resources/relay/ipv4DhcpRelay.json b/dhcp/dhcp-impl/src/test/resources/relay/ipv4DhcpRelay.json
index 27550e45f..2c7dda289 100644
--- a/dhcp/dhcp-impl/src/test/resources/relay/ipv4DhcpRelay.json
+++ b/dhcp/dhcp-impl/src/test/resources/relay/ipv4DhcpRelay.json
@@ -4,8 +4,17 @@
{
"address-type": "ipv4",
"rx-vrf-id": 0,
- "server-address": "1.2.3.4",
- "gateway-address": "5.6.7.8"
+ "gateway-address": "5.6.7.8",
+ "server" : [
+ {
+ "vrf-id": 0,
+ "address": "1.2.3.4"
+ },
+ {
+ "vrf-id": 0,
+ "address": "1.2.3.5"
+ }
+ ]
}
]
}
diff --git a/dhcp/dhcp-impl/src/test/resources/relay/ipv6DhcpRelay.json b/dhcp/dhcp-impl/src/test/resources/relay/ipv6DhcpRelay.json
deleted file mode 100644
index ca7e51ace..000000000
--- a/dhcp/dhcp-impl/src/test/resources/relay/ipv6DhcpRelay.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
- "relays": {
- "relay": [
- {
- "address-type": "ipv6",
- "rx-vrf-id": 1,
- "server-address": "2001::1",
- "server-vrf-id": 2,
- "gateway-address": "2001::2"
- }
- ]
- }
-}
diff --git a/dhcp/dhcp-impl/src/test/resources/relay/ipv6DhcpRelayAfter.json b/dhcp/dhcp-impl/src/test/resources/relay/ipv6DhcpRelayAfter.json
new file mode 100644
index 000000000..7c2518b54
--- /dev/null
+++ b/dhcp/dhcp-impl/src/test/resources/relay/ipv6DhcpRelayAfter.json
@@ -0,0 +1,17 @@
+{
+ "relays": {
+ "relay": [
+ {
+ "address-type": "ipv6",
+ "rx-vrf-id": 1,
+ "gateway-address": "2001::2",
+ "server" : [
+ {
+ "vrf-id": 2,
+ "address": "2001::10"
+ }
+ ]
+ }
+ ]
+ }
+}
diff --git a/dhcp/dhcp-impl/src/test/resources/relay/ipv6DhcpRelayBefore.json b/dhcp/dhcp-impl/src/test/resources/relay/ipv6DhcpRelayBefore.json
new file mode 100644
index 000000000..94f7c6558
--- /dev/null
+++ b/dhcp/dhcp-impl/src/test/resources/relay/ipv6DhcpRelayBefore.json
@@ -0,0 +1,21 @@
+{
+ "relays": {
+ "relay": [
+ {
+ "address-type": "ipv6",
+ "rx-vrf-id": 1,
+ "gateway-address": "2001::2",
+ "server" : [
+ {
+ "vrf-id": 2,
+ "address": "2001::1"
+ },
+ {
+ "vrf-id": 2,
+ "address": "2001::10"
+ }
+ ]
+ }
+ ]
+ }
+}