From: Razvan Becheriu Date: Mon, 15 Feb 2021 10:50:27 +0000 (+0200) Subject: [#899] addressed comments X-Git-Tag: Kea-1.9.5~72 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=560558d498276cd7ebe93f302da7e4e9f582d23c;p=thirdparty%2Fkea.git [#899] addressed comments --- diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a2aaae9bf0..87f8408df9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -45,6 +45,7 @@ shellcheck: - SCRIPTS+="src/lib/testutils/dhcp_test_lib.sh.in " - SCRIPTS+="src/lib/testutils/xml_reporting_test_lib.sh.in " - SCRIPTS+="src/lib/util/tests/process_spawn_app.sh.in " + - SCRIPTS+="src/hooks/dhcp/run_script/tests/run_script_test.sh.in " - SCRIPTS+="src/share/database/scripts/cql/upgrade_1.0_to_2.0.sh.in " - SCRIPTS+="src/share/database/scripts/cql/upgrade_2.0_to_3.0.sh.in " - SCRIPTS+="src/share/database/scripts/cql/upgrade_3.0_to_4.0.sh.in " diff --git a/src/hooks/dhcp/run_script/.gitattributes b/src/hooks/dhcp/run_script/.gitattributes index 31e5a07093..cc1d2893be 100644 --- a/src/hooks/dhcp/run_script/.gitattributes +++ b/src/hooks/dhcp/run_script/.gitattributes @@ -1,2 +1,2 @@ -/run_script_messages.cc -diff merge=ours -/run_script_messages.h -diff merge=ours +/run_script_messages.cc -diff merge=ours +/run_script_messages.h -diff merge=ours diff --git a/src/hooks/dhcp/run_script/libloadtests/load_unload_unittests.cc b/src/hooks/dhcp/run_script/libloadtests/load_unload_unittests.cc index 4fa4897d16..dbd864f85c 100644 --- a/src/hooks/dhcp/run_script/libloadtests/load_unload_unittests.cc +++ b/src/hooks/dhcp/run_script/libloadtests/load_unload_unittests.cc @@ -49,7 +49,7 @@ public: /// /// @param lib The name of the lib added. /// @param params The parameters of the library. - void addLib(const std::string& lib, ConstElementPtr params) { + void addLib(const string& lib, ConstElementPtr params) { libraries_.push_back(make_pair(lib, params)); } diff --git a/src/hooks/dhcp/run_script/run_script.cc b/src/hooks/dhcp/run_script/run_script.cc index 59287dc58d..bc0a06a87c 100644 --- a/src/hooks/dhcp/run_script/run_script.cc +++ b/src/hooks/dhcp/run_script/run_script.cc @@ -49,370 +49,370 @@ RunScriptImpl::runScript(const ProcessArgs& args, const ProcessEnvVars& vars) { } void -RunScriptImpl::extractBoolean(isc::util::ProcessEnvVars& vars, +RunScriptImpl::extractBoolean(ProcessEnvVars& vars, const bool value, - const std::string& prefix, - const std::string& sufix) { - std::string data = "0"; + const string& prefix, + const string& suffix) { + string data = "0"; if (value) { data = "1"; } - std::string exported_data = prefix + sufix + "=" + data; + string exported_data = prefix + suffix + "=" + data; vars.push_back(exported_data); } void -RunScriptImpl::extractInteger(isc::util::ProcessEnvVars& vars, +RunScriptImpl::extractInteger(ProcessEnvVars& vars, const uint64_t value, - const std::string& prefix, - const std::string& sufix) { - std::string data = ""; + const string& prefix, + const string& suffix) { + string data = ""; try { - data = boost::lexical_cast(value); + data = boost::lexical_cast(value); } catch (...) { } - std::string exported_data = prefix + sufix + "=" + data; + string exported_data = prefix + suffix + "=" + data; vars.push_back(exported_data); } void -RunScriptImpl::extractString(isc::util::ProcessEnvVars& vars, - const std::string& value, - const std::string& prefix, - const std::string& sufix) { - std::string exported_data = prefix + sufix + "=" + value; +RunScriptImpl::extractString(ProcessEnvVars& vars, + const string& value, + const string& prefix, + const string& suffix) { + string exported_data = prefix + suffix + "=" + value; vars.push_back(exported_data); } void -RunScriptImpl::extractHWAddr(isc::util::ProcessEnvVars& vars, - const isc::dhcp::HWAddrPtr& hwaddr, - const std::string& prefix, - const std::string& sufix) { +RunScriptImpl::extractHWAddr(ProcessEnvVars& vars, + const HWAddrPtr& hwaddr, + const string& prefix, + const string& suffix) { if (hwaddr) { - RunScriptImpl::extractString(vars, hwaddr->toText(false), prefix, sufix); - RunScriptImpl::extractInteger(vars, hwaddr->htype_, prefix + "_TYPE", sufix); + RunScriptImpl::extractString(vars, hwaddr->toText(false), prefix, suffix); + RunScriptImpl::extractInteger(vars, hwaddr->htype_, prefix + "_TYPE", suffix); } else { - RunScriptImpl::extractString(vars, "", prefix, sufix); - RunScriptImpl::extractString(vars, "", prefix + "_TYPE", sufix); + RunScriptImpl::extractString(vars, "", prefix, suffix); + RunScriptImpl::extractString(vars, "", prefix + "_TYPE", suffix); } } void -RunScriptImpl::extractDUID(isc::util::ProcessEnvVars& vars, - const isc::dhcp::DuidPtr duid, - const std::string& prefix, - const std::string& sufix) { - std::string data = ""; +RunScriptImpl::extractDUID(ProcessEnvVars& vars, + const DuidPtr duid, + const string& prefix, + const string& suffix) { + string data = ""; if (duid) { RunScriptImpl::extractString(vars, duid->toText(), - prefix, sufix); + prefix, suffix); } else { - RunScriptImpl::extractString(vars, "", prefix, sufix); + RunScriptImpl::extractString(vars, "", prefix, suffix); } } void -RunScriptImpl::extractOptionIA(isc::util::ProcessEnvVars& vars, - const isc::dhcp::Option6IAPtr option6IA, - const std::string& prefix, - const std::string& sufix) { +RunScriptImpl::extractOptionIA(ProcessEnvVars& vars, + const Option6IAPtr option6IA, + const string& prefix, + const string& suffix) { if (option6IA) { RunScriptImpl::extractInteger(vars, option6IA->getIAID(), - prefix + "_IAID", sufix); + prefix + "_IAID", suffix); RunScriptImpl::extractInteger(vars, option6IA->getType(), - prefix + "_IA_TYPE", sufix); + prefix + "_IA_TYPE", suffix); RunScriptImpl::extractInteger(vars, option6IA->getT1(), - prefix + "_IA_T1", sufix); + prefix + "_IA_T1", suffix); RunScriptImpl::extractInteger(vars, option6IA->getT2(), - prefix + "_IA_T2", sufix); + prefix + "_IA_T2", suffix); } else { - RunScriptImpl::extractString(vars, "", prefix + "_IAID", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_IA_TYPE", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_IA_T1", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_IA_T2", sufix); + RunScriptImpl::extractString(vars, "", prefix + "_IAID", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_IA_TYPE", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_IA_T1", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_IA_T2", suffix); } } void -RunScriptImpl::extractSubnet4(isc::util::ProcessEnvVars& vars, - const isc::dhcp::Subnet4Ptr subnet4, - const std::string& prefix, - const std::string& sufix) { +RunScriptImpl::extractSubnet4(ProcessEnvVars& vars, + const Subnet4Ptr subnet4, + const string& prefix, + const string& suffix) { if (subnet4) { RunScriptImpl::extractInteger(vars, subnet4->getID(), - prefix + "_ID", sufix); + prefix + "_ID", suffix); RunScriptImpl::extractString(vars, subnet4->toText(), - prefix + "_NAME", sufix); + prefix + "_NAME", suffix); auto prefix_data = subnet4->get(); RunScriptImpl::extractString(vars, prefix_data.first.toText(), - prefix + "_PREFIX", sufix); + prefix + "_PREFIX", suffix); RunScriptImpl::extractInteger(vars, prefix_data.second, - prefix + "_PREFIX_LEN", sufix); + prefix + "_PREFIX_LEN", suffix); } else { - RunScriptImpl::extractString(vars, "", prefix + "_ID", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_NAME", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_PREFIX", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_PREFIX_LEN", sufix); + RunScriptImpl::extractString(vars, "", prefix + "_ID", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_NAME", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_PREFIX", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_PREFIX_LEN", suffix); } } void -RunScriptImpl::extractSubnet6(isc::util::ProcessEnvVars& vars, - const isc::dhcp::Subnet6Ptr subnet6, - const std::string& prefix, - const std::string& sufix) { +RunScriptImpl::extractSubnet6(ProcessEnvVars& vars, + const Subnet6Ptr subnet6, + const string& prefix, + const string& suffix) { if (subnet6) { RunScriptImpl::extractInteger(vars, subnet6->getID(), - prefix + "_ID", sufix); + prefix + "_ID", suffix); RunScriptImpl::extractString(vars, subnet6->toText(), - prefix + "_NAME", sufix); + prefix + "_NAME", suffix); auto prefix_data = subnet6->get(); RunScriptImpl::extractString(vars, prefix_data.first.toText(), - prefix + "_PREFIX", sufix); + prefix + "_PREFIX", suffix); RunScriptImpl::extractInteger(vars, prefix_data.second, - prefix + "_PREFIX_LEN", sufix); + prefix + "_PREFIX_LEN", suffix); } else { - RunScriptImpl::extractString(vars, "", prefix + "_ID", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_NAME", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_PREFIX", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_PREFIX_LEN", sufix); + RunScriptImpl::extractString(vars, "", prefix + "_ID", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_NAME", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_PREFIX", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_PREFIX_LEN", suffix); } } void -RunScriptImpl::extractLease4(isc::util::ProcessEnvVars& vars, - const isc::dhcp::Lease4Ptr& lease4, - const std::string& prefix, - const std::string& sufix) { +RunScriptImpl::extractLease4(ProcessEnvVars& vars, + const Lease4Ptr& lease4, + const string& prefix, + const string& suffix) { if (lease4) { RunScriptImpl::extractString(vars, lease4->addr_.toText(), - prefix + "_ADDRESS", sufix); + prefix + "_ADDRESS", suffix); RunScriptImpl::extractInteger(vars, static_cast(lease4->cltt_), - prefix + "_CLTT", sufix); + prefix + "_CLTT", suffix); RunScriptImpl::extractString(vars, lease4->hostname_, - prefix + "_HOSTNAME", sufix); + prefix + "_HOSTNAME", suffix); RunScriptImpl::extractHWAddr(vars, lease4->hwaddr_, - prefix + "_HWADDR", sufix); + prefix + "_HWADDR", suffix); RunScriptImpl::extractString(vars, Lease4::statesToText(lease4->state_), - prefix + "_STATE", sufix); + prefix + "_STATE", suffix); RunScriptImpl::extractInteger(vars, lease4->subnet_id_, - prefix + "_SUBNET_ID", sufix); + prefix + "_SUBNET_ID", suffix); RunScriptImpl::extractInteger(vars, lease4->valid_lft_, - prefix + "_VALID_LIFETIME", sufix); + prefix + "_VALID_LIFETIME", suffix); RunScriptImpl::extractDUID(vars, lease4->client_id_, - prefix + "_CLIENT_ID", sufix); + prefix + "_CLIENT_ID", suffix); } else { - RunScriptImpl::extractString(vars, "", prefix + "_ADDRESS", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_CLTT", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_HOSTNAME", sufix); - RunScriptImpl::extractHWAddr(vars, HWAddrPtr(), prefix + "_HWADDR", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_STATE", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_SUBNET_ID", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_VALID_LIFETIME", sufix); - RunScriptImpl::extractDUID(vars, DuidPtr(), prefix + "_CLIENT_ID", sufix); + RunScriptImpl::extractString(vars, "", prefix + "_ADDRESS", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_CLTT", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_HOSTNAME", suffix); + RunScriptImpl::extractHWAddr(vars, HWAddrPtr(), prefix + "_HWADDR", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_STATE", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_SUBNET_ID", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_VALID_LIFETIME", suffix); + RunScriptImpl::extractDUID(vars, DuidPtr(), prefix + "_CLIENT_ID", suffix); } } void -RunScriptImpl::extractLease6(isc::util::ProcessEnvVars& vars, - const isc::dhcp::Lease6Ptr& lease6, - const std::string& prefix, - const std::string& sufix) { +RunScriptImpl::extractLease6(ProcessEnvVars& vars, + const Lease6Ptr& lease6, + const string& prefix, + const string& suffix) { if (lease6) { RunScriptImpl::extractString(vars, lease6->addr_.toText(), - prefix + "_ADDRESS", sufix); + prefix + "_ADDRESS", suffix); RunScriptImpl::extractInteger(vars, static_cast(lease6->cltt_), - prefix + "_CLTT", sufix); + prefix + "_CLTT", suffix); RunScriptImpl::extractString(vars, lease6->hostname_, - prefix + "_HOSTNAME", sufix); + prefix + "_HOSTNAME", suffix); RunScriptImpl::extractHWAddr(vars, lease6->hwaddr_, - prefix + "_HWADDR", sufix); + prefix + "_HWADDR", suffix); RunScriptImpl::extractString(vars, Lease6::statesToText(lease6->state_), - prefix + "_STATE", sufix); + prefix + "_STATE", suffix); RunScriptImpl::extractInteger(vars, lease6->subnet_id_, - prefix + "_SUBNET_ID", sufix); + prefix + "_SUBNET_ID", suffix); RunScriptImpl::extractInteger(vars, lease6->valid_lft_, - prefix + "_VALID_LIFETIME", sufix); + prefix + "_VALID_LIFETIME", suffix); RunScriptImpl::extractDUID(vars, lease6->duid_, - prefix + "_DUID", sufix); + prefix + "_DUID", suffix); RunScriptImpl::extractInteger(vars, lease6->iaid_, - prefix + "_IAID", sufix); + prefix + "_IAID", suffix); RunScriptImpl::extractInteger(vars, lease6->preferred_lft_, - prefix + "_PREFERRED_LIFETIME", sufix); + prefix + "_PREFERRED_LIFETIME", suffix); RunScriptImpl::extractInteger(vars, lease6->prefixlen_, - prefix + "_PREFIX_LEN", sufix); + prefix + "_PREFIX_LEN", suffix); RunScriptImpl::extractString(vars, Lease::typeToText(lease6->type_), - prefix + "_TYPE", sufix); + prefix + "_TYPE", suffix); } else { - RunScriptImpl::extractString(vars, "", prefix + "_ADDRESS", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_CLTT", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_HOSTNAME", sufix); - RunScriptImpl::extractHWAddr(vars, HWAddrPtr(), prefix + "_HWADDR", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_STATE", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_SUBNET_ID", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_VALID_LIFETIME", sufix); - RunScriptImpl::extractDUID(vars, DuidPtr(), prefix + "_DUID", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_IAID", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_PREFERRED_LIFETIME", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_PREFIX_LEN", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_TYPE", sufix); + RunScriptImpl::extractString(vars, "", prefix + "_ADDRESS", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_CLTT", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_HOSTNAME", suffix); + RunScriptImpl::extractHWAddr(vars, HWAddrPtr(), prefix + "_HWADDR", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_STATE", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_SUBNET_ID", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_VALID_LIFETIME", suffix); + RunScriptImpl::extractDUID(vars, DuidPtr(), prefix + "_DUID", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_IAID", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_PREFERRED_LIFETIME", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_PREFIX_LEN", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_TYPE", suffix); } } void -RunScriptImpl::extractLeases4(isc::util::ProcessEnvVars& vars, - const isc::dhcp::Lease4CollectionPtr& leases4, - const std::string& prefix, - const std::string& sufix) { +RunScriptImpl::extractLeases4(ProcessEnvVars& vars, + const Lease4CollectionPtr& leases4, + const string& prefix, + const string& suffix) { if (leases4) { RunScriptImpl::extractInteger(vars, leases4->size(), - prefix + "_SIZE", sufix); + prefix + "_SIZE", suffix); for (int i = 0; i < leases4->size(); ++i) { RunScriptImpl::extractLease4(vars, leases4->at(i), prefix + "_AT" + - boost::lexical_cast(i), - sufix); + boost::lexical_cast(i), + suffix); } } else { - RunScriptImpl::extractString(vars, "0", prefix + "_SIZE", sufix); + RunScriptImpl::extractString(vars, "0", prefix + "_SIZE", suffix); } } void -RunScriptImpl::extractLeases6(isc::util::ProcessEnvVars& vars, - const isc::dhcp::Lease6CollectionPtr& leases6, - const std::string& prefix, - const std::string& sufix) { +RunScriptImpl::extractLeases6(ProcessEnvVars& vars, + const Lease6CollectionPtr& leases6, + const string& prefix, + const string& suffix) { if (leases6) { RunScriptImpl::extractInteger(vars, leases6->size(), - prefix + "_SIZE", sufix); + prefix + "_SIZE", suffix); for (int i = 0; i < leases6->size(); ++i) { RunScriptImpl::extractLease6(vars, leases6->at(i), prefix + "_AT" + - boost::lexical_cast(i), - sufix); + boost::lexical_cast(i), + suffix); } } else { - RunScriptImpl::extractString(vars, "0", prefix + "_SIZE", sufix); + RunScriptImpl::extractString(vars, "0", prefix + "_SIZE", suffix); } } void -RunScriptImpl::extractPkt4(isc::util::ProcessEnvVars& vars, - const isc::dhcp::Pkt4Ptr& pkt4, - const std::string& prefix, - const std::string& sufix) { +RunScriptImpl::extractPkt4(ProcessEnvVars& vars, + const Pkt4Ptr& pkt4, + const string& prefix, + const string& suffix) { if (pkt4) { RunScriptImpl::extractString(vars, pkt4->getName(pkt4->getType()), - prefix + "_TYPE", sufix); + prefix + "_TYPE", suffix); RunScriptImpl::extractInteger(vars, pkt4->getTransid(), - prefix + "_TXID", sufix); + prefix + "_TXID", suffix); RunScriptImpl::extractString(vars, pkt4->getLocalAddr().toText(), - prefix + "_LOCAL_ADDR", sufix); + prefix + "_LOCAL_ADDR", suffix); RunScriptImpl::extractInteger(vars, pkt4->getLocalPort(), - prefix + "_LOCAL_PORT", sufix); + prefix + "_LOCAL_PORT", suffix); RunScriptImpl::extractString(vars, pkt4->getRemoteAddr().toText(), - prefix + "_REMOTE_ADDR", sufix); + prefix + "_REMOTE_ADDR", suffix); RunScriptImpl::extractInteger(vars, pkt4->getRemotePort(), - prefix + "_REMOTE_PORT", sufix); + prefix + "_REMOTE_PORT", suffix); RunScriptImpl::extractInteger(vars, pkt4->getIndex(), - prefix + "_IFACE_INDEX", sufix); + prefix + "_IFACE_INDEX", suffix); RunScriptImpl::extractString(vars, pkt4->getIface(), - prefix + "_IFACE_NAME", sufix); + prefix + "_IFACE_NAME", suffix); RunScriptImpl::extractInteger(vars, pkt4->getHops(), - prefix + "_HOPS", sufix); + prefix + "_HOPS", suffix); RunScriptImpl::extractInteger(vars, pkt4->getSecs(), - prefix + "_SECS", sufix); + prefix + "_SECS", suffix); RunScriptImpl::extractInteger(vars, pkt4->getFlags(), - prefix + "_FLAGS", sufix); + prefix + "_FLAGS", suffix); RunScriptImpl::extractString(vars, pkt4->getCiaddr().toText(), - prefix + "_CIADDR", sufix); + prefix + "_CIADDR", suffix); RunScriptImpl::extractString(vars, pkt4->getSiaddr().toText(), - prefix + "_SIADDR", sufix); + prefix + "_SIADDR", suffix); RunScriptImpl::extractString(vars, pkt4->getYiaddr().toText(), - prefix + "_YIADDR", sufix); + prefix + "_YIADDR", suffix); RunScriptImpl::extractString(vars, pkt4->getGiaddr().toText(), - prefix + "_GIADDR", sufix); + prefix + "_GIADDR", suffix); RunScriptImpl::extractBoolean(vars, pkt4->isRelayed(), - prefix + "_RELAYED", sufix); + prefix + "_RELAYED", suffix); RunScriptImpl::extractHWAddr(vars, pkt4->getHWAddr(), - prefix + "_HWADDR", sufix); + prefix + "_HWADDR", suffix); RunScriptImpl::extractHWAddr(vars, pkt4->getLocalHWAddr(), - prefix + "_LOCAL_HWADDR", sufix); + prefix + "_LOCAL_HWADDR", suffix); RunScriptImpl::extractHWAddr(vars, pkt4->getRemoteHWAddr(), - prefix + "_REMOTE_HWADDR", sufix); + prefix + "_REMOTE_HWADDR", suffix); } else { - RunScriptImpl::extractString(vars, "", prefix + "_TYPE", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_TXID", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_LOCAL_ADDR", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_LOCAL_PORT", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_REMOTE_ADDR", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_REMOTE_PORT", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_IFACE_INDEX", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_IFACE_NAME", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_HOPS", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_SECS", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_FLAGS", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_CIADDR", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_SIADDR", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_YIADDR", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_GIADDR", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_RELAYED", sufix); + RunScriptImpl::extractString(vars, "", prefix + "_TYPE", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_TXID", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_LOCAL_ADDR", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_LOCAL_PORT", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_REMOTE_ADDR", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_REMOTE_PORT", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_IFACE_INDEX", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_IFACE_NAME", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_HOPS", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_SECS", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_FLAGS", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_CIADDR", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_SIADDR", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_YIADDR", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_GIADDR", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_RELAYED", suffix); RunScriptImpl::extractHWAddr(vars, HWAddrPtr(), - prefix + "_HWADDR", sufix); + prefix + "_HWADDR", suffix); RunScriptImpl::extractHWAddr(vars, HWAddrPtr(), - prefix + "_LOCAL_HWADDR", sufix); + prefix + "_LOCAL_HWADDR", suffix); RunScriptImpl::extractHWAddr(vars, HWAddrPtr(), - prefix + "_REMOTE_HWADDR", sufix); + prefix + "_REMOTE_HWADDR", suffix); } } void -RunScriptImpl::extractPkt6(isc::util::ProcessEnvVars& vars, - const isc::dhcp::Pkt6Ptr& pkt6, - const std::string& prefix, - const std::string& sufix) { +RunScriptImpl::extractPkt6(ProcessEnvVars& vars, + const Pkt6Ptr& pkt6, + const string& prefix, + const string& suffix) { if (pkt6) { RunScriptImpl::extractString(vars, pkt6->getName(pkt6->getType()), - prefix + "_TYPE", sufix); + prefix + "_TYPE", suffix); RunScriptImpl::extractInteger(vars, pkt6->getTransid(), - prefix + "_TXID", sufix); + prefix + "_TXID", suffix); RunScriptImpl::extractString(vars, pkt6->getLocalAddr().toText(), - prefix + "_LOCAL_ADDR", sufix); + prefix + "_LOCAL_ADDR", suffix); RunScriptImpl::extractInteger(vars, pkt6->getLocalPort(), - prefix + "_LOCAL_PORT", sufix); + prefix + "_LOCAL_PORT", suffix); RunScriptImpl::extractString(vars, pkt6->getRemoteAddr().toText(), - prefix + "_REMOTE_ADDR", sufix); + prefix + "_REMOTE_ADDR", suffix); RunScriptImpl::extractInteger(vars, pkt6->getRemotePort(), - prefix + "_REMOTE_PORT", sufix); + prefix + "_REMOTE_PORT", suffix); RunScriptImpl::extractInteger(vars, pkt6->getIndex(), - prefix + "_IFACE_INDEX", sufix); + prefix + "_IFACE_INDEX", suffix); RunScriptImpl::extractString(vars, pkt6->getIface(), - prefix + "_IFACE_NAME", sufix); + prefix + "_IFACE_NAME", suffix); RunScriptImpl::extractHWAddr(vars, pkt6->getRemoteHWAddr(), - prefix + "_REMOTE_HWADDR", sufix); - std::string proto_data = (pkt6->getProto() == Pkt6::UDP ? "UDP" : "TCP"); + prefix + "_REMOTE_HWADDR", suffix); + string proto_data = (pkt6->getProto() == Pkt6::UDP ? "UDP" : "TCP"); RunScriptImpl::extractString(vars, proto_data, - prefix + "_PROTO", sufix); + prefix + "_PROTO", suffix); RunScriptImpl::extractDUID(vars, pkt6->getClientId(), - prefix + "_CLIENT_ID", sufix); + prefix + "_CLIENT_ID", suffix); } else { - RunScriptImpl::extractString(vars, "", prefix + "_TYPE", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_TXID", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_LOCAL_ADDR", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_LOCAL_PORT", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_REMOTE_ADDR", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_REMOTE_PORT", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_IFACE_INDEX", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_IFACE_NAME", sufix); + RunScriptImpl::extractString(vars, "", prefix + "_TYPE", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_TXID", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_LOCAL_ADDR", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_LOCAL_PORT", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_REMOTE_ADDR", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_REMOTE_PORT", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_IFACE_INDEX", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_IFACE_NAME", suffix); RunScriptImpl::extractHWAddr(vars, HWAddrPtr(), - prefix + "_REMOTE_HWADDR", sufix); - RunScriptImpl::extractString(vars, "", prefix + "_PROTO", sufix); + prefix + "_REMOTE_HWADDR", suffix); + RunScriptImpl::extractString(vars, "", prefix + "_PROTO", suffix); RunScriptImpl::extractDUID(vars, DuidPtr(), - prefix + "_CLIENT_ID", sufix); + prefix + "_CLIENT_ID", suffix); } } -} // end of namespace run_script -} // end of namespace isc +} // namespace run_script +} // namespace isc diff --git a/src/hooks/dhcp/run_script/run_script.dox b/src/hooks/dhcp/run_script/run_script.dox index a4fb123345..561cdd7a56 100644 --- a/src/hooks/dhcp/run_script/run_script.dox +++ b/src/hooks/dhcp/run_script/run_script.dox @@ -27,11 +27,11 @@ be run on specific hook points. ## Configuring the DHCPv4 Module It must be configured as a hook library for the desired DHCP server -modules. Note that the bootp library is installed alongside the +modules. Note that the Run Script library is installed alongside the Kea libraries in "/lib" where is determined by the --prefix option of the configure script. It defaults to "/usr/local". Assuming the default value then, configuring kea-dhcp4 -to load the bootp library could be done with the following Kea4 +to load the Run Script library could be done with the following Kea4 configuration: @code diff --git a/src/hooks/dhcp/run_script/run_script.h b/src/hooks/dhcp/run_script/run_script.h index 35f12af02c..692b43fad0 100644 --- a/src/hooks/dhcp/run_script/run_script.h +++ b/src/hooks/dhcp/run_script/run_script.h @@ -224,6 +224,6 @@ private: /// @brief The type of shared pointers to Run Script implementations. typedef boost::shared_ptr RunScriptImplPtr; -} // end of namespace run_script -} // end of namespace isc +} // namespace run_script +} // namespace isc #endif diff --git a/src/hooks/dhcp/run_script/run_script_callouts.cc b/src/hooks/dhcp/run_script/run_script_callouts.cc index 538f2daf8f..c16c24b4a9 100644 --- a/src/hooks/dhcp/run_script/run_script_callouts.cc +++ b/src/hooks/dhcp/run_script/run_script_callouts.cc @@ -21,8 +21,8 @@ namespace run_script { RunScriptImplPtr impl; -} // end of namespace run_script -} // end of namespace isc +} // namespace run_script +} // namespace isc using namespace isc; using namespace isc::data; diff --git a/src/hooks/dhcp/run_script/run_script_log.cc b/src/hooks/dhcp/run_script/run_script_log.cc index 62af75b466..02142e53a5 100644 --- a/src/hooks/dhcp/run_script/run_script_log.cc +++ b/src/hooks/dhcp/run_script/run_script_log.cc @@ -13,5 +13,5 @@ namespace run_script { isc::log::Logger run_script_logger("run-script-hooks"); -} // namespace bootp +} // namespace run_script } // namespace isc diff --git a/src/hooks/dhcp/run_script/run_script_log.h b/src/hooks/dhcp/run_script/run_script_log.h index 10a23d92a6..65c693ad3d 100644 --- a/src/hooks/dhcp/run_script/run_script_log.h +++ b/src/hooks/dhcp/run_script/run_script_log.h @@ -17,6 +17,6 @@ namespace run_script { extern isc::log::Logger run_script_logger; -} // end of namespace run_script -} // end of namespace isc +} // namespace run_script +} // namespace isc #endif diff --git a/src/hooks/dhcp/run_script/tests/run_script_test.sh.in b/src/hooks/dhcp/run_script/tests/run_script_test.sh.in index 2bacffc3d2..cb26a1a0e3 100644 --- a/src/hooks/dhcp/run_script/tests/run_script_test.sh.in +++ b/src/hooks/dhcp/run_script/tests/run_script_test.sh.in @@ -31,13 +31,13 @@ ASSERT_EQ() { TEST_EQ() { TEST_VARIABLE=${1} - TEST_EXPECTED=${1}"="${2} - TEST_ACTUAL=$(env | grep -w "${TEST_VARIABLE}") + TEST_EXPECTED="${1}=${2}" + TEST_ACTUAL=$(env | grep -E "^${TEST_VARIABLE}=") ASSERT_EQ "${TEST_EXPECTED}" "${TEST_ACTUAL}" } unknown_handle() { - ECHO_TO_FILE "Unhandled function call" + ECHO_TO_FILE "Unhandled function call ${@}" exit 123 } diff --git a/src/hooks/dhcp/run_script/tests/run_script_unittests.cc b/src/hooks/dhcp/run_script/tests/run_script_unittests.cc index c857753d0f..a7d42b35f8 100644 --- a/src/hooks/dhcp/run_script/tests/run_script_unittests.cc +++ b/src/hooks/dhcp/run_script/tests/run_script_unittests.cc @@ -50,8 +50,8 @@ namespace run_script { extern RunScriptImplPtr impl; -} // end of namespace run_script -} // end of namespace isc +} // namespace run_script +} // namespace isc namespace { @@ -60,9 +60,9 @@ namespace { /// /// @param vars The list of environment variables to join. /// @return The joined environment. -std::string +string join(const ProcessEnvVars& vars) { - std::string result = ""; + string result; for (auto var : vars) { result += var + "\n"; } @@ -276,7 +276,7 @@ generatePkt6() { /// @brief Tests the RunScript setName and getName functions. TEST(RunScript, testSetNameGetName) { RunScriptImpl script; - std::string script_name = "test"; + string script_name = "test"; ASSERT_NO_THROW(script.setName(script_name)); EXPECT_EQ(script_name, script.getName()); } @@ -295,7 +295,7 @@ TEST(RunScript, extractBoolean) { bool flag = false; RunScriptImpl::extractBoolean(vars, flag, "FALSE_PREFIX", "_FALSE_SUFIX"); ASSERT_EQ(1, vars.size()); - std::string expected = "FALSE_PREFIX_FALSE_SUFIX=0\n"; + string expected = "FALSE_PREFIX_FALSE_SUFIX=0\n"; EXPECT_EQ(expected, join(vars)); flag = true; RunScriptImpl::extractBoolean(vars, flag, "TRUE_PREFIX", "_TRUE_SUFIX"); @@ -311,7 +311,7 @@ TEST(RunScript, extractInteger) { uint64_t value = 0; RunScriptImpl::extractInteger(vars, value, "ZERO_PREFIX", "_ZERO_SUFIX"); ASSERT_EQ(1, vars.size()); - std::string expected = "ZERO_PREFIX_ZERO_SUFIX=0\n"; + string expected = "ZERO_PREFIX_ZERO_SUFIX=0\n"; EXPECT_EQ(expected, join(vars)); value = 1; RunScriptImpl::extractInteger(vars, value, "ONE_PREFIX", "_ONE_SUFIX"); @@ -331,10 +331,10 @@ TEST(RunScript, extractInteger) { /// @brief Tests the extractString method works as expected. TEST(RunScript, extractString) { ProcessEnvVars vars; - std::string value = ""; + string value = ""; RunScriptImpl::extractString(vars, value, "EMPTY_PREFIX", "_EMPTY_SUFIX"); ASSERT_EQ(1, vars.size()); - std::string expected = "EMPTY_PREFIX_EMPTY_SUFIX=\n"; + string expected = "EMPTY_PREFIX_EMPTY_SUFIX=\n"; EXPECT_EQ(expected, join(vars)); value = "SOMETHING"; RunScriptImpl::extractString(vars, value, "NON_EMPTY_PREFIX", "_NON_EMPTY_SUFIX"); @@ -350,8 +350,8 @@ TEST(RunScript, extractHWAddr) { HWAddrPtr hwaddr; RunScriptImpl::extractHWAddr(vars, hwaddr, "HWADDR_PREFIX", "_HWADDR_SUFIX"); ASSERT_EQ(2, vars.size()); - std::string expected = "HWADDR_PREFIX_HWADDR_SUFIX=\n" - "HWADDR_PREFIX_TYPE_HWADDR_SUFIX=\n"; + string expected = "HWADDR_PREFIX_HWADDR_SUFIX=\n" + "HWADDR_PREFIX_TYPE_HWADDR_SUFIX=\n"; EXPECT_EQ(expected, join(vars)); vars.clear(); hwaddr = generateHWAddr(); @@ -368,7 +368,7 @@ TEST(RunScript, extractDUID) { DuidPtr duid; RunScriptImpl::extractDUID(vars, duid, "DUID_PREFIX", "_DUID_SUFIX"); ASSERT_EQ(1, vars.size()); - std::string expected = "DUID_PREFIX_DUID_SUFIX=\n"; + string expected = "DUID_PREFIX_DUID_SUFIX=\n"; EXPECT_EQ(expected, join(vars)); vars.clear(); duid = generateDUID(); @@ -384,10 +384,10 @@ TEST(RunScript, extractOptionIA) { Option6IAPtr optionia; RunScriptImpl::extractOptionIA(vars, optionia, "OPTIONIA_PREFIX", "_OPTIONIA_SUFIX"); ASSERT_EQ(4, vars.size()); - std::string expected = "OPTIONIA_PREFIX_IAID_OPTIONIA_SUFIX=\n" - "OPTIONIA_PREFIX_IA_TYPE_OPTIONIA_SUFIX=\n" - "OPTIONIA_PREFIX_IA_T1_OPTIONIA_SUFIX=\n" - "OPTIONIA_PREFIX_IA_T2_OPTIONIA_SUFIX=\n"; + string expected = "OPTIONIA_PREFIX_IAID_OPTIONIA_SUFIX=\n" + "OPTIONIA_PREFIX_IA_TYPE_OPTIONIA_SUFIX=\n" + "OPTIONIA_PREFIX_IA_T1_OPTIONIA_SUFIX=\n" + "OPTIONIA_PREFIX_IA_T2_OPTIONIA_SUFIX=\n"; EXPECT_EQ(expected, join(vars)); vars.clear(); optionia = generateOptionIA(); @@ -406,10 +406,10 @@ TEST(RunScript, extractSubnet4) { Subnet4Ptr subnet4; RunScriptImpl::extractSubnet4(vars, subnet4, "SUBNET4_PREFIX", "_SUBNET4_SUFIX"); ASSERT_EQ(4, vars.size()); - std::string expected = "SUBNET4_PREFIX_ID_SUBNET4_SUFIX=\n" - "SUBNET4_PREFIX_NAME_SUBNET4_SUFIX=\n" - "SUBNET4_PREFIX_PREFIX_SUBNET4_SUFIX=\n" - "SUBNET4_PREFIX_PREFIX_LEN_SUBNET4_SUFIX=\n"; + string expected = "SUBNET4_PREFIX_ID_SUBNET4_SUFIX=\n" + "SUBNET4_PREFIX_NAME_SUBNET4_SUFIX=\n" + "SUBNET4_PREFIX_PREFIX_SUBNET4_SUFIX=\n" + "SUBNET4_PREFIX_PREFIX_LEN_SUBNET4_SUFIX=\n"; EXPECT_EQ(expected, join(vars)); vars.clear(); subnet4 = generateSubnet4(); @@ -428,10 +428,10 @@ TEST(RunScript, extractSubnet6) { Subnet6Ptr subnet6; RunScriptImpl::extractSubnet6(vars, subnet6, "SUBNET6_PREFIX", "_SUBNET6_SUFIX"); ASSERT_EQ(4, vars.size()); - std::string expected = "SUBNET6_PREFIX_ID_SUBNET6_SUFIX=\n" - "SUBNET6_PREFIX_NAME_SUBNET6_SUFIX=\n" - "SUBNET6_PREFIX_PREFIX_SUBNET6_SUFIX=\n" - "SUBNET6_PREFIX_PREFIX_LEN_SUBNET6_SUFIX=\n"; + string expected = "SUBNET6_PREFIX_ID_SUBNET6_SUFIX=\n" + "SUBNET6_PREFIX_NAME_SUBNET6_SUFIX=\n" + "SUBNET6_PREFIX_PREFIX_SUBNET6_SUFIX=\n" + "SUBNET6_PREFIX_PREFIX_LEN_SUBNET6_SUFIX=\n"; EXPECT_EQ(expected, join(vars)); vars.clear(); subnet6 = generateSubnet6(); @@ -450,15 +450,15 @@ TEST(RunScript, extractLease4) { Lease4Ptr lease4; RunScriptImpl::extractLease4(vars, lease4, "LEASE4_PREFIX", "_LEASE4_SUFIX"); ASSERT_EQ(9, vars.size()); - std::string expected = "LEASE4_PREFIX_ADDRESS_LEASE4_SUFIX=\n" - "LEASE4_PREFIX_CLTT_LEASE4_SUFIX=\n" - "LEASE4_PREFIX_HOSTNAME_LEASE4_SUFIX=\n" - "LEASE4_PREFIX_HWADDR_LEASE4_SUFIX=\n" - "LEASE4_PREFIX_HWADDR_TYPE_LEASE4_SUFIX=\n" - "LEASE4_PREFIX_STATE_LEASE4_SUFIX=\n" - "LEASE4_PREFIX_SUBNET_ID_LEASE4_SUFIX=\n" - "LEASE4_PREFIX_VALID_LIFETIME_LEASE4_SUFIX=\n" - "LEASE4_PREFIX_CLIENT_ID_LEASE4_SUFIX=\n"; + string expected = "LEASE4_PREFIX_ADDRESS_LEASE4_SUFIX=\n" + "LEASE4_PREFIX_CLTT_LEASE4_SUFIX=\n" + "LEASE4_PREFIX_HOSTNAME_LEASE4_SUFIX=\n" + "LEASE4_PREFIX_HWADDR_LEASE4_SUFIX=\n" + "LEASE4_PREFIX_HWADDR_TYPE_LEASE4_SUFIX=\n" + "LEASE4_PREFIX_STATE_LEASE4_SUFIX=\n" + "LEASE4_PREFIX_SUBNET_ID_LEASE4_SUFIX=\n" + "LEASE4_PREFIX_VALID_LIFETIME_LEASE4_SUFIX=\n" + "LEASE4_PREFIX_CLIENT_ID_LEASE4_SUFIX=\n"; EXPECT_EQ(expected, join(vars)); vars.clear(); lease4 = generateLease4(); @@ -482,19 +482,19 @@ TEST(RunScript, extractLease6) { Lease6Ptr lease6; RunScriptImpl::extractLease6(vars, lease6, "LEASE6_PREFIX", "_LEASE6_SUFIX"); ASSERT_EQ(13, vars.size()); - std::string expected = "LEASE6_PREFIX_ADDRESS_LEASE6_SUFIX=\n" - "LEASE6_PREFIX_CLTT_LEASE6_SUFIX=\n" - "LEASE6_PREFIX_HOSTNAME_LEASE6_SUFIX=\n" - "LEASE6_PREFIX_HWADDR_LEASE6_SUFIX=\n" - "LEASE6_PREFIX_HWADDR_TYPE_LEASE6_SUFIX=\n" - "LEASE6_PREFIX_STATE_LEASE6_SUFIX=\n" - "LEASE6_PREFIX_SUBNET_ID_LEASE6_SUFIX=\n" - "LEASE6_PREFIX_VALID_LIFETIME_LEASE6_SUFIX=\n" - "LEASE6_PREFIX_DUID_LEASE6_SUFIX=\n" - "LEASE6_PREFIX_IAID_LEASE6_SUFIX=\n" - "LEASE6_PREFIX_PREFERRED_LIFETIME_LEASE6_SUFIX=\n" - "LEASE6_PREFIX_PREFIX_LEN_LEASE6_SUFIX=\n" - "LEASE6_PREFIX_TYPE_LEASE6_SUFIX=\n"; + string expected = "LEASE6_PREFIX_ADDRESS_LEASE6_SUFIX=\n" + "LEASE6_PREFIX_CLTT_LEASE6_SUFIX=\n" + "LEASE6_PREFIX_HOSTNAME_LEASE6_SUFIX=\n" + "LEASE6_PREFIX_HWADDR_LEASE6_SUFIX=\n" + "LEASE6_PREFIX_HWADDR_TYPE_LEASE6_SUFIX=\n" + "LEASE6_PREFIX_STATE_LEASE6_SUFIX=\n" + "LEASE6_PREFIX_SUBNET_ID_LEASE6_SUFIX=\n" + "LEASE6_PREFIX_VALID_LIFETIME_LEASE6_SUFIX=\n" + "LEASE6_PREFIX_DUID_LEASE6_SUFIX=\n" + "LEASE6_PREFIX_IAID_LEASE6_SUFIX=\n" + "LEASE6_PREFIX_PREFERRED_LIFETIME_LEASE6_SUFIX=\n" + "LEASE6_PREFIX_PREFIX_LEN_LEASE6_SUFIX=\n" + "LEASE6_PREFIX_TYPE_LEASE6_SUFIX=\n"; EXPECT_EQ(expected, join(vars)); vars.clear(); lease6 = generateLease6(); @@ -522,7 +522,7 @@ TEST(RunScript, extractLeases4) { Lease4CollectionPtr leases4; RunScriptImpl::extractLeases4(vars, leases4, "LEASES4_PREFIX", "_LEASES4_SUFIX"); ASSERT_EQ(1, vars.size()); - std::string expected = "LEASES4_PREFIX_SIZE_LEASES4_SUFIX=0\n"; + string expected = "LEASES4_PREFIX_SIZE_LEASES4_SUFIX=0\n"; EXPECT_EQ(expected, join(vars)); vars.clear(); leases4.reset(new Lease4Collection()); @@ -558,7 +558,7 @@ TEST(RunScript, extractLeases6) { Lease6CollectionPtr leases6; RunScriptImpl::extractLeases6(vars, leases6, "LEASES6_PREFIX", "_LEASES6_SUFIX"); ASSERT_EQ(1, vars.size()); - std::string expected = "LEASES6_PREFIX_SIZE_LEASES6_SUFIX=0\n"; + string expected = "LEASES6_PREFIX_SIZE_LEASES6_SUFIX=0\n"; EXPECT_EQ(expected, join(vars)); vars.clear(); leases6.reset(new Lease6Collection()); @@ -602,28 +602,28 @@ TEST(RunScript, extractPkt4) { Pkt4Ptr pkt4; RunScriptImpl::extractPkt4(vars, pkt4, "PKT4_PREFIX", "_PKT4_SUFIX"); ASSERT_EQ(22, vars.size()); - std::string expected = "PKT4_PREFIX_TYPE_PKT4_SUFIX=\n" - "PKT4_PREFIX_TXID_PKT4_SUFIX=\n" - "PKT4_PREFIX_LOCAL_ADDR_PKT4_SUFIX=\n" - "PKT4_PREFIX_LOCAL_PORT_PKT4_SUFIX=\n" - "PKT4_PREFIX_REMOTE_ADDR_PKT4_SUFIX=\n" - "PKT4_PREFIX_REMOTE_PORT_PKT4_SUFIX=\n" - "PKT4_PREFIX_IFACE_INDEX_PKT4_SUFIX=\n" - "PKT4_PREFIX_IFACE_NAME_PKT4_SUFIX=\n" - "PKT4_PREFIX_HOPS_PKT4_SUFIX=\n" - "PKT4_PREFIX_SECS_PKT4_SUFIX=\n" - "PKT4_PREFIX_FLAGS_PKT4_SUFIX=\n" - "PKT4_PREFIX_CIADDR_PKT4_SUFIX=\n" - "PKT4_PREFIX_SIADDR_PKT4_SUFIX=\n" - "PKT4_PREFIX_YIADDR_PKT4_SUFIX=\n" - "PKT4_PREFIX_GIADDR_PKT4_SUFIX=\n" - "PKT4_PREFIX_RELAYED_PKT4_SUFIX=\n" - "PKT4_PREFIX_HWADDR_PKT4_SUFIX=\n" - "PKT4_PREFIX_HWADDR_TYPE_PKT4_SUFIX=\n" - "PKT4_PREFIX_LOCAL_HWADDR_PKT4_SUFIX=\n" - "PKT4_PREFIX_LOCAL_HWADDR_TYPE_PKT4_SUFIX=\n" - "PKT4_PREFIX_REMOTE_HWADDR_PKT4_SUFIX=\n" - "PKT4_PREFIX_REMOTE_HWADDR_TYPE_PKT4_SUFIX=\n"; + string expected = "PKT4_PREFIX_TYPE_PKT4_SUFIX=\n" + "PKT4_PREFIX_TXID_PKT4_SUFIX=\n" + "PKT4_PREFIX_LOCAL_ADDR_PKT4_SUFIX=\n" + "PKT4_PREFIX_LOCAL_PORT_PKT4_SUFIX=\n" + "PKT4_PREFIX_REMOTE_ADDR_PKT4_SUFIX=\n" + "PKT4_PREFIX_REMOTE_PORT_PKT4_SUFIX=\n" + "PKT4_PREFIX_IFACE_INDEX_PKT4_SUFIX=\n" + "PKT4_PREFIX_IFACE_NAME_PKT4_SUFIX=\n" + "PKT4_PREFIX_HOPS_PKT4_SUFIX=\n" + "PKT4_PREFIX_SECS_PKT4_SUFIX=\n" + "PKT4_PREFIX_FLAGS_PKT4_SUFIX=\n" + "PKT4_PREFIX_CIADDR_PKT4_SUFIX=\n" + "PKT4_PREFIX_SIADDR_PKT4_SUFIX=\n" + "PKT4_PREFIX_YIADDR_PKT4_SUFIX=\n" + "PKT4_PREFIX_GIADDR_PKT4_SUFIX=\n" + "PKT4_PREFIX_RELAYED_PKT4_SUFIX=\n" + "PKT4_PREFIX_HWADDR_PKT4_SUFIX=\n" + "PKT4_PREFIX_HWADDR_TYPE_PKT4_SUFIX=\n" + "PKT4_PREFIX_LOCAL_HWADDR_PKT4_SUFIX=\n" + "PKT4_PREFIX_LOCAL_HWADDR_TYPE_PKT4_SUFIX=\n" + "PKT4_PREFIX_REMOTE_HWADDR_PKT4_SUFIX=\n" + "PKT4_PREFIX_REMOTE_HWADDR_TYPE_PKT4_SUFIX=\n"; EXPECT_EQ(expected, join(vars)); vars.clear(); pkt4 = generatePkt4(); @@ -660,18 +660,18 @@ TEST(RunScript, extractPkt6) { Pkt6Ptr pkt6; RunScriptImpl::extractPkt6(vars, pkt6, "PKT6_PREFIX", "_PKT6_SUFIX"); ASSERT_EQ(12, vars.size()); - std::string expected = "PKT6_PREFIX_TYPE_PKT6_SUFIX=\n" - "PKT6_PREFIX_TXID_PKT6_SUFIX=\n" - "PKT6_PREFIX_LOCAL_ADDR_PKT6_SUFIX=\n" - "PKT6_PREFIX_LOCAL_PORT_PKT6_SUFIX=\n" - "PKT6_PREFIX_REMOTE_ADDR_PKT6_SUFIX=\n" - "PKT6_PREFIX_REMOTE_PORT_PKT6_SUFIX=\n" - "PKT6_PREFIX_IFACE_INDEX_PKT6_SUFIX=\n" - "PKT6_PREFIX_IFACE_NAME_PKT6_SUFIX=\n" - "PKT6_PREFIX_REMOTE_HWADDR_PKT6_SUFIX=\n" - "PKT6_PREFIX_REMOTE_HWADDR_TYPE_PKT6_SUFIX=\n" - "PKT6_PREFIX_PROTO_PKT6_SUFIX=\n" - "PKT6_PREFIX_CLIENT_ID_PKT6_SUFIX=\n"; + string expected = "PKT6_PREFIX_TYPE_PKT6_SUFIX=\n" + "PKT6_PREFIX_TXID_PKT6_SUFIX=\n" + "PKT6_PREFIX_LOCAL_ADDR_PKT6_SUFIX=\n" + "PKT6_PREFIX_LOCAL_PORT_PKT6_SUFIX=\n" + "PKT6_PREFIX_REMOTE_ADDR_PKT6_SUFIX=\n" + "PKT6_PREFIX_REMOTE_PORT_PKT6_SUFIX=\n" + "PKT6_PREFIX_IFACE_INDEX_PKT6_SUFIX=\n" + "PKT6_PREFIX_IFACE_NAME_PKT6_SUFIX=\n" + "PKT6_PREFIX_REMOTE_HWADDR_PKT6_SUFIX=\n" + "PKT6_PREFIX_REMOTE_HWADDR_TYPE_PKT6_SUFIX=\n" + "PKT6_PREFIX_PROTO_PKT6_SUFIX=\n" + "PKT6_PREFIX_CLIENT_ID_PKT6_SUFIX=\n"; EXPECT_EQ(expected, join(vars)); vars.clear(); pkt6 = generatePkt6(); @@ -711,13 +711,13 @@ public: } void checkScriptResult() { - std::ifstream test_log; - std::vector extracted_lines; + ifstream test_log; + vector extracted_lines; sleep(1); test_log.open(TEST_LOG_FILE); if (!test_log.fail()) { - std::string line; - while (std::getline(test_log, line)) { + string line; + while (getline(test_log, line)) { extracted_lines.push_back(line) ; } test_log.close(); diff --git a/src/lib/util/tests/process_spawn_app.sh.in b/src/lib/util/tests/process_spawn_app.sh.in index 7c4877c4e3..99997aa81c 100644 --- a/src/lib/util/tests/process_spawn_app.sh.in +++ b/src/lib/util/tests/process_spawn_app.sh.in @@ -50,7 +50,7 @@ do VAR_NAME=${1} shift VAR_VALUE=${1} - EXPECTED=$(env | grep "${VAR_NAME}") + EXPECTED=$(env | grep -E "^${VAR_NAME}=") if ! test "${VAR_NAME}=${VAR_VALUE}" = "${EXPECTED}"; then exit 123 fi diff --git a/src/lib/util/tests/process_spawn_unittest.cc b/src/lib/util/tests/process_spawn_unittest.cc index 6137af9d7f..6c181a8437 100644 --- a/src/lib/util/tests/process_spawn_unittest.cc +++ b/src/lib/util/tests/process_spawn_unittest.cc @@ -18,6 +18,7 @@ namespace { using namespace isc; using namespace isc::util; +using namespace std; /// @brief Returns a location of the test script. /// @@ -25,8 +26,8 @@ using namespace isc::util; /// the argument passed to it. /// /// @return Absolute location of the test script. -std::string getApp() { - std::ostringstream s; +string getApp() { + ostringstream s; s << TEST_DATA_TOPBUILDDIR << "/src/lib/util/tests/process_spawn_app.sh"; return (s.str()); } @@ -96,7 +97,7 @@ bool waitForProcessFast(const ProcessSpawn& process, const pid_t pid, // already block ProcessSpawnError is thrown (@todo the second error // case: fork() failing) TEST(ProcessSpawn, sigchldBlocked) { - std::vector args; + vector args; ProcessSpawn process(getApp(), args); sigset_t sset; sigemptyset(&sset); @@ -110,7 +111,7 @@ TEST(ProcessSpawn, sigchldBlocked) { // This test verifies that the external application can be ran with // arguments and that the exit code is gathered. TEST(ProcessSpawn, spawnWithArgs) { - std::vector args; + vector args; args.push_back("-e"); args.push_back("64"); ProcessSpawn process(getApp(), args); @@ -125,8 +126,8 @@ TEST(ProcessSpawn, spawnWithArgs) { // This test verifies that the external application can be ran with // arguments and environment variables that the exit code is gathered. TEST(ProcessSpawn, spawnWithArgsAndEnvVars) { - std::vector args; - std::vector vars; + vector args; + vector vars; args.push_back("-v"); args.push_back("TEST_VARIABLE_NAME"); args.push_back("TEST_VARIABLE_VALUE"); @@ -146,7 +147,7 @@ TEST(ProcessSpawn, spawnWithArgsAndEnvVars) { // It also checks that it is possible to clear the status of the // process. TEST(ProcessSpawn, spawnTwoProcesses) { - std::vector args; + vector args; args.push_back("-p"); ProcessSpawn process(getApp(), args); pid_t pid1 = 0; @@ -173,7 +174,7 @@ TEST(ProcessSpawn, spawnTwoProcesses) { // This test verifies that the external application can be ran without // arguments and that the exit code is gathered. TEST(ProcessSpawn, spawnNoArgs) { - std::vector args; + vector args; ProcessSpawn process(getApp()); pid_t pid = 0; ASSERT_NO_THROW(pid = process.spawn()); @@ -226,7 +227,7 @@ TEST(ProcessSpawn, getCommandLine) { TEST(ProcessSpawn, isRunning) { // Run the process which sleeps for 10 seconds, so as we have // enough time to check if it is running. - std::vector args; + vector args; args.push_back("-s"); args.push_back("10"); ProcessSpawn process(getApp(), args); @@ -248,7 +249,7 @@ TEST(ProcessSpawn, errnoInvariance) { // stumped on. errno = 123; - std::vector args; + vector args; args.push_back("-e"); args.push_back("64"); ProcessSpawn process(getApp(), args);