Commit 44792ac4 authored by Francis Dupont's avatar Francis Dupont

[5241] Changed "persistent" into "always-send"

parent 4650a922
...@@ -127,12 +127,12 @@ ...@@ -127,12 +127,12 @@
"data": "0xf0" "data": "0xf0"
}, },
// At a few exceptions options are added to response only when // At a few exceptions options are added to response only when
// the client requests them. The persistent flag should be used // the client requests them. The always-send flag should be used
// to enforce a particular option. // to enforce a particular option.
{ {
"name": "vendor-class-identifier", "name": "vendor-class-identifier",
"data": "isc", "data": "isc",
"persistent": true "always-send": true
} }
], ],
......
...@@ -114,12 +114,12 @@ ...@@ -114,12 +114,12 @@
}, },
// At a few exceptions options are added to response only when // At a few exceptions options are added to response only when
// the client requests them. The persistent flag should be used // the client requests them. The always-send flag should be used
// to enforce a particular option. // to enforce a particular option.
{ {
"name": "pana-agent", "name": "pana-agent",
"data": "2001:db8:2::123", "data": "2001:db8:2::123",
"persistent": true "always-send": true
} }
], ],
"pools": [ "pools": [
......
...@@ -994,14 +994,14 @@ temporarily override a list of interface names and listen on all interfaces. ...@@ -994,14 +994,14 @@ temporarily override a list of interface names and listen on all interfaces.
</screen> </screen>
Defined options are added to response when the client requests them Defined options are added to response when the client requests them
at a few exceptions which are always added. To enforce the addition at a few exceptions which are always added. To enforce the addition
of a particular option set the persistent flag to true as in: of a particular option set the always-send flag to true as in:
<screen> <screen>
"Dhcp4": { "Dhcp4": {
"option-data": [ "option-data": [
{ {
<userinput>"name": "domain-name-servers", <userinput>"name": "domain-name-servers",
"data": "192.0.2.1, 192.0.2.2", "data": "192.0.2.1, 192.0.2.2",
"persistent": true</userinput> "always-send": true</userinput>
}, },
... ...
] ]
......
...@@ -1022,14 +1022,14 @@ temporarily override a list of interface names and listen on all interfaces. ...@@ -1022,14 +1022,14 @@ temporarily override a list of interface names and listen on all interfaces.
</screen> </screen>
Defined options are added to response when the client requests them Defined options are added to response when the client requests them
at a few exceptions which are always added. To enforce the addition at a few exceptions which are always added. To enforce the addition
of a particular option set the persistent flag to true as in: of a particular option set the always-send flag to true as in:
<screen> <screen>
"Dhcp6": { "Dhcp6": {
"option-data": [ "option-data": [
{ {
<userinput>"name": "dns-servers", <userinput>"name": "dns-servers",
"data": "2001:db8::cafe, 2001:db8::babe", "data": "2001:db8::cafe, 2001:db8::babe",
"persistent": true</userinput> "always-send": true</userinput>
}, },
... ...
] ]
......
...@@ -496,12 +496,12 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence} ...@@ -496,12 +496,12 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
} }
} }
\"persistent\" { \"always-send\" {
switch(driver.ctx_) { switch(driver.ctx_) {
case isc::dhcp::Parser4Context::OPTION_DATA: case isc::dhcp::Parser4Context::OPTION_DATA:
return isc::dhcp::Dhcp4Parser::make_PERSISTENT(driver.loc_); return isc::dhcp::Dhcp4Parser::make_ALWAYS_SEND(driver.loc_);
default: default:
return isc::dhcp::Dhcp4Parser::make_STRING("persistent", driver.loc_); return isc::dhcp::Dhcp4Parser::make_STRING("always-send", driver.loc_);
} }
} }
......
...@@ -96,7 +96,7 @@ using namespace std; ...@@ -96,7 +96,7 @@ using namespace std;
CODE "code" CODE "code"
SPACE "space" SPACE "space"
CSV_FORMAT "csv-format" CSV_FORMAT "csv-format"
PERSISTENT "persistent" ALWAYS_SEND "always-send"
RECORD_TYPES "record-types" RECORD_TYPES "record-types"
ENCAPSULATE "encapsulate" ENCAPSULATE "encapsulate"
ARRAY "array" ARRAY "array"
...@@ -1132,7 +1132,7 @@ option_data_param: option_data_name ...@@ -1132,7 +1132,7 @@ option_data_param: option_data_name
| option_data_code | option_data_code
| option_data_space | option_data_space
| option_data_csv_format | option_data_csv_format
| option_data_persistent | option_data_always_send
| unknown_map_entry | unknown_map_entry
; ;
...@@ -1155,9 +1155,9 @@ option_data_csv_format: CSV_FORMAT COLON BOOLEAN { ...@@ -1155,9 +1155,9 @@ option_data_csv_format: CSV_FORMAT COLON BOOLEAN {
ctx.stack_.back()->set("csv-format", space); ctx.stack_.back()->set("csv-format", space);
}; };
option_data_persistent: PERSISTENT COLON BOOLEAN { option_data_always_send: ALWAYS_SEND COLON BOOLEAN {
ElementPtr persist(new BoolElement($3, ctx.loc2pos(@3))); ElementPtr persist(new BoolElement($3, ctx.loc2pos(@3)));
ctx.stack_.back()->set("persistent", persist); ctx.stack_.back()->set("always-send", persist);
}; };
// ---- pools ------------------------------------ // ---- pools ------------------------------------
......
...@@ -46,7 +46,7 @@ const SimpleDefaults SimpleParser4::OPTION4_DEF_DEFAULTS = { ...@@ -46,7 +46,7 @@ const SimpleDefaults SimpleParser4::OPTION4_DEF_DEFAULTS = {
const SimpleDefaults SimpleParser4::OPTION4_DEFAULTS = { const SimpleDefaults SimpleParser4::OPTION4_DEFAULTS = {
{ "space", Element::string, "dhcp4"}, { "space", Element::string, "dhcp4"},
{ "csv-format", Element::boolean, "true"}, { "csv-format", Element::boolean, "true"},
{ "persistent", Element::boolean, "false"} { "always-send", Element::boolean, "false"}
}; };
/// @brief This table defines default global values for DHCPv4 /// @brief This table defines default global values for DHCPv4
......
...@@ -1471,7 +1471,7 @@ TEST_F(Dhcpv4SrvTest, vendorPersistentOptions) { ...@@ -1471,7 +1471,7 @@ TEST_F(Dhcpv4SrvTest, vendorPersistentOptions) {
" \"code\": 2," " \"code\": 2,"
" \"data\": \"192.0.2.1, 192.0.2.2\"," " \"data\": \"192.0.2.1, 192.0.2.2\","
" \"csv-format\": true," " \"csv-format\": true,"
" \"persistent\": true" " \"always-send\": true"
" }]," " }],"
"\"subnet4\": [ { " "\"subnet4\": [ { "
" \"pools\": [ { \"pool\": \"192.0.2.0/25\" } ]," " \"pools\": [ { \"pool\": \"192.0.2.0/25\" } ],"
...@@ -2058,13 +2058,13 @@ TEST_F(Dhcpv4SrvTest, classGlobalPersistency) { ...@@ -2058,13 +2058,13 @@ TEST_F(Dhcpv4SrvTest, classGlobalPersistency) {
"\"option-data\": [" "\"option-data\": ["
" { \"name\": \"ip-forwarding\", " " { \"name\": \"ip-forwarding\", "
" \"data\": \"false\", " " \"data\": \"false\", "
" \"persistent\": true } ], " " \"always-send\": true } ], "
"\"client-classes\": [ " "\"client-classes\": [ "
"{ \"name\": \"router\"," "{ \"name\": \"router\","
" \"option-data\": [" " \"option-data\": ["
" { \"name\": \"ip-forwarding\", " " { \"name\": \"ip-forwarding\", "
" \"data\": \"true\", " " \"data\": \"true\", "
" \"persistent\": false } ], " " \"always-send\": false } ], "
" \"test\": \"option[12].text == 'foo'\" } ] }"; " \"test\": \"option[12].text == 'foo'\" } ] }";
ConstElementPtr json; ConstElementPtr json;
......
...@@ -3264,7 +3264,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3264,7 +3264,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": false,\n" " \"csv-format\": false,\n"
" \"data\": \"ABCDEF0105\",\n" " \"data\": \"ABCDEF0105\",\n"
" \"name\": \"dhcp-message\",\n" " \"name\": \"dhcp-message\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"dhcp4\"\n" " \"space\": \"dhcp4\"\n"
" },\n" " },\n"
" {\n" " {\n"
...@@ -3272,7 +3272,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3272,7 +3272,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": false,\n" " \"csv-format\": false,\n"
" \"data\": \"01\",\n" " \"data\": \"01\",\n"
" \"name\": \"default-ip-ttl\",\n" " \"name\": \"default-ip-ttl\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"dhcp4\"\n" " \"space\": \"dhcp4\"\n"
" }\n" " }\n"
" ],\n" " ],\n"
...@@ -3360,7 +3360,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3360,7 +3360,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": false,\n" " \"csv-format\": false,\n"
" \"data\": \"ABCDEF0105\",\n" " \"data\": \"ABCDEF0105\",\n"
" \"name\": \"dhcp-message\",\n" " \"name\": \"dhcp-message\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"dhcp4\"\n" " \"space\": \"dhcp4\"\n"
" },\n" " },\n"
" {\n" " {\n"
...@@ -3368,7 +3368,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3368,7 +3368,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": false,\n" " \"csv-format\": false,\n"
" \"data\": \"01\",\n" " \"data\": \"01\",\n"
" \"name\": \"default-ip-ttl\",\n" " \"name\": \"default-ip-ttl\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"dhcp4\"\n" " \"space\": \"dhcp4\"\n"
" }\n" " }\n"
" ],\n" " ],\n"
...@@ -3434,7 +3434,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3434,7 +3434,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": false,\n" " \"csv-format\": false,\n"
" \"data\": \"ABCDEF0105\",\n" " \"data\": \"ABCDEF0105\",\n"
" \"name\": \"dhcp-message\",\n" " \"name\": \"dhcp-message\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"dhcp4\"\n" " \"space\": \"dhcp4\"\n"
" },\n" " },\n"
" {\n" " {\n"
...@@ -3442,7 +3442,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3442,7 +3442,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": true,\n" " \"csv-format\": true,\n"
" \"data\": \"1234\",\n" " \"data\": \"1234\",\n"
" \"name\": \"foo\",\n" " \"name\": \"foo\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"isc\"\n" " \"space\": \"isc\"\n"
" }\n" " }\n"
" ],\n" " ],\n"
...@@ -3529,7 +3529,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3529,7 +3529,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": true,\n" " \"csv-format\": true,\n"
" \"data\": \"1234\",\n" " \"data\": \"1234\",\n"
" \"name\": \"foo\",\n" " \"name\": \"foo\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"isc\"\n" " \"space\": \"isc\"\n"
" },\n" " },\n"
" {\n" " {\n"
...@@ -3537,7 +3537,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3537,7 +3537,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": true,\n" " \"csv-format\": true,\n"
" \"data\": \"192.168.2.1\",\n" " \"data\": \"192.168.2.1\",\n"
" \"name\": \"foo2\",\n" " \"name\": \"foo2\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"isc\"\n" " \"space\": \"isc\"\n"
" }\n" " }\n"
" ],\n" " ],\n"
...@@ -3607,7 +3607,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3607,7 +3607,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": true,\n" " \"csv-format\": true,\n"
" \"data\": \"11\",\n" " \"data\": \"11\",\n"
" \"name\": \"base-option\",\n" " \"name\": \"base-option\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"dhcp4\"\n" " \"space\": \"dhcp4\"\n"
" },\n" " },\n"
" {\n" " {\n"
...@@ -3615,7 +3615,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3615,7 +3615,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": true,\n" " \"csv-format\": true,\n"
" \"data\": \"1234\",\n" " \"data\": \"1234\",\n"
" \"name\": \"foo\",\n" " \"name\": \"foo\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"isc\"\n" " \"space\": \"isc\"\n"
" },\n" " },\n"
" {\n" " {\n"
...@@ -3623,7 +3623,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3623,7 +3623,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": true,\n" " \"csv-format\": true,\n"
" \"data\": \"192.168.2.1\",\n" " \"data\": \"192.168.2.1\",\n"
" \"name\": \"foo2\",\n" " \"name\": \"foo2\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"isc\"\n" " \"space\": \"isc\"\n"
" }\n" " }\n"
" ],\n" " ],\n"
...@@ -3728,7 +3728,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3728,7 +3728,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": false,\n" " \"csv-format\": false,\n"
" \"data\": \"AB\",\n" " \"data\": \"AB\",\n"
" \"name\": \"dhcp-message\",\n" " \"name\": \"dhcp-message\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"dhcp4\"\n" " \"space\": \"dhcp4\"\n"
" }\n" " }\n"
" ],\n" " ],\n"
...@@ -3748,7 +3748,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3748,7 +3748,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": false,\n" " \"csv-format\": false,\n"
" \"data\": \"ABCDEF0105\",\n" " \"data\": \"ABCDEF0105\",\n"
" \"name\": \"dhcp-message\",\n" " \"name\": \"dhcp-message\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"dhcp4\"\n" " \"space\": \"dhcp4\"\n"
" },\n" " },\n"
" {\n" " {\n"
...@@ -3756,7 +3756,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3756,7 +3756,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": false,\n" " \"csv-format\": false,\n"
" \"data\": \"01\",\n" " \"data\": \"01\",\n"
" \"name\": \"default-ip-ttl\",\n" " \"name\": \"default-ip-ttl\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"dhcp4\"\n" " \"space\": \"dhcp4\"\n"
" }\n" " }\n"
" ],\n" " ],\n"
...@@ -3833,7 +3833,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3833,7 +3833,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": false,\n" " \"csv-format\": false,\n"
" \"data\": \"0102030405060708090A\",\n" " \"data\": \"0102030405060708090A\",\n"
" \"name\": \"dhcp-message\",\n" " \"name\": \"dhcp-message\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"dhcp4\"\n" " \"space\": \"dhcp4\"\n"
" }\n" " }\n"
" ],\n" " ],\n"
...@@ -3867,7 +3867,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3867,7 +3867,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": false,\n" " \"csv-format\": false,\n"
" \"data\": \"FF\",\n" " \"data\": \"FF\",\n"
" \"name\": \"default-ip-ttl\",\n" " \"name\": \"default-ip-ttl\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"dhcp4\"\n" " \"space\": \"dhcp4\"\n"
" }\n" " }\n"
" ],\n" " ],\n"
...@@ -3947,7 +3947,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3947,7 +3947,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": false,\n" " \"csv-format\": false,\n"
" \"data\": \"ABCDEF0105\",\n" " \"data\": \"ABCDEF0105\",\n"
" \"name\": \"dhcp-message\",\n" " \"name\": \"dhcp-message\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"dhcp4\"\n" " \"space\": \"dhcp4\"\n"
" },\n" " },\n"
" {\n" " {\n"
...@@ -3955,7 +3955,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -3955,7 +3955,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": false,\n" " \"csv-format\": false,\n"
" \"data\": \"01\",\n" " \"data\": \"01\",\n"
" \"name\": \"default-ip-ttl\",\n" " \"name\": \"default-ip-ttl\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"dhcp4\"\n" " \"space\": \"dhcp4\"\n"
" }\n" " }\n"
" ],\n" " ],\n"
...@@ -4032,7 +4032,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4032,7 +4032,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": false,\n" " \"csv-format\": false,\n"
" \"data\": \"ABCDEF0105\",\n" " \"data\": \"ABCDEF0105\",\n"
" \"name\": \"dhcp-message\",\n" " \"name\": \"dhcp-message\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"dhcp4\"\n" " \"space\": \"dhcp4\"\n"
" }\n" " }\n"
" ],\n" " ],\n"
...@@ -4045,7 +4045,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4045,7 +4045,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": false,\n" " \"csv-format\": false,\n"
" \"data\": \"01\",\n" " \"data\": \"01\",\n"
" \"name\": \"default-ip-ttl\",\n" " \"name\": \"default-ip-ttl\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"dhcp4\"\n" " \"space\": \"dhcp4\"\n"
" }\n" " }\n"
" ],\n" " ],\n"
...@@ -4108,7 +4108,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4108,7 +4108,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": true,\n" " \"csv-format\": true,\n"
" \"data\": \"1234\",\n" " \"data\": \"1234\",\n"
" \"name\": \"foo\",\n" " \"name\": \"foo\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"vendor-encapsulated-options-space\"\n" " \"space\": \"vendor-encapsulated-options-space\"\n"
" },\n" " },\n"
" {\n" " {\n"
...@@ -4116,7 +4116,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4116,7 +4116,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": true,\n" " \"csv-format\": true,\n"
" \"data\": \"192.168.2.1\",\n" " \"data\": \"192.168.2.1\",\n"
" \"name\": \"foo2\",\n" " \"name\": \"foo2\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"vendor-encapsulated-options-space\"\n" " \"space\": \"vendor-encapsulated-options-space\"\n"
" }\n" " }\n"
" ],\n" " ],\n"
...@@ -4186,7 +4186,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4186,7 +4186,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": false,\n" " \"csv-format\": false,\n"
" \"data\": \"0104000004D20204C0A80201\",\n" " \"data\": \"0104000004D20204C0A80201\",\n"
" \"name\": \"vendor-encapsulated-options\",\n" " \"name\": \"vendor-encapsulated-options\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"dhcp4\"\n" " \"space\": \"dhcp4\"\n"
" },\n" " },\n"
" {\n" " {\n"
...@@ -4194,7 +4194,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4194,7 +4194,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": true,\n" " \"csv-format\": true,\n"
" \"data\": \"1234\",\n" " \"data\": \"1234\",\n"
" \"name\": \"foo\",\n" " \"name\": \"foo\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"vendor-encapsulated-options-space\"\n" " \"space\": \"vendor-encapsulated-options-space\"\n"
" },\n" " },\n"
" {\n" " {\n"
...@@ -4202,7 +4202,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4202,7 +4202,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": true,\n" " \"csv-format\": true,\n"
" \"data\": \"192.168.2.1\",\n" " \"data\": \"192.168.2.1\",\n"
" \"name\": \"foo2\",\n" " \"name\": \"foo2\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"vendor-encapsulated-options-space\"\n" " \"space\": \"vendor-encapsulated-options-space\"\n"
" }\n" " }\n"
" ],\n" " ],\n"
...@@ -4297,14 +4297,14 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4297,14 +4297,14 @@ const char* UNPARSED_CONFIGS[] = {
" \"code\": 100,\n" " \"code\": 100,\n"
" \"csv-format\": false,\n" " \"csv-format\": false,\n"
" \"data\": \"1234\",\n" " \"data\": \"1234\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"vendor-1234\"\n" " \"space\": \"vendor-1234\"\n"
" },\n" " },\n"
" {\n" " {\n"
" \"code\": 100,\n" " \"code\": 100,\n"
" \"csv-format\": false,\n" " \"csv-format\": false,\n"
" \"data\": \"ABCDEF0105\",\n" " \"data\": \"ABCDEF0105\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"vendor-4491\"\n" " \"space\": \"vendor-4491\"\n"
" }\n" " }\n"
" ],\n" " ],\n"
...@@ -4381,7 +4381,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4381,7 +4381,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": true,\n" " \"csv-format\": true,\n"
" \"data\": \"this is a string vendor-opt\",\n" " \"data\": \"this is a string vendor-opt\",\n"
" \"name\": \"foo\",\n" " \"name\": \"foo\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"vendor-4491\"\n" " \"space\": \"vendor-4491\"\n"
" }\n" " }\n"
" ],\n" " ],\n"
...@@ -4745,7 +4745,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4745,7 +4745,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": true,\n" " \"csv-format\": true,\n"
" \"data\": \"192.0.3.95\",\n" " \"data\": \"192.0.3.95\",\n"
" \"name\": \"name-servers\",\n" " \"name\": \"name-servers\",\n"
" \"persistent\": false,\n" " \"always-send\": false,\n"
" \"space\": \"dhcp4\"\n" " \"space\": \"dhcp4\"\n"
" },\n" " },\n"
" {\n" " {\n"
...@@ -4753,7 +4753,7 @@ const char* UNPARSED_CONFIGS[] = { ...@@ -4753,7 +4753,7 @@ const char* UNPARSED_CONFIGS[] = {
" \"csv-format\": true,\n" " \"csv-format\": true,\n"
" \"data\": \"11\",\n" " \"data\": \"11\",\n"
" \"name\": \"default-ip-ttl\",\n" </