[5014] Extended parser to support persist and enterprise-id

diff --git a/src/bin/dhcp6/dhcp6_lexer.ll b/src/bin/dhcp6/dhcp6_lexer.ll
index a3768c7d63902498338509e77e2c38118d03b9b3..fc7d134d8d004b75b8c43f62723e58084ceb40c8 100644 (file)
--- a/src/bin/dhcp6/dhcp6_lexer.ll
+++ b/src/bin/dhcp6/dhcp6_lexer.ll
@@ -141,6 +141,7 @@ JSONString                              \"{JSONStringCharacter}*\"
 \"user\" { return isc::dhcp::Dhcp6Parser::make_USER(loc); }
 \"password\" { return isc::dhcp::Dhcp6Parser::make_PASSWORD(loc); }
 \"host\" { return isc::dhcp::Dhcp6Parser::make_HOST(loc); }
+\"persist\" { return isc::dhcp::Dhcp6Parser::make_PERSIST(loc); }
 
 \"preferred-lifetime\" { return  isc::dhcp::Dhcp6Parser::make_PREFERRED_LIFETIME(loc); }
 \"valid-lifetime\" { return  isc::dhcp::Dhcp6Parser::make_VALID_LIFETIME(loc); }
@@ -194,6 +195,7 @@ JSONString                              \"{JSONStringCharacter}*\"
 \"identifier\" { return isc::dhcp::Dhcp6Parser::make_IDENTIFIER(loc); }
 \"htype\" { return isc::dhcp::Dhcp6Parser::make_HTYPE(loc); }
 \"time\" { return isc::dhcp::Dhcp6Parser::make_TIME(loc); }
+\"enterprise-id\" { return isc::dhcp::Dhcp6Parser::make_ENTERPRISE_ID(loc); }
 
 \"expired-leases-processing\" { return isc::dhcp::Dhcp6Parser::make_EXPIRED_LEASES_PROCESSING(loc); }
 

diff --git a/src/bin/dhcp6/dhcp6_parser.yy b/src/bin/dhcp6/dhcp6_parser.yy
index 5827c04c0a2c0cfb6952601cf012b00dc493acbe..662370b836efee8318e84c2d596b54570b83cdc3 100644 (file)
--- a/src/bin/dhcp6/dhcp6_parser.yy
+++ b/src/bin/dhcp6/dhcp6_parser.yy
@@ -58,6 +58,7 @@ using namespace std;
   USER "user"
   PASSWORD "password"
   HOST "host"
+  PERSIST "persist"
 
   PREFERRED_LIFETIME "preferred-lifetime"
   VALID_LIFETIME "valid-lifetime"
@@ -106,6 +107,7 @@ using namespace std;
   IDENTIFIER "identifier"
   HTYPE "htype"
   TIME "time"
+  ENTERPRISE_ID "enterprise-id"
 
   DHCP4O6_PORT "dhcp4o6-port"
 
@@ -329,7 +331,8 @@ lease_database_map_param: type
 | user
 | password
 | host
-| name;
+| name
+| persist;
 
 type: TYPE COLON STRING {
     ElementPtr prf(new StringElement($3));
@@ -356,6 +359,11 @@ name: NAME COLON STRING {
     ctx.stack_.back()->set("name", n);
 };
 
+persist: PERSIST COLON BOOLEAN {
+    ElementPtr n(new BoolElement($3));
+    ctx.stack_.back()->set("persist", n);
+};
+
 mac_sources: MAC_SOURCES {
     ElementPtr l(new ListElement());
     ctx.stack_.back()->set("mac-sources", l);
@@ -782,7 +790,8 @@ server_id_params: server_id_param
 server_id_param: type
 | identifier
 | time
-| htype;
+| htype
+| enterprise_id;
 
 htype: HTYPE COLON INTEGER {
     ElementPtr htype(new IntElement($3));
@@ -798,6 +807,12 @@ time: TIME COLON INTEGER {
     ElementPtr time(new IntElement($3));
     ctx.stack_.back()->set("time", time);
 };
+
+enterprise_id: ENTERPRISE_ID COLON INTEGER {
+    ElementPtr time(new IntElement($3));
+    ctx.stack_.back()->set("enterprise-id", time);
+};
+
 // --- end of server-id --------------------------------------
 
 dhcp4o6_port: DHCP4O6_PORT COLON INTEGER {