Parcourir la source

[5381] Shared network examples now contain subnet selectors.

Marcin Siodelski il y a 7 ans
Parent
commit
87c1e39346
2 fichiers modifiés avec 31 ajouts et 2 suppressions
  1. 11 1
      doc/guide/dhcp4-srv.xml
  2. 20 1
      doc/guide/dhcp6-srv.xml

+ 11 - 1
doc/guide/dhcp4-srv.xml

@@ -3516,6 +3516,11 @@ src/lib/dhcpsrv/cfg_host_operations.cc -->
             // and it must be unique among all shared networks.
             // and it must be unique among all shared networks.
             "name": "my-secret-lair-level-1",
             "name": "my-secret-lair-level-1",
 
 
+            // Subnet selector can be specifed on the shared network level.
+            // Subnets from this shared network will be selected for directly
+            // connected clients sending requests to server's "eth0" interface.
+            "interface": "eth0",
+
             // This starts a list of subnets in this shared network.
             // This starts a list of subnets in this shared network.
             // There are two subnets in this example.
             // There are two subnets in this example.
             "subnet4": [
             "subnet4": [
@@ -3538,7 +3543,8 @@ src/lib/dhcpsrv/cfg_host_operations.cc -->
     "subnet4": [
     "subnet4": [
         {
         {
             "subnet": "192.0.3.0/24",
             "subnet": "192.0.3.0/24",
-            "pools": [ { "pool":  "192.0.3.1 - 192.0.3.200" } ]
+            "pools": [ { "pool":  "192.0.3.1 - 192.0.3.200" } ],
+            "interface": "eth1"
         }
         }
     ]
     ]
 
 
@@ -3569,6 +3575,8 @@ src/lib/dhcpsrv/cfg_host_operations.cc -->
     {
     {
         "name": "lab-network3",
         "name": "lab-network3",
 
 
+        "interface": "eth0",
+
         // This applies to all subnets in this shared network, unless
         // This applies to all subnets in this shared network, unless
         // values are overridden on subnet scope.
         // values are overridden on subnet scope.
         <userinput>"valid-lifetime": 600</userinput>,
         <userinput>"valid-lifetime": 600</userinput>,
@@ -3728,6 +3736,7 @@ based on option 93 values.
     "shared-networks": [
     "shared-networks": [
         {
         {
             "name": "galah",
             "name": "galah",
+            "interface": "eth0",
             "subnet4": [
             "subnet4": [
                 {
                 {
                     "subnet": "192.0.2.0/26",
                     "subnet": "192.0.2.0/26",
@@ -3765,6 +3774,7 @@ desired outcome if one desires to service only clients of known properties
     "shared-networks": [
     "shared-networks": [
     {
     {
         "name": "frog",
         "name": "frog",
+        "interface": "eth0",
         "subnet4": [
         "subnet4": [
             {
             {
                 "subnet": "192.0.2.0/26",
                 "subnet": "192.0.2.0/26",

+ 20 - 1
doc/guide/dhcp6-srv.xml

@@ -3074,6 +3074,13 @@ If not specified, the default value is:
             // and it must be unique among all shared networks.
             // and it must be unique among all shared networks.
             "name": "ipv6-lab-1",
             "name": "ipv6-lab-1",
 
 
+            // Subnet selector can be specifed on the shared network level.
+            // Subnets from this shared network will be selected for clients
+            // communicating via relay agent having the specified IP address.
+            "relay": {
+                "ip-address": "2001:db8:2:34::1"
+            },
+
             // This starts a list of subnets in this shared network.
             // This starts a list of subnets in this shared network.
             // There are two subnets in this example.
             // There are two subnets in this example.
             "subnet6": [
             "subnet6": [
@@ -3096,7 +3103,10 @@ If not specified, the default value is:
     "subnet6": [
     "subnet6": [
         {
         {
             "subnet": "2001:db9::/48",
             "subnet": "2001:db9::/48",
-            "pools": [ { "pool":  "2001:db9::/64" } ]
+            "pools": [ { "pool":  "2001:db9::/64" } ],
+            "relay": {
+                "ip-address": "2001:db8:1:2::1"
+            }
         }
         }
     ]
     ]
 
 
@@ -3126,6 +3136,9 @@ If not specified, the default value is:
 "shared-networks": [
 "shared-networks": [
     {
     {
         "name": "lab-network3",
         "name": "lab-network3",
+        "relay": {
+             "ip-address": "2001:db8:2:34::1"
+        },
 
 
         // This applies to all subnets in this shared network, unless
         // This applies to all subnets in this shared network, unless
         // values are overridden on subnet scope.
         // values are overridden on subnet scope.
@@ -3288,6 +3301,9 @@ based on option 1234 values.
     "shared-networks": [
     "shared-networks": [
         {
         {
             "name": "galah",
             "name": "galah",
+            "relay": {
+                "ip-address": "2001:db8:2:34::1"
+            },
             "subnet6": [
             "subnet6": [
                 {
                 {
                     "subnet": "2001:db8:1::/64",
                     "subnet": "2001:db8:1::/64",
@@ -3325,6 +3341,9 @@ desired outcome if one desires to service only clients of known properties
     "shared-networks": [
     "shared-networks": [
     {
     {
         "name": "frog",
         "name": "frog",
+        "relay": {
+            "ip-address": "2001:db8:2:34::1"
+        },
         "subnet6": [
         "subnet6": [
             {
             {
                 "subnet": "2001:db8:1::/64",
                 "subnet": "2001:db8:1::/64",