Skip to content

Commit

Permalink
Updates for v3.1.0
Browse files Browse the repository at this point in the history 
Update documentation to show examples in XML, JSON, and YAML.
Update sample configuration files for XML, JSON, and YAML.
Update POM to version 3.1.0
  • Loading branch information
agrabil committed Mar 30, 2021
1 parent 7152073 commit b2c452b
Show file tree
Hide file tree
Showing 9 changed files with 2,807 additions and 602 deletions.
6 changes: 6 additions & 0 deletions Jagornet-DHCP/dhcp-server/config/dhcpserver-basic.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@
},
"v4RoutersOption" : {
"ipAddressList" : [ "10.0.0.1" ]
},
"v4DomainServersOption" : {
"ipAddressList" : [ "1.1.1.1", "8.8.8.8" ]
},
"v4DomainNameOption" : {
"domainName" : "foo.com."
}
},
"v4AddrPools" : {
Expand Down
7 changes: 7 additions & 0 deletions Jagornet-DHCP/dhcp-server/config/dhcpserver-basic.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@
<v4RoutersOption>
<ipAddressList>10.0.0.1</ipAddressList>
</v4RoutersOption>
<v4DomainServersOption>
<ipAddressList>1.1.1.1</ipAddressList>
<ipAddressList>8.8.8.8</ipAddressList>
</v4DomainServersOption>
<v4DomainNameOption>
<domainName>foo.com.</domainName>
</v4DomainNameOption>
</v4ConfigOptions>
<v4AddrPools>
<poolList>
Expand Down
6 changes: 6 additions & 0 deletions Jagornet-DHCP/dhcp-server/config/dhcpserver-basic.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ links:
v4RoutersOption:
ipAddressList:
- "10.0.0.1"
v4DomainServersOption:
ipAddressList:
- "1.1.1.1"
- "8.8.8.8"
v4DomainNameOption:
domainName: "foo.com."
v4AddrPools:
poolList:
- range: "10.0.0.100-10.0.0.199"
Expand Down
74 changes: 69 additions & 5 deletions Jagornet-DHCP/dhcp-server/config/dhcpserver-sample.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"asciiValue" : "MyUserClass"
} ]
},
"operator" : "equals"
"operator" : "EQUALS"
}
} ]
},
Expand All @@ -70,14 +70,14 @@
"asciiValue" : "VendorXYZ"
} ]
},
"operator" : "equals"
"operator" : "EQUALS"
}
} ]
},
"v6MsgConfigOptions" : {
"v6VendorInfoOption" : {
"enterpriseNumber" : 12345,
"suboptionList" : {
"subOptions" : {
"optionDefList" : [ {
"stringOption" : {
"string" : "hello"
Expand All @@ -93,7 +93,44 @@
}
}
}, {
"name" : "DHCPv4 VendorClass Filter",
"name" : "DHCPv4 VendorClass Filter 1",
"filterExpressions" : {
"filterExpressionList" : [ {
"clientClassExpression" : {
"v4VendorClassOption" : {
"opaqueData" : {
"asciiValue" : "VendorXYZ"
}
},
"operator" : "EQUALS"
}
} ]
},
"v4ConfigOptions" : {
"v4VendorSpecificOption" : {
"opaqueData" : {
"subOptions" : {
"optionDefList" : [ {
"stringOption" : {
"string" : "VendorSpecial"
},
"v4" : true,
"code" : 1,
"name" : "VendorXYZSubopt1"
}, {
"ipAddressOption" : {
"ipAddress" : "10.11.12.13"
},
"v4" : true,
"code" : 2,
"name" : "VendorXYZSubopt2"
} ]
}
}
}
}
}, {
"name" : "DHCPv4 VendorClass Filter 2",
"filterExpressions" : {
"filterExpressionList" : [ {
"clientClassExpression" : {
Expand All @@ -102,7 +139,7 @@
"asciiValue" : "MyVendorPrefix"
}
},
"operator" : "startsWith"
"operator" : "STARTS_WITH"
}
} ]
},
Expand Down Expand Up @@ -131,6 +168,12 @@
},
"v4RoutersOption" : {
"ipAddressList" : [ "10.0.0.1" ]
},
"v4DomainServersOption" : {
"ipAddressList" : [ "1.1.1.1", "8.8.8.8" ]
},
"v4DomainNameOption" : {
"domainName" : "foo.com."
}
},
"v4AddrPools" : {
Expand All @@ -145,6 +188,16 @@
"configOptions" : {
"v4RoutersOption" : {
"ipAddressList" : [ "10.0.0.11" ]
},
"v4OtherOptions" : {
"optionDefList" : [ {
"stringOption" : {
"string" : "AnyOtherV4Option-Value"
},
"v4" : true,
"code" : 194,
"name" : "AnyOtherV4Option"
} ]
}
}
} ]
Expand Down Expand Up @@ -176,6 +229,17 @@
"ipAddress" : "2001:db8:1::100",
"duid" : {
"hexValue" : "0A1B2C3D4E5F"
},
"msgConfigOptions" : {
"v6OtherOptions" : {
"optionDefList" : [ {
"stringOption" : {
"string" : "AnyOtherV6Option-Value"
},
"code" : 196,
"name" : "AnyOtherV6Option"
} ]
}
}
} ]
},
Expand Down
62 changes: 59 additions & 3 deletions Jagornet-DHCP/dhcp-server/config/dhcpserver-sample.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
<v6MsgConfigOptions>
<v6VendorInfoOption>
<enterpriseNumber>12345</enterpriseNumber>
<suboptionList>
<subOptions>
<optionDefList code="1">
<stringOption>
<string>hello</string>
Expand All @@ -113,13 +113,46 @@
<ipAddress>2001:db8::1</ipAddress>
</ipAddressOption>
</optionDefList>
</suboptionList>
</subOptions>
</v6VendorInfoOption>
</v6MsgConfigOptions>
</filterList>

<filterList>
<name>DHCPv4 VendorClass Filter</name>
<name>DHCPv4 VendorClass Filter 1</name>
<filterExpressions>
<filterExpressionList>
<clientClassExpression operator="equals">
<v4VendorClassOption>
<opaqueData>
<asciiValue>VendorXYZ</asciiValue>
</opaqueData>
</v4VendorClassOption>
</clientClassExpression>
</filterExpressionList>
</filterExpressions>
<v4ConfigOptions>
<v4VendorSpecificOption>
<opaqueData>
<subOptions>
<optionDefList v4="true" code="1" name="VendorXYZSubopt1">
<stringOption>
<string>VendorSpecial</string>
</stringOption>
</optionDefList>
<optionDefList v4="true" code="2" name="VendorXYZSubopt2">
<ipAddressOption>
<ipAddress>10.11.12.13</ipAddress>
</ipAddressOption>
</optionDefList>
</subOptions>
</opaqueData>
</v4VendorSpecificOption>
</v4ConfigOptions>
</filterList>

<filterList>
<name>DHCPv4 VendorClass Filter 2</name>
<filterExpressions>
<filterExpressionList>
<clientClassExpression operator="startsWith">
Expand Down Expand Up @@ -163,6 +196,13 @@
<v4RoutersOption>
<ipAddressList>10.0.0.1</ipAddressList>
</v4RoutersOption>
<v4DomainServersOption>
<ipAddressList>1.1.1.1</ipAddressList>
<ipAddressList>8.8.8.8</ipAddressList>
</v4DomainServersOption>
<v4DomainNameOption>
<domainName>foo.com.</domainName>
</v4DomainNameOption>
</v4ConfigOptions>
<v4AddrPools>
<poolList>
Expand All @@ -178,6 +218,13 @@
<v4RoutersOption>
<ipAddressList>10.0.0.11</ipAddressList>
</v4RoutersOption>
<v4OtherOptions>
<optionDefList v4="true" code="194" name="AnyOtherV4Option">
<stringOption>
<string>AnyOtherV4Option-Value</string>
</stringOption>
</optionDefList>
</v4OtherOptions>
</configOptions>
</bindingList>
</v4AddrBindings>
Expand Down Expand Up @@ -223,6 +270,15 @@
left undefined, then ANY IA_ID will match.
<iaid>0</iaid>
-->
<msgConfigOptions>
<v6OtherOptions>
<optionDefList code="196" name="AnyOtherV6Option">
<stringOption>
<string>AnyOtherV6Option-Value</string>
</stringOption>
</optionDefList>
</v6OtherOptions>
</msgConfigOptions>
</bindingList>
</v6NaAddrBindings>
<linkFilters>
Expand Down
57 changes: 48 additions & 9 deletions Jagornet-DHCP/dhcp-server/config/dhcpserver-sample.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ filters:
v6UserClassOption:
opaqueDataList:
- asciiValue: "MyUserClass"
operator: "equals"
operator: "EQUALS"
v6MsgConfigOptions:
# Send the "filter.com." domain search list to the matched clients
v6DomainSearchListOption:
Expand All @@ -63,28 +63,51 @@ filters:
enterpriseNumber: 12345
opaqueDataList:
- asciiValue: "VendorXYZ"
operator: "equals"
operator: "EQUALS"
v6MsgConfigOptions:
# Send vendor specific options to the matched clients
v6VendorInfoOption:
enterpriseNumber: 12345
suboptionList:
subOptions:
optionDefList:
- stringOption:
string: "hello"
code: 1
- ipAddressOption:
ipAddress: "2001:db8::1"
code: 2
- name: "DHCPv4 VendorClass Filter"
- name: "DHCPv4 VendorClass Filter 1"
filterExpressions:
# Match clients with v4 vendor class option starting with "MyVendorPrefix"
filterExpressionList:
- clientClassExpression:
v4VendorClassOption:
opaqueData:
asciiValue: "VendorXYZ"
operator: "EQUALS"
v4ConfigOptions:
v4VendorSpecificOption:
opaqueData:
subOptions:
optionDefList:
- stringOption:
string: "VendorSpecial"
v4: true
code: 1
name: "VendorXYZSubopt1"
- ipAddressOption:
ipAddress: "10.11.12.13"
v4: true
code: 2
name: "VendorXYZSubopt2"
- name: "DHCPv4 VendorClass Filter 2"
filterExpressions:
filterExpressionList:
- clientClassExpression:
v4VendorClassOption:
opaqueData:
asciiValue: "MyVendorPrefix"
operator: "startsWith"
operator: "STARTS_WITH"
v4ConfigOptions:
# Send vendor specific data to the matched clients
v4VendorSpecificOption:
Expand All @@ -109,6 +132,12 @@ links:
v4RoutersOption:
ipAddressList:
- "10.0.0.1"
v4DomainServersOption:
ipAddressList:
- "1.1.1.1"
- "8.8.8.8"
v4DomainNameOption:
domainName: "foo.com."
v4AddrPools:
poolList:
- range: "10.0.0.100-10.0.0.199"
Expand All @@ -121,6 +150,13 @@ links:
v4RoutersOption:
ipAddressList:
- "10.0.0.11"
v4OtherOptions:
optionDefList:
- stringOption:
string: "AnyOtherV4Option-Value"
v4: true
code: 194
name: "AnyOtherV4Option"
- name: "Local IPv6 Client Link (Multicast traffic)"
# Local DHCPv6 links are defined by interface name
interface: "eth2"
Expand Down Expand Up @@ -148,10 +184,13 @@ links:
# if the DUID is known, then a binding can be made.
duid:
hexValue: "0A1B2C3D4E5F"
# The IA_ID is almost definitely unpredictable, so
# it is an optional element for a DHCPv6 binding. If
# left undefined, then ANY IA_ID will match.
# iaid: 0
msgConfigOptions:
v6OtherOptions:
optionDefList:
- stringOption:
string: "AnyOtherV6Option-Value"
code: 196
name: "AnyOtherV6Option"
linkFilters:
linkFilterList:
- v6NaAddrPools:
Expand Down
7 changes: 7 additions & 0 deletions Jagornet-DHCP/dhcp-server/docs/release-notes.txt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
Changes in 3.1.0
----------------
- Fix #33: Add support for -rr option for requests per second for
for DHCP Client test tools
- Fix #34: Use Jackson classes for reading/writing JSON/YAML
- Fix #35: Improve Netty inbound/outbound pipeline processing

Changes in 3.0.3
----------------
- Fix #27: Update DHCP client logging config file options for Log4j2
Expand Down
Loading

0 comments on commit b2c452b

Please sign in to comment.