From 5580d438073ee7afcfbe29fde8cd169c1303ab16 Mon Sep 17 00:00:00 2001 From: Francis Dupont Date: Fri, 18 Nov 2016 02:31:43 +0100 Subject: [PATCH] [5014] Partial fix for process tests (dhcp-ddns still missing) --- src/bin/dhcp6/dhcp6_lexer.ll | 1 + src/bin/dhcp6/dhcp6_parser.yy | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/bin/dhcp6/dhcp6_lexer.ll b/src/bin/dhcp6/dhcp6_lexer.ll index fc7d134d8d..6742b74027 100644 --- a/src/bin/dhcp6/dhcp6_lexer.ll +++ b/src/bin/dhcp6/dhcp6_lexer.ll @@ -142,6 +142,7 @@ JSONString \"{JSONStringCharacter}*\" \"password\" { return isc::dhcp::Dhcp6Parser::make_PASSWORD(loc); } \"host\" { return isc::dhcp::Dhcp6Parser::make_HOST(loc); } \"persist\" { return isc::dhcp::Dhcp6Parser::make_PERSIST(loc); } +\"lfc-interval\" { return isc::dhcp::Dhcp6Parser::make_LFC_INTERVAL(loc); } \"preferred-lifetime\" { return isc::dhcp::Dhcp6Parser::make_PREFERRED_LIFETIME(loc); } \"valid-lifetime\" { return isc::dhcp::Dhcp6Parser::make_VALID_LIFETIME(loc); } diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy index 00356bf900..c3562c96e4 100644 --- a/src/bin/dhcp6/dhcp6_parser.yy +++ b/src/bin/dhcp6/dhcp6_parser.yy @@ -59,6 +59,7 @@ using namespace std; PASSWORD "password" HOST "host" PERSIST "persist" + LFC_INTERVAL "lfc-interval" PREFERRED_LIFETIME "preferred-lifetime" VALID_LIFETIME "valid-lifetime" @@ -332,7 +333,9 @@ lease_database_map_param: type | password | host | name -| persist; +| persist +| lfc_interval; +; type: TYPE COLON STRING { ElementPtr prf(new StringElement($3)); @@ -364,6 +367,11 @@ persist: PERSIST COLON BOOLEAN { ctx.stack_.back()->set("persist", n); }; +lfc_interval: LFC_INTERVAL COLON INTEGER { + ElementPtr n(new IntElement($3)); + ctx.stack_.back()->set("lfc-interval", n); +}; + mac_sources: MAC_SOURCES { ElementPtr l(new ListElement()); ctx.stack_.back()->set("mac-sources", l); @@ -806,7 +814,8 @@ server_id_param: type | identifier | time | htype -| enterprise_id; +| enterprise_id +| persist; htype: HTYPE COLON INTEGER { ElementPtr htype(new IntElement($3)); -- 2.47.3