[116-interface-id-dhcpv4] Removed rapid commit

diff --git a/src/bin/dhcp4/dhcp4_lexer.ll b/src/bin/dhcp4/dhcp4_lexer.ll
index 333bfbebbe1a814d334471d55fc35130ec52a4bb..1b9ae680c23c9bf7d59edd1dceebdbb19bc9b60e 100644 (file)
--- a/src/bin/dhcp4/dhcp4_lexer.ll
+++ b/src/bin/dhcp4/dhcp4_lexer.ll
@@ -721,15 +721,6 @@ ControlCharacterFill            [^"\\]|\\{JSONEscapeSequence}
     }
 }
 
-\"rapid-commit\" {
-    switch(driver.ctx_) {
-    case isc::dhcp::Parser4Context::SUBNET4:
-        return isc::dhcp::Dhcp4Parser::make_RAPID_COMMIT(driver.loc_);
-    default:
-        return isc::dhcp::Dhcp4Parser::make_STRING("rapid-commit", driver.loc_);
-    }
-}
-
 \"reservation-mode\" {
     switch(driver.ctx_) {
     case isc::dhcp::Parser4Context::SUBNET4:

diff --git a/src/bin/dhcp4/dhcp4_parser.yy b/src/bin/dhcp4/dhcp4_parser.yy
index b6e9fefbdd36538bb70d43710f0139013b0ae06d..10301f8c158e759d43583532702225073b91d43d 100644 (file)
--- a/src/bin/dhcp4/dhcp4_parser.yy
+++ b/src/bin/dhcp4/dhcp4_parser.yy
@@ -123,7 +123,6 @@ using namespace std;
   SUBNET "subnet"
   INTERFACE "interface"
   ID "id"
-  RAPID_COMMIT "rapid-commit"
   RESERVATION_MODE "reservation-mode"
   DISABLED "disabled"
   OUT_OF_POOL "out-of-pool"
@@ -1021,7 +1020,6 @@ subnet4_param: valid_lifetime
              | subnet
              | interface
              | id
-             | rapid_commit
              | client_class
              | require_client_classes
              | reservations
@@ -1115,11 +1113,6 @@ id: ID COLON INTEGER {
     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);
-};
-
 // ---- shared-networks ---------------------
 
 shared_networks: SHARED_NETWORKS {