Skip to content

GitLab

Kea
Kea
Commit 4204443a authored by Francis Dupont's avatar Francis Dupont Committed by Tomek Mrugalski
Browse files
Options

[5014_phase2] Use Dhcp6 (vs JSON) parser as much as possible in unit tests

parent 55ad23aa
Hide whitespace changes
Inline Side-by-side
Showing with 368 additions and 129 deletions
src/bin/dhcp6/dhcp6_lexer.ll
View file @ 4204443a
......@@ -284,6 +284,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
\"preferred-lifetime\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::DHCP6:
case isc::dhcp::Parser6Context::SUBNET6:
return isc::dhcp::Dhcp6Parser::make_PREFERRED_LIFETIME(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("preferred-lifetime", driver.loc_);
......@@ -293,6 +294,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
\"valid-lifetime\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::DHCP6:
case isc::dhcp::Parser6Context::SUBNET6:
return isc::dhcp::Dhcp6Parser::make_VALID_LIFETIME(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("valid-lifetime", driver.loc_);
......@@ -302,6 +304,7 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
\"renew-timer\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::DHCP6:
case isc::dhcp::Parser6Context::SUBNET6:
return isc::dhcp::Dhcp6Parser::make_RENEW_TIMER(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("renew-timer", driver.loc_);
......@@ -311,12 +314,22 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
\"rebind-timer\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::DHCP6:
case isc::dhcp::Parser6Context::SUBNET6:
return isc::dhcp::Dhcp6Parser::make_REBIND_TIMER(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("rebind-timer", driver.loc_);
}
}
\"decline-probation-period\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::DHCP6:
return isc::dhcp::Dhcp6Parser::make_DECLINE_PROBATION_PERIOD(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("decline-probation-period", driver.loc_);
}
}
\"subnet6\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::DHCP6:
......@@ -446,6 +459,15 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
}
}
\"interface-id\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::SUBNET6:
return isc::dhcp::Dhcp6Parser::make_INTERFACE_ID(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("interface-id", driver.loc_);
}
}
\"id\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::SUBNET6:
......@@ -455,6 +477,24 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
}
}
\"rapid-commit\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::SUBNET6:
return isc::dhcp::Dhcp6Parser::make_RAPID_COMMIT(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("rapid-commit", driver.loc_);
}
}
\"reservation-mode\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::SUBNET6:
return isc::dhcp::Dhcp6Parser::make_RESERVATION_MODE(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("reservation-mode", driver.loc_);
}
}
\"code\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::OPTION_DEF:
......@@ -645,7 +685,6 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
\"csv-format\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::OPTION_DEF:
case isc::dhcp::Parser6Context::OPTION_DATA:
return isc::dhcp::Dhcp6Parser::make_CSV_FORMAT(driver.loc_);
default:
......@@ -653,6 +692,51 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
}
}
\"record-types\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::OPTION_DEF:
return isc::dhcp::Dhcp6Parser::make_RECORD_TYPES(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("record-types", driver.loc_);
}
}
\"encapsulate\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::OPTION_DEF:
return isc::dhcp::Dhcp6Parser::make_ENCAPSULATE(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("encapsulate", driver.loc_);
}
}
\"array\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::OPTION_DEF:
return isc::dhcp::Dhcp6Parser::make_ARRAY(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("array", driver.loc_);
}
}
\"relay\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::SUBNET6:
return isc::dhcp::Dhcp6Parser::make_RELAY(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("relay", driver.loc_);
}
}
\"ip-address\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::RELAY:
return isc::dhcp::Dhcp6Parser::make_IP_ADDRESS(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("ip-address", driver.loc_);
}
}
\"hooks-libraries\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::DHCP6:
......@@ -734,30 +818,48 @@ ControlCharacterFill [^"\\]|\\{JSONEscapeSequence}
}
}
\"dhcp-ddns\" {
\"version\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::DHCP6:
return isc::dhcp::Dhcp6Parser::make_DHCP_DDNS(driver.loc_);
return isc::dhcp::Dhcp6Parser::make_VERSION(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("dhcp-ddns", driver.loc_);
return isc::dhcp::Dhcp6Parser::make_STRING("version", driver.loc_);
}
}
\"control-socket\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::DHCP6:
return isc::dhcp::Dhcp6Parser::make_CONTROL_SOCKET(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("control-socket", driver.loc_);
}
}
\"enable-updates\" {
\"socket-type\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::DHCP_DDNS:
return isc::dhcp::Dhcp6Parser::make_ENABLE_UPDATES(driver.loc_);
case isc::dhcp::Parser6Context::CONTROL_SOCKET:
return isc::dhcp::Dhcp6Parser::make_SOCKET_TYPE(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("enable-updates", driver.loc_);
return isc::dhcp::Dhcp6Parser::make_STRING("socket-type", driver.loc_);
}
}
\"qualifying-suffix\" {
\"socket-name\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::DHCP_DDNS:
return isc::dhcp::Dhcp6Parser::make_QUALIFYING_SUFFIX(driver.loc_);
case isc::dhcp::Parser6Context::CONTROL_SOCKET:
return isc::dhcp::Dhcp6Parser::make_SOCKET_NAME(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("qualifying-suffix", driver.loc_);
return isc::dhcp::Dhcp6Parser::make_STRING("socket-name", driver.loc_);
}
}
\"dhcp-ddns\" {
switch(driver.ctx_) {
case isc::dhcp::Parser6Context::DHCP6:
return isc::dhcp::Dhcp6Parser::make_DHCP_DDNS(driver.loc_);
default:
return isc::dhcp::Dhcp6Parser::make_STRING("dhcp-ddns", driver.loc_);
}
}
......
src/bin/dhcp6/dhcp6_parser.yy
View file @ 4204443a
......@@ -66,6 +66,7 @@ using namespace std;
VALID_LIFETIME "valid-lifetime"
RENEW_TIMER "renew-timer"
REBIND_TIMER "rebind-timer"
DECLINE_PROBATION_PERIOD "decline-probation-period"
SUBNET6 "subnet6"
OPTION_DEF "option-def"
OPTION_DATA "option-data"
......@@ -74,6 +75,9 @@ using namespace std;
CODE "code"
SPACE "space"
CSV_FORMAT "csv-format"
RECORD_TYPES "record-types"
ENCAPSULATE "encapsulate"
ARRAY "array"
POOLS "pools"
POOL "pool"
......@@ -84,7 +88,10 @@ using namespace std;
SUBNET "subnet"
INTERFACE "interface"
INTERFACE_ID "interface-id"
ID "id"
RAPID_COMMIT "rapid-commit"
RESERVATION_MODE "reservation-mode"
MAC_SOURCES "mac-sources"
RELAY_SUPPLIED_OPTIONS "relay-supplied-options"
......@@ -101,6 +108,9 @@ using namespace std;
HW_ADDRESS "hw-address"
HOSTNAME "hostname"
RELAY "relay"
IP_ADDRESS "ip-address"
HOOKS_LIBRARIES "hooks-libraries"
LIBRARY "library"
......@@ -113,6 +123,13 @@ using namespace std;
ENTERPRISE_ID "enterprise-id"
DHCP4O6_PORT "dhcp4o6-port"
VERSION "version"
CONTROL_SOCKET "control-socket"
SOCKET_TYPE "socket-type"
SOCKET_NAME "socket-name"
DHCP_DDNS "dhcp-ddns"
LOGGING "Logging"
LOGGERS "loggers"
......@@ -121,10 +138,6 @@ using namespace std;
DEBUGLEVEL "debuglevel"
SEVERITY "severity"
DHCP_DDNS "dhcp-ddns"
ENABLE_UPDATES "enable-updates"
QUALIFYING_SUFFIX "qualifying-suffix"
DHCP4 "Dhcp4"
DHCPDDNS "DhcpDdns"
......@@ -150,6 +163,7 @@ using namespace std;
%token <bool> BOOLEAN "boolean"
%type <ElementPtr> value
%type <ElementPtr> version_value
%printer { yyoutput << $$; } <*>;
......@@ -324,6 +338,7 @@ global_param: preferred_lifetime
| valid_lifetime
| renew_timer
| rebind_timer
| decline_probation_period
| subnet6_list
| interfaces_config
| lease_database
......@@ -338,6 +353,8 @@ global_param: preferred_lifetime
| expired_leases_processing
| server_id
| dhcp4o6_port
| version
| control_socket
| dhcp_ddns
| unknown_map_entry
;
......@@ -362,6 +379,11 @@ rebind_timer: REBIND_TIMER COLON INTEGER {
ctx.stack_.back()->set("rebind-timer", prf);
};
decline_probation_period: DECLINE_PROBATION_PERIOD COLON INTEGER {
ElementPtr dpp(new IntElement($3, ctx.loc2pos(@3)));
ctx.stack_.back()->set("decline-probation-period", dpp);
};
interfaces_config: INTERFACES_CONFIG {
ElementPtr i(new MapElement(ctx.loc2pos(@1)));
ctx.stack_.back()->set("interfaces-config", i);
......@@ -669,14 +691,22 @@ subnet6_params: subnet6_param
;
// This defines a list of allowed parameters for each subnet.
subnet6_param: option_data_list
subnet6_param: preferred_lifetime
| valid_lifetime
| renew_timer
| rebind_timer
| option_data_list
| pools_list
| pd_pools_list
| subnet
| interface
| interface_id
| id
| rapid_commit
| client_class
| reservations
| reservation_mode
| relay
| unknown_map_entry
;
......@@ -696,6 +726,14 @@ interface: INTERFACE {
ctx.leave();
};
interface_id: INTERFACE_ID {
ctx.enter(ctx.NO_KEYWORD);
} COLON STRING {
ElementPtr iface(new StringElement($4, ctx.loc2pos(@4)));
ctx.stack_.back()->set("interface-id", iface);
ctx.leave();
};
client_class: CLIENT_CLASS {
ctx.enter(ctx.CLIENT_CLASS);
} COLON STRING {
......@@ -704,11 +742,24 @@ client_class: CLIENT_CLASS {
ctx.leave();
};
reservation_mode: RESERVATION_MODE {
ctx.enter(ctx.NO_KEYWORD);
} COLON STRING {
ElementPtr rm(new StringElement($4, ctx.loc2pos(@4)));
ctx.stack_.back()->set("reservation-mode", rm);
ctx.leave();
};
id: ID COLON INTEGER {
ElementPtr id(new IntElement($3, ctx.loc2pos(@3)));
ctx.stack_.back()->set("id", id);
};
rapid_commit: RAPID_COMMIT COLON BOOLEAN {
ElementPtr rc(new BoolElement($3, ctx.loc2pos(@3)));
ctx.stack_.back()->set("rapid-commit", rc);
};
// ---- option-def --------------------------
// This defines the "option-def": [ ... ] entry that may appear
......@@ -764,12 +815,13 @@ not_empty_option_def_params: option_def_param
option_def_param: option_def_name
| option_def_code
| option_def_type
| option_def_record_types
| option_def_space
| option_def_csv_format
| option_def_encapsulate
| option_def_array
| unknown_map_entry
;
option_def_name: name;
code: CODE COLON INTEGER {
......@@ -781,6 +833,14 @@ option_def_code: code;
option_def_type: type;
option_def_record_types: RECORD_TYPES {
ctx.enter(ctx.NO_KEYWORD);
} COLON STRING {
ElementPtr rtypes(new StringElement($4, ctx.loc2pos(@4)));
ctx.stack_.back()->set("record-types", rtypes);
ctx.leave();
};
space: SPACE {
ctx.enter(ctx.NO_KEYWORD);
} COLON STRING {
......@@ -791,12 +851,18 @@ space: SPACE {
option_def_space: space;
csv_format: CSV_FORMAT COLON BOOLEAN {
ElementPtr space(new BoolElement($3, ctx.loc2pos(@3)));
ctx.stack_.back()->set("csv-format", space);
option_def_encapsulate: ENCAPSULATE {
ctx.enter(ctx.NO_KEYWORD);
} COLON STRING {
ElementPtr encap(new StringElement($4, ctx.loc2pos(@4)));
ctx.stack_.back()->set("encapsulate", encap);
ctx.leave();
};
option_def_csv_format: csv_format;
option_def_array: ARRAY COLON BOOLEAN {
ElementPtr array(new BoolElement($3, ctx.loc2pos(@3)));
ctx.stack_.back()->set("array", array);
};
// ---- option-data --------------------------
......@@ -858,7 +924,6 @@ option_data_param: option_data_name
| unknown_map_entry
;
option_data_name: name;
option_data_data: DATA {
......@@ -873,7 +938,10 @@ option_data_code: code;
option_data_space: space;
option_data_csv_format: csv_format;
option_data_csv_format: CSV_FORMAT COLON BOOLEAN {
ElementPtr space(new BoolElement($3, ctx.loc2pos(@3)));
ctx.stack_.back()->set("csv-format", space);
};
// ---- pools ------------------------------------
......@@ -1111,6 +1179,27 @@ reservation_client_classes: CLIENT_CLASSES {
// --- end of reservations definitions -----------------------
// --- relay -------------------------------------------------
relay: RELAY {
ElementPtr m(new MapElement(ctx.loc2pos(@1)));
ctx.stack_.back()->set("relay", m);
ctx.stack_.push_back(m);
ctx.enter(ctx.RELAY);
} COLON LCURLY_BRACKET relay_map RCURLY_BRACKET {
ctx.stack_.pop_back();
ctx.leave();
};
relay_map: IP_ADDRESS {
ctx.enter(ctx.NO_KEYWORD);
} COLON STRING {
ElementPtr ip(new StringElement($4, ctx.loc2pos(@4)));
ctx.stack_.back()->set("ip-address", ip);
ctx.leave();
};
// --- end of relay definitions ------------------------------
// --- client classes ----------------------------------------
client_classes: CLIENT_CLASSES {
ElementPtr l(new ListElement(ctx.loc2pos(@1)));
......@@ -1158,7 +1247,6 @@ client_class_test: TEST {
ctx.leave();
}
// --- end of client classes ---------------------------------
// --- server-id ---------------------------------------------
......@@ -1215,6 +1303,84 @@ dhcp4o6_port: DHCP4O6_PORT COLON INTEGER {
ctx.stack_.back()->set("dhcp4o6-port", time);
};
// code says it is a string, unit test a number
version: VERSION {
ctx.enter(ctx.NO_KEYWORD);
} COLON version_value {
ctx.stack_.back()->set("version", $4);
ctx.leave();
};
version_value:
INTEGER { $$ = ElementPtr(new IntElement($1, ctx.loc2pos(@1))); }
| FLOAT { $$ = ElementPtr(new DoubleElement($1, ctx.loc2pos(@1))); }
| STRING { $$ = ElementPtr(new StringElement($1, ctx.loc2pos(@1))); }
;
// --- control socket ----------------------------------------
control_socket: CONTROL_SOCKET {
ElementPtr m(new MapElement(ctx.loc2pos(@1)));
ctx.stack_.back()->set("control-socket", m);
ctx.stack_.push_back(m);
ctx.enter(ctx.CONTROL_SOCKET);
} COLON LCURLY_BRACKET control_socket_params RCURLY_BRACKET {
ctx.stack_.pop_back();
ctx.leave();
};
control_socket_params: control_socket_param
| control_socket_params COMMA control_socket_param
;
control_socket_param: socket_type
| socket_name
;
socket_type: SOCKET_TYPE {
ctx.enter(ctx.NO_KEYWORD);
} COLON STRING {
ElementPtr stype(new StringElement($4, ctx.loc2pos(@4)));
ctx.stack_.back()->set("socket-type", stype);
ctx.leave();
};
socket_name: SOCKET_NAME {
ctx.enter(ctx.NO_KEYWORD);
} COLON STRING {
ElementPtr name(new StringElement($4, ctx.loc2pos(@4)));
ctx.stack_.back()->set("socket-name", name);
ctx.leave();
};
// --- dhcp ddns ---------------------------------------------
dhcp_ddns: DHCP_DDNS {
ElementPtr m(new MapElement(ctx.loc2pos(@1)));
ctx.stack_.back()->set("dhcp-ddns", m);
ctx.stack_.push_back(m);
ctx.enter(ctx.NO_KEYWORD);
} COLON LCURLY_BRACKET not_empty_map RCURLY_BRACKET {
ctx.stack_.pop_back();
ctx.leave();
};
// JSON entries for Dhcp4 and DhcpDdns
dhcp4_json_object: DHCP4 {
ctx.enter(ctx.NO_KEYWORD);
} COLON value {
ctx.stack_.back()->set("Dhcp4", $4);
ctx.leave();
};
dhcpddns_json_object: DHCPDDNS {
ctx.enter(ctx.NO_KEYWORD);
} COLON value {
ctx.stack_.back()->set("DhcpDdns", $4);
ctx.leave();
};
// --- logging entry -----------------------------------------
// This defines the top level "Logging" object. It parses
......@@ -1324,52 +1490,6 @@ output_param: OUTPUT {
ctx.leave();
};
dhcp_ddns: DHCP_DDNS {
ElementPtr m(new MapElement(ctx.loc2pos(@1)));
ctx.stack_.back()->set("dhcp-ddns", m);
ctx.stack_.push_back(m);
ctx.enter(ctx.DHCP_DDNS);
} COLON LCURLY_BRACKET dhcp_ddns_params RCURLY_BRACKET {
ctx.stack_.pop_back();
ctx.leave();
};
dhcp_ddns_params: dhcp_ddns_param
| dhcp_ddns_params COMMA dhcp_ddns_param
;
dhcp_ddns_param: enable_updates
| qualifying_suffix
| unknown_map_entry
;
enable_updates: ENABLE_UPDATES COLON BOOLEAN {
ElementPtr b(new BoolElement($3, ctx.loc2pos(@3)));
ctx.stack_.back()->set("enable-updates", b);
};
qualifying_suffix: QUALIFYING_SUFFIX {
ctx.enter(ctx.NO_KEYWORD);
} COLON STRING {
ElementPtr qs(new StringElement($4, ctx.loc2pos(@4)));
ctx.stack_.back()->set("qualifying-suffix", qs);
ctx.leave();
};
dhcp4_json_object: DHCP4 {
ctx.enter(ctx.NO_KEYWORD);
} COLON value {
ctx.stack_.back()->set("Dhcp4", $4);
ctx.leave();
};
dhcpddns_json_object: DHCPDDNS {
ctx.enter(ctx.NO_KEYWORD);
} COLON value {
ctx.stack_.back()->set("DhcpDdns", $4);
ctx.leave();
};
%%
void
......
src/bin/dhcp6/parser_context.cc
View file @ 4204443a
......@@ -147,14 +147,16 @@ Parser6Context::context_name()
return ("client-classes");
case SERVER_ID:
return ("server-id");
case DHCP_DDNS:
return ("dhcp-ddns");
case CONTROL_SOCKET:
return ("control-socket");
case POOLS:
return ("pools");
case PD_POOLS:
return ("pd-pools");
case RESERVATIONS:
return ("reservations");
case RELAY:
return ("relay");
case CLIENT_CLASS:
return ("client-class");
case LOGGERS:
......
src/bin/dhcp6/parser_context.h
View file @ 4204443a
......@@ -136,11 +136,12 @@ public:
OPTION_DATA,
CLIENT_CLASSES,
SERVER_ID,
DHCP_DDNS,
CONTROL_SOCKET,
/// subnet6
POOLS,
PD_POOLS,
RESERVATIONS,
RELAY,
/// client-classes
CLIENT_CLASS,
/// Logging
......
src/bin/dhcp6/tests/config_parser_unittest.cc
View file @ 4204443a
......@@ -555,7 +555,7 @@ public:
const std::string& parameter) {
ConstElementPtr x;
std::string config = createConfigWithOption(param_value, parameter);
ConstElementPtr json = parseJSON(config);
ConstElementPtr json = parseDHCP6(config);
EXPECT_NO_THROW(x = configureDhcp6Server(srv_, json));
checkResult(x, 1);
EXPECT_TRUE(errorContainsPosition(x, "<string>"));
......@@ -573,7 +573,7 @@ public:
testInvalidOptionParam(const std::map<std::string, std::string>& params) {
ConstElementPtr x;
std::string config = createConfigWithOption(params);
ConstElementPtr json = parseJSON(config);
ConstElementPtr json = parseDHCP6(config);
EXPECT_NO_THROW(x = configureDhcp6Server(srv_, json));
checkResult(x, 1);
EXPECT_TRUE(errorContainsPosition(x, "<string>"));
......@@ -674,7 +674,7 @@ public:
CfgMgr::instance().clear();
// Configure the server.
ConstElementPtr json = parseJSON(config);
ConstElementPtr json = parseDHCP6(config);
// Make sure that the configuration was successful.
ConstElementPtr status;
......@@ -737,11 +737,11 @@ public:
// config update.
TEST_F(Dhcp6ParserTest, version) {
ConstElementPtr x;
EXPECT_NO_THROW(x = configureDhcp6Server(srv_,
parseJSON("{\"version\": 0}")));
ConstElementPtr json;
ASSERT_NO_THROW(json = parseDHCP6("{\"version\": 0}"));