[master] Servers store and emit configured global scalar parameters

Merge branch 'trac5378'
razvan-becheriu · Jun 11, 2018 · 4d05122 · 4d05122
2 parents c985671 + 50c308d
commit 4d05122
Show file tree

Hide file tree

Showing 7 changed files with 562 additions and 105 deletions.
diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
@@ -316,6 +316,9 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
 
         SrvConfigPtr srv_cfg = CfgMgr::instance().getStagingCfg();
 
+        // Preserve all scalar global parameters
+        srv_cfg->extractConfiguredGlobals(config_set);
+
         // This is a way to convert ConstElementPtr to ElementPtr.
         // We need a config that can be edited, because we will insert
         // default values and will insert derived values as well.