[#899] changed variables with ID_ID to ID

diff --git a/src/hooks/dhcp/run_script/run_script.cc b/src/hooks/dhcp/run_script/run_script.cc
index 77fdcdf9f0c0253b92fe6d14c3a2908d3c830cf8..59287dc58d82b7d6812c05910f1e1ba48d0b4ae6 100644 (file)
--- a/src/hooks/dhcp/run_script/run_script.cc
+++ b/src/hooks/dhcp/run_script/run_script.cc
@@ -106,9 +106,9 @@ RunScriptImpl::extractDUID(isc::util::ProcessEnvVars& vars,
     std::string data = "";
     if (duid) {
         RunScriptImpl::extractString(vars, duid->toText(),
-                                     prefix + "_ID", sufix);
+                                     prefix, sufix);
     } else {
-        RunScriptImpl::extractString(vars, "", prefix + "_ID", sufix);
+        RunScriptImpl::extractString(vars, "", prefix, sufix);
     }
 }
 

diff --git a/src/hooks/dhcp/run_script/run_script.dox b/src/hooks/dhcp/run_script/run_script.dox
index 388e31dfc7ab7cfce445ff5fa9a99cada0de5d40..a4fb12334554b720d4cc190195a4ffe4328bb55d 100644 (file)
--- a/src/hooks/dhcp/run_script/run_script.dox
+++ b/src/hooks/dhcp/run_script/run_script.dox
@@ -217,7 +217,7 @@ SUBNET4_ID=
 SUBNET4_NAME=
 SUBNET4_PREFIX=
 SUBNET4_PREFIX_LEN=
-PKT4_CLIENT_ID_ID=
+PKT4_CLIENT_ID=
 PKT4_HWADDR=
 PKT4_HWADDR_TYPE=
 LEASE4_ADDRESS=
@@ -228,7 +228,7 @@ LEASE4_HWADDR_TYPE=
 LEASE4_STATE=
 LEASE4_SUBNET_ID=
 LEASE4_VALID_LIFETIME=
-LEASE4_CLIENT_ID_ID=
+LEASE4_CLIENT_ID=
 
 @endcode
 
@@ -244,7 +244,7 @@ LEASE4_HWADDR_TYPE=
 LEASE4_STATE=
 LEASE4_SUBNET_ID=
 LEASE4_VALID_LIFETIME=
-LEASE4_CLIENT_ID_ID=
+LEASE4_CLIENT_ID=
 REMOVE_LEASE=
 
 @endcode
@@ -261,7 +261,7 @@ LEASE4_HWADDR_TYPE=
 LEASE4_STATE=
 LEASE4_SUBNET_ID=
 LEASE4_VALID_LIFETIME=
-LEASE4_CLIENT_ID_ID=
+LEASE4_CLIENT_ID=
 
 @endcode
 
@@ -310,7 +310,7 @@ LEASES4_AT0_HWADDR_TYPE=
 LEASES4_AT0_STATE=
 LEASES4_AT0_SUBNET_ID=
 LEASES4_AT0_VALID_LIFETIME=
-LEASES4_AT0_CLIENT_ID_ID=
+LEASES4_AT0_CLIENT_ID=
 DELETED_LEASES4_AT0_ADDRESS=
 DELETED_LEASES4_AT0_CLTT=
 DELETED_LEASES4_AT0_HOSTNAME=
@@ -319,7 +319,7 @@ DELETED_LEASES4_AT0_HWADDR_TYPE=
 DELETED_LEASES4_AT0_STATE=
 DELETED_LEASES4_AT0_SUBNET_ID=
 DELETED_LEASES4_AT0_VALID_LIFETIME=
-DELETED_LEASES4_AT0_CLIENT_ID_ID=
+DELETED_LEASES4_AT0_CLIENT_ID=
 
 @endcode
 
@@ -357,7 +357,7 @@ LEASE4_HWADDR_TYPE=
 LEASE4_STATE=
 LEASE4_SUBNET_ID=
 LEASE4_VALID_LIFETIME=
-LEASE4_CLIENT_ID_ID=
+LEASE4_CLIENT_ID=
 
 @endcode
 
@@ -395,7 +395,7 @@ LEASE4_HWADDR_TYPE=
 LEASE4_STATE=
 LEASE4_SUBNET_ID=
 LEASE4_VALID_LIFETIME=
-LEASE4_CLIENT_ID_ID=
+LEASE4_CLIENT_ID=
 
 @endcode
 
@@ -414,7 +414,7 @@ QUERY6_IFACE_NAME=
 QUERY6_REMOTE_HWADDR=
 QUERY6_REMOTE_HWADDR_TYPE=
 QUERY6_PROTO=
-QUERY6_CLIENT_ID_ID=
+QUERY6_CLIENT_ID=
 LEASE6_ADDRESS=
 LEASE6_CLTT=
 LEASE6_HOSTNAME=
@@ -423,7 +423,7 @@ LEASE6_HWADDR_TYPE=
 LEASE6_STATE=
 LEASE6_SUBNET_ID=
 LEASE6_VALID_LIFETIME=
-LEASE6_DUID_ID=
+LEASE6_DUID=
 LEASE6_IAID=
 LEASE6_PREFERRED_LIFETIME=
 LEASE6_PREFIX_LEN=
@@ -450,7 +450,7 @@ QUERY6_IFACE_NAME=
 QUERY6_REMOTE_HWADDR=
 QUERY6_REMOTE_HWADDR_TYPE=
 QUERY6_PROTO=
-QUERY6_CLIENT_ID_ID=
+QUERY6_CLIENT_ID=
 LEASE6_ADDRESS=
 LEASE6_CLTT=
 LEASE6_HOSTNAME=
@@ -459,7 +459,7 @@ LEASE6_HWADDR_TYPE=
 LEASE6_STATE=
 LEASE6_SUBNET_ID=
 LEASE6_VALID_LIFETIME=
-LEASE6_DUID_ID=
+LEASE6_DUID=
 LEASE6_IAID=
 LEASE6_PREFERRED_LIFETIME=
 LEASE6_PREFIX_LEN=
@@ -483,7 +483,7 @@ LEASE6_HWADDR_TYPE=
 LEASE6_STATE=
 LEASE6_SUBNET_ID=
 LEASE6_VALID_LIFETIME=
-LEASE6_DUID_ID=
+LEASE6_DUID=
 LEASE6_IAID=
 LEASE6_PREFERRED_LIFETIME=
 LEASE6_PREFIX_LEN=
@@ -504,7 +504,7 @@ LEASE6_HWADDR_TYPE=
 LEASE6_STATE=
 LEASE6_SUBNET_ID=
 LEASE6_VALID_LIFETIME=
-LEASE6_DUID_ID=
+LEASE6_DUID=
 LEASE6_IAID=
 LEASE6_PREFERRED_LIFETIME=
 LEASE6_PREFIX_LEN=
@@ -527,7 +527,7 @@ QUERY6_IFACE_NAME=
 QUERY6_REMOTE_HWADDR=
 QUERY6_REMOTE_HWADDR_TYPE=
 QUERY6_PROTO=
-QUERY6_CLIENT_ID_ID=
+QUERY6_CLIENT_ID=
 LEASES6_SIZE=
 DELETED_LEASES6_SIZE=
 
@@ -547,7 +547,7 @@ LEASES6_AT0_HWADDR_TYPE=
 LEASES6_AT0_STATE=
 LEASES6_AT0_SUBNET_ID=
 LEASES6_AT0_VALID_LIFETIME=
-LEASES6_AT0_DUID_ID=
+LEASES6_AT0_DUID=
 LEASES6_AT0_IAID=
 LEASES6_AT0_PREFERRED_LIFETIME=
 LEASES6_AT0_PREFIX_LEN=
@@ -560,7 +560,7 @@ DELETED_LEASES6_AT0_HWADDR_TYPE=
 DELETED_LEASES6_AT0_STATE=
 DELETED_LEASES6_AT0_SUBNET_ID=
 DELETED_LEASES6_AT0_VALID_LIFETIME=
-DELETED_LEASES6_AT0_DUID_ID=
+DELETED_LEASES6_AT0_DUID=
 DELETED_LEASES6_AT0_IAID=
 DELETED_LEASES6_AT0_PREFERRED_LIFETIME=
 DELETED_LEASES6_AT0_PREFIX_LEN=
@@ -583,7 +583,7 @@ QUERY6_IFACE_NAME=
 QUERY6_REMOTE_HWADDR=
 QUERY6_REMOTE_HWADDR_TYPE=
 QUERY6_PROTO=
-QUERY6_CLIENT_ID_ID=
+QUERY6_CLIENT_ID=
 LEASE6_ADDRESS=
 LEASE6_CLTT=
 LEASE6_HOSTNAME=
@@ -592,7 +592,7 @@ LEASE6_HWADDR_TYPE=
 LEASE6_STATE=
 LEASE6_SUBNET_ID=
 LEASE6_VALID_LIFETIME=
-LEASE6_DUID_ID=
+LEASE6_DUID=
 LEASE6_IAID=
 LEASE6_PREFERRED_LIFETIME=
 LEASE6_PREFIX_LEN=
@@ -615,7 +615,7 @@ QUERY6_IFACE_NAME=
 QUERY6_REMOTE_HWADDR=
 QUERY6_REMOTE_HWADDR_TYPE=
 QUERY6_PROTO=
-QUERY6_CLIENT_ID_ID=
+QUERY6_CLIENT_ID=
 LEASE6_ADDRESS=
 LEASE6_CLTT=
 LEASE6_HOSTNAME=
@@ -624,7 +624,7 @@ LEASE6_HWADDR_TYPE=
 LEASE6_STATE=
 LEASE6_SUBNET_ID=
 LEASE6_VALID_LIFETIME=
-LEASE6_DUID_ID=
+LEASE6_DUID=
 LEASE6_IAID=
 LEASE6_PREFERRED_LIFETIME=
 LEASE6_PREFIX_LEN=

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 66c033ffb636d338b9dca4213ab4208c88835375..2bacffc3d2d5ab054c4a5b565871c04aa0485fab 100644 (file)
--- a/src/hooks/dhcp/run_script/tests/run_script_test.sh.in
+++ b/src/hooks/dhcp/run_script/tests/run_script_test.sh.in
@@ -68,7 +68,7 @@ lease4_renew () {
     TEST_EQ "SUBNET4_NAME" "182.168.0.1/2"
     TEST_EQ "SUBNET4_PREFIX" "182.168.0.1"
     TEST_EQ "SUBNET4_PREFIX_LEN" "2"
-    TEST_EQ "PKT4_CLIENT_ID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "PKT4_CLIENT_ID" "00:01:02:03:04:05:06"
     TEST_EQ "PKT4_HWADDR" "00:01:02:03"
     TEST_EQ "PKT4_HWADDR_TYPE" "1"
     TEST_EQ "LEASE4_ADDRESS" "192.168.0.1"
@@ -79,7 +79,7 @@ lease4_renew () {
     TEST_EQ "LEASE4_STATE" "default"
     TEST_EQ "LEASE4_SUBNET_ID" "4"
     TEST_EQ "LEASE4_VALID_LIFETIME" "2"
-    TEST_EQ "LEASE4_CLIENT_ID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "LEASE4_CLIENT_ID" "00:01:02:03:04:05:06"
     ECHO_TO_FILE "SUCCESS"
 }
 
@@ -92,7 +92,7 @@ lease4_expire () {
     TEST_EQ "LEASE4_STATE" "default"
     TEST_EQ "LEASE4_SUBNET_ID" "4"
     TEST_EQ "LEASE4_VALID_LIFETIME" "2"
-    TEST_EQ "LEASE4_CLIENT_ID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "LEASE4_CLIENT_ID" "00:01:02:03:04:05:06"
     TEST_EQ "REMOVE_LEASE" "1"
     ECHO_TO_FILE "SUCCESS"
 }
@@ -106,7 +106,7 @@ lease4_recover () {
     TEST_EQ "LEASE4_STATE" "default"
     TEST_EQ "LEASE4_SUBNET_ID" "4"
     TEST_EQ "LEASE4_VALID_LIFETIME" "2"
-    TEST_EQ "LEASE4_CLIENT_ID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "LEASE4_CLIENT_ID" "00:01:02:03:04:05:06"
     ECHO_TO_FILE "SUCCESS"
 }
 
@@ -142,7 +142,7 @@ leases4_committed () {
     TEST_EQ "LEASES4_AT0_STATE" ""
     TEST_EQ "LEASES4_AT0_SUBNET_ID" ""
     TEST_EQ "LEASES4_AT0_VALID_LIFETIME" ""
-    TEST_EQ "LEASES4_AT0_CLIENT_ID_ID" ""
+    TEST_EQ "LEASES4_AT0_CLIENT_ID" ""
     TEST_EQ "LEASES4_AT1_ADDRESS" "192.168.0.1"
     TEST_EQ "LEASES4_AT1_CLTT" "3"
     TEST_EQ "LEASES4_AT1_HOSTNAME" "test.hostname"
@@ -151,7 +151,7 @@ leases4_committed () {
     TEST_EQ "LEASES4_AT1_STATE" "default"
     TEST_EQ "LEASES4_AT1_SUBNET_ID" "4"
     TEST_EQ "LEASES4_AT1_VALID_LIFETIME" "2"
-    TEST_EQ "LEASES4_AT1_CLIENT_ID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "LEASES4_AT1_CLIENT_ID" "00:01:02:03:04:05:06"
     TEST_EQ "DELETED_LEASES4_SIZE" "2"
     TEST_EQ "DELETED_LEASES4_AT0_ADDRESS" "192.168.0.1"
     TEST_EQ "DELETED_LEASES4_AT0_CLTT" "3"
@@ -161,7 +161,7 @@ leases4_committed () {
     TEST_EQ "DELETED_LEASES4_AT0_STATE" "default"
     TEST_EQ "DELETED_LEASES4_AT0_SUBNET_ID" "4"
     TEST_EQ "DELETED_LEASES4_AT0_VALID_LIFETIME" "2"
-    TEST_EQ "DELETED_LEASES4_AT0_CLIENT_ID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "DELETED_LEASES4_AT0_CLIENT_ID" "00:01:02:03:04:05:06"
     TEST_EQ "DELETED_LEASES4_AT1_ADDRESS" ""
     TEST_EQ "DELETED_LEASES4_AT1_CLTT" ""
     TEST_EQ "DELETED_LEASES4_AT1_HOSTNAME" ""
@@ -170,7 +170,7 @@ leases4_committed () {
     TEST_EQ "DELETED_LEASES4_AT1_STATE" ""
     TEST_EQ "DELETED_LEASES4_AT1_SUBNET_ID" ""
     TEST_EQ "DELETED_LEASES4_AT1_VALID_LIFETIME" ""
-    TEST_EQ "DELETED_LEASES4_AT1_CLIENT_ID_ID" ""
+    TEST_EQ "DELETED_LEASES4_AT1_CLIENT_ID" ""
     ECHO_TO_FILE "SUCCESS"
 }
 
@@ -205,7 +205,7 @@ lease4_release () {
     TEST_EQ "LEASE4_STATE" "default"
     TEST_EQ "LEASE4_SUBNET_ID" "4"
     TEST_EQ "LEASE4_VALID_LIFETIME" "2"
-    TEST_EQ "LEASE4_CLIENT_ID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "LEASE4_CLIENT_ID" "00:01:02:03:04:05:06"
     ECHO_TO_FILE "SUCCESS"
 }
 
@@ -240,7 +240,7 @@ lease4_decline () {
     TEST_EQ "LEASE4_STATE" "default"
     TEST_EQ "LEASE4_SUBNET_ID" "4"
     TEST_EQ "LEASE4_VALID_LIFETIME" "2"
-    TEST_EQ "LEASE4_CLIENT_ID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "LEASE4_CLIENT_ID" "00:01:02:03:04:05:06"
     ECHO_TO_FILE "SUCCESS"
 }
 
@@ -256,7 +256,7 @@ lease6_renew () {
     TEST_EQ "QUERY6_REMOTE_HWADDR" "00:01:02:03"
     TEST_EQ "QUERY6_REMOTE_HWADDR_TYPE" "1"
     TEST_EQ "QUERY6_PROTO" "UDP"
-    TEST_EQ "QUERY6_CLIENT_ID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "QUERY6_CLIENT_ID" "00:01:02:03:04:05:06"
     TEST_EQ "LEASE6_ADDRESS" "2003:db8::1"
     TEST_EQ "LEASE6_CLTT" "7"
     TEST_EQ "LEASE6_HOSTNAME" "test.hostname"
@@ -265,7 +265,7 @@ lease6_renew () {
     TEST_EQ "LEASE6_STATE" "default"
     TEST_EQ "LEASE6_SUBNET_ID" "5"
     TEST_EQ "LEASE6_VALID_LIFETIME" "4"
-    TEST_EQ "LEASE6_DUID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "LEASE6_DUID" "00:01:02:03:04:05:06"
     TEST_EQ "LEASE6_IAID" "2"
     TEST_EQ "LEASE6_PREFERRED_LIFETIME" "3"
     TEST_EQ "LEASE6_PREFIX_LEN" "128"
@@ -289,7 +289,7 @@ lease6_rebind () {
     TEST_EQ "QUERY6_REMOTE_HWADDR" "00:01:02:03"
     TEST_EQ "QUERY6_REMOTE_HWADDR_TYPE" "1"
     TEST_EQ "QUERY6_PROTO" "UDP"
-    TEST_EQ "QUERY6_CLIENT_ID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "QUERY6_CLIENT_ID" "00:01:02:03:04:05:06"
     TEST_EQ "LEASE6_ADDRESS" "2003:db8::1"
     TEST_EQ "LEASE6_CLTT" "7"
     TEST_EQ "LEASE6_HOSTNAME" "test.hostname"
@@ -298,7 +298,7 @@ lease6_rebind () {
     TEST_EQ "LEASE6_STATE" "default"
     TEST_EQ "LEASE6_SUBNET_ID" "5"
     TEST_EQ "LEASE6_VALID_LIFETIME" "4"
-    TEST_EQ "LEASE6_DUID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "LEASE6_DUID" "00:01:02:03:04:05:06"
     TEST_EQ "LEASE6_IAID" "2"
     TEST_EQ "LEASE6_PREFERRED_LIFETIME" "3"
     TEST_EQ "LEASE6_PREFIX_LEN" "128"
@@ -319,7 +319,7 @@ lease6_expire () {
     TEST_EQ "LEASE6_STATE" "default"
     TEST_EQ "LEASE6_SUBNET_ID" "5"
     TEST_EQ "LEASE6_VALID_LIFETIME" "4"
-    TEST_EQ "LEASE6_DUID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "LEASE6_DUID" "00:01:02:03:04:05:06"
     TEST_EQ "LEASE6_IAID" "2"
     TEST_EQ "LEASE6_PREFERRED_LIFETIME" "3"
     TEST_EQ "LEASE6_PREFIX_LEN" "128"
@@ -337,7 +337,7 @@ lease6_recover () {
     TEST_EQ "LEASE6_STATE" "default"
     TEST_EQ "LEASE6_SUBNET_ID" "5"
     TEST_EQ "LEASE6_VALID_LIFETIME" "4"
-    TEST_EQ "LEASE6_DUID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "LEASE6_DUID" "00:01:02:03:04:05:06"
     TEST_EQ "LEASE6_IAID" "2"
     TEST_EQ "LEASE6_PREFERRED_LIFETIME" "3"
     TEST_EQ "LEASE6_PREFIX_LEN" "128"
@@ -357,7 +357,7 @@ leases6_committed () {
     TEST_EQ "QUERY6_REMOTE_HWADDR" "00:01:02:03"
     TEST_EQ "QUERY6_REMOTE_HWADDR_TYPE" "1"
     TEST_EQ "QUERY6_PROTO" "UDP"
-    TEST_EQ "QUERY6_CLIENT_ID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "QUERY6_CLIENT_ID" "00:01:02:03:04:05:06"
     TEST_EQ "LEASES6_SIZE" "2"
     TEST_EQ "LEASES6_AT0_ADDRESS" ""
     TEST_EQ "LEASES6_AT0_CLTT" ""
@@ -367,7 +367,7 @@ leases6_committed () {
     TEST_EQ "LEASES6_AT0_STATE" ""
     TEST_EQ "LEASES6_AT0_SUBNET_ID" ""
     TEST_EQ "LEASES6_AT0_VALID_LIFETIME" ""
-    TEST_EQ "LEASES6_AT0_DUID_ID" ""
+    TEST_EQ "LEASES6_AT0_DUID" ""
     TEST_EQ "LEASES6_AT0_IAID" ""
     TEST_EQ "LEASES6_AT0_PREFERRED_LIFETIME" ""
     TEST_EQ "LEASES6_AT0_PREFIX_LEN" ""
@@ -380,7 +380,7 @@ leases6_committed () {
     TEST_EQ "LEASES6_AT1_STATE" "default"
     TEST_EQ "LEASES6_AT1_SUBNET_ID" "5"
     TEST_EQ "LEASES6_AT1_VALID_LIFETIME" "4"
-    TEST_EQ "LEASES6_AT1_DUID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "LEASES6_AT1_DUID" "00:01:02:03:04:05:06"
     TEST_EQ "LEASES6_AT1_IAID" "2"
     TEST_EQ "LEASES6_AT1_PREFERRED_LIFETIME" "3"
     TEST_EQ "LEASES6_AT1_PREFIX_LEN" "128"
@@ -394,7 +394,7 @@ leases6_committed () {
     TEST_EQ "DELETED_LEASES6_AT0_STATE" "default"
     TEST_EQ "DELETED_LEASES6_AT0_SUBNET_ID" "5"
     TEST_EQ "DELETED_LEASES6_AT0_VALID_LIFETIME" "4"
-    TEST_EQ "DELETED_LEASES6_AT0_DUID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "DELETED_LEASES6_AT0_DUID" "00:01:02:03:04:05:06"
     TEST_EQ "DELETED_LEASES6_AT0_IAID" "2"
     TEST_EQ "DELETED_LEASES6_AT0_PREFERRED_LIFETIME" "3"
     TEST_EQ "DELETED_LEASES6_AT0_PREFIX_LEN" "128"
@@ -407,7 +407,7 @@ leases6_committed () {
     TEST_EQ "DELETED_LEASES6_AT1_STATE" ""
     TEST_EQ "DELETED_LEASES6_AT1_SUBNET_ID" ""
     TEST_EQ "DELETED_LEASES6_AT1_VALID_LIFETIME" ""
-    TEST_EQ "DELETED_LEASES6_AT1_DUID_ID" ""
+    TEST_EQ "DELETED_LEASES6_AT1_DUID" ""
     TEST_EQ "DELETED_LEASES6_AT1_IAID" ""
     TEST_EQ "DELETED_LEASES6_AT1_PREFERRED_LIFETIME" ""
     TEST_EQ "DELETED_LEASES6_AT1_PREFIX_LEN" ""
@@ -427,7 +427,7 @@ lease6_release () {
     TEST_EQ "QUERY6_REMOTE_HWADDR" "00:01:02:03"
     TEST_EQ "QUERY6_REMOTE_HWADDR_TYPE" "1"
     TEST_EQ "QUERY6_PROTO" "UDP"
-    TEST_EQ "QUERY6_CLIENT_ID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "QUERY6_CLIENT_ID" "00:01:02:03:04:05:06"
     TEST_EQ "LEASE6_ADDRESS" "2003:db8::1"
     TEST_EQ "LEASE6_CLTT" "7"
     TEST_EQ "LEASE6_HOSTNAME" "test.hostname"
@@ -436,7 +436,7 @@ lease6_release () {
     TEST_EQ "LEASE6_STATE" "default"
     TEST_EQ "LEASE6_SUBNET_ID" "5"
     TEST_EQ "LEASE6_VALID_LIFETIME" "4"
-    TEST_EQ "LEASE6_DUID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "LEASE6_DUID" "00:01:02:03:04:05:06"
     TEST_EQ "LEASE6_IAID" "2"
     TEST_EQ "LEASE6_PREFERRED_LIFETIME" "3"
     TEST_EQ "LEASE6_PREFIX_LEN" "128"
@@ -456,7 +456,7 @@ lease6_decline () {
     TEST_EQ "QUERY6_REMOTE_HWADDR" "00:01:02:03"
     TEST_EQ "QUERY6_REMOTE_HWADDR_TYPE" "1"
     TEST_EQ "QUERY6_PROTO" "UDP"
-    TEST_EQ "QUERY6_CLIENT_ID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "QUERY6_CLIENT_ID" "00:01:02:03:04:05:06"
     TEST_EQ "LEASE6_ADDRESS" "2003:db8::1"
     TEST_EQ "LEASE6_CLTT" "7"
     TEST_EQ "LEASE6_HOSTNAME" "test.hostname"
@@ -465,7 +465,7 @@ lease6_decline () {
     TEST_EQ "LEASE6_STATE" "default"
     TEST_EQ "LEASE6_SUBNET_ID" "5"
     TEST_EQ "LEASE6_VALID_LIFETIME" "4"
-    TEST_EQ "LEASE6_DUID_ID" "00:01:02:03:04:05:06"
+    TEST_EQ "LEASE6_DUID" "00:01:02:03:04:05:06"
     TEST_EQ "LEASE6_IAID" "2"
     TEST_EQ "LEASE6_PREFERRED_LIFETIME" "3"
     TEST_EQ "LEASE6_PREFIX_LEN" "128"

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 07319292a1a3edeac96665778f6e3fed43ce5dd8..c857753d0f0328f68c067ba0cdac3ee5f8ca44ce 100644 (file)
--- a/src/hooks/dhcp/run_script/tests/run_script_unittests.cc
+++ b/src/hooks/dhcp/run_script/tests/run_script_unittests.cc
@@ -368,13 +368,13 @@ TEST(RunScript, extractDUID) {
     DuidPtr duid;
     RunScriptImpl::extractDUID(vars, duid, "DUID_PREFIX", "_DUID_SUFIX");
     ASSERT_EQ(1, vars.size());
-    std::string expected = "DUID_PREFIX_ID_DUID_SUFIX=\n";
+    std::string expected = "DUID_PREFIX_DUID_SUFIX=\n";
     EXPECT_EQ(expected, join(vars));
     vars.clear();
     duid = generateDUID();
     RunScriptImpl::extractDUID(vars, duid, "DUID_PREFIX", "_DUID_SUFIX");
     ASSERT_EQ(1, vars.size());
-    expected = "DUID_PREFIX_ID_DUID_SUFIX=00:01:02:03:04:05:06\n";
+    expected = "DUID_PREFIX_DUID_SUFIX=00:01:02:03:04:05:06\n";
     EXPECT_EQ(expected, join(vars));
 }
 
@@ -458,7 +458,7 @@ TEST(RunScript, extractLease4) {
                            "LEASE4_PREFIX_STATE_LEASE4_SUFIX=\n"
                            "LEASE4_PREFIX_SUBNET_ID_LEASE4_SUFIX=\n"
                            "LEASE4_PREFIX_VALID_LIFETIME_LEASE4_SUFIX=\n"
-                           "LEASE4_PREFIX_CLIENT_ID_ID_LEASE4_SUFIX=\n";
+                           "LEASE4_PREFIX_CLIENT_ID_LEASE4_SUFIX=\n";
     EXPECT_EQ(expected, join(vars));
     vars.clear();
     lease4 = generateLease4();
@@ -472,7 +472,7 @@ TEST(RunScript, extractLease4) {
                "LEASE4_PREFIX_STATE_LEASE4_SUFIX=default\n"
                "LEASE4_PREFIX_SUBNET_ID_LEASE4_SUFIX=4\n"
                "LEASE4_PREFIX_VALID_LIFETIME_LEASE4_SUFIX=2\n"
-               "LEASE4_PREFIX_CLIENT_ID_ID_LEASE4_SUFIX=00:01:02:03:04:05:06\n";
+               "LEASE4_PREFIX_CLIENT_ID_LEASE4_SUFIX=00:01:02:03:04:05:06\n";
     EXPECT_EQ(expected, join(vars));
 }
 
@@ -490,7 +490,7 @@ TEST(RunScript, extractLease6) {
                            "LEASE6_PREFIX_STATE_LEASE6_SUFIX=\n"
                            "LEASE6_PREFIX_SUBNET_ID_LEASE6_SUFIX=\n"
                            "LEASE6_PREFIX_VALID_LIFETIME_LEASE6_SUFIX=\n"
-                           "LEASE6_PREFIX_DUID_ID_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"
@@ -508,7 +508,7 @@ TEST(RunScript, extractLease6) {
                "LEASE6_PREFIX_STATE_LEASE6_SUFIX=default\n"
                "LEASE6_PREFIX_SUBNET_ID_LEASE6_SUFIX=5\n"
                "LEASE6_PREFIX_VALID_LIFETIME_LEASE6_SUFIX=4\n"
-               "LEASE6_PREFIX_DUID_ID_LEASE6_SUFIX=00:01:02:03:04:05:06\n"
+               "LEASE6_PREFIX_DUID_LEASE6_SUFIX=00:01:02:03:04:05:06\n"
                "LEASE6_PREFIX_IAID_LEASE6_SUFIX=2\n"
                "LEASE6_PREFIX_PREFERRED_LIFETIME_LEASE6_SUFIX=3\n"
                "LEASE6_PREFIX_PREFIX_LEN_LEASE6_SUFIX=128\n"
@@ -539,7 +539,7 @@ TEST(RunScript, extractLeases4) {
                "LEASES4_PREFIX_AT0_STATE_LEASES4_SUFIX=default\n"
                "LEASES4_PREFIX_AT0_SUBNET_ID_LEASES4_SUFIX=4\n"
                "LEASES4_PREFIX_AT0_VALID_LIFETIME_LEASES4_SUFIX=2\n"
-               "LEASES4_PREFIX_AT0_CLIENT_ID_ID_LEASES4_SUFIX=00:01:02:03:04:05:06\n"
+               "LEASES4_PREFIX_AT0_CLIENT_ID_LEASES4_SUFIX=00:01:02:03:04:05:06\n"
                "LEASES4_PREFIX_AT1_ADDRESS_LEASES4_SUFIX=192.168.0.1\n"
                "LEASES4_PREFIX_AT1_CLTT_LEASES4_SUFIX=3\n"
                "LEASES4_PREFIX_AT1_HOSTNAME_LEASES4_SUFIX=test.hostname\n"
@@ -548,7 +548,7 @@ TEST(RunScript, extractLeases4) {
                "LEASES4_PREFIX_AT1_STATE_LEASES4_SUFIX=default\n"
                "LEASES4_PREFIX_AT1_SUBNET_ID_LEASES4_SUFIX=4\n"
                "LEASES4_PREFIX_AT1_VALID_LIFETIME_LEASES4_SUFIX=2\n"
-               "LEASES4_PREFIX_AT1_CLIENT_ID_ID_LEASES4_SUFIX=00:01:02:03:04:05:06\n";
+               "LEASES4_PREFIX_AT1_CLIENT_ID_LEASES4_SUFIX=00:01:02:03:04:05:06\n";
     EXPECT_EQ(expected, join(vars));
 }
 
@@ -575,7 +575,7 @@ TEST(RunScript, extractLeases6) {
                "LEASES6_PREFIX_AT0_STATE_LEASES6_SUFIX=default\n"
                "LEASES6_PREFIX_AT0_SUBNET_ID_LEASES6_SUFIX=5\n"
                "LEASES6_PREFIX_AT0_VALID_LIFETIME_LEASES6_SUFIX=4\n"
-               "LEASES6_PREFIX_AT0_DUID_ID_LEASES6_SUFIX=00:01:02:03:04:05:06\n"
+               "LEASES6_PREFIX_AT0_DUID_LEASES6_SUFIX=00:01:02:03:04:05:06\n"
                "LEASES6_PREFIX_AT0_IAID_LEASES6_SUFIX=2\n"
                "LEASES6_PREFIX_AT0_PREFERRED_LIFETIME_LEASES6_SUFIX=3\n"
                "LEASES6_PREFIX_AT0_PREFIX_LEN_LEASES6_SUFIX=128\n"
@@ -588,7 +588,7 @@ TEST(RunScript, extractLeases6) {
                "LEASES6_PREFIX_AT1_STATE_LEASES6_SUFIX=default\n"
                "LEASES6_PREFIX_AT1_SUBNET_ID_LEASES6_SUFIX=5\n"
                "LEASES6_PREFIX_AT1_VALID_LIFETIME_LEASES6_SUFIX=4\n"
-               "LEASES6_PREFIX_AT1_DUID_ID_LEASES6_SUFIX=00:01:02:03:04:05:06\n"
+               "LEASES6_PREFIX_AT1_DUID_LEASES6_SUFIX=00:01:02:03:04:05:06\n"
                "LEASES6_PREFIX_AT1_IAID_LEASES6_SUFIX=2\n"
                "LEASES6_PREFIX_AT1_PREFERRED_LIFETIME_LEASES6_SUFIX=3\n"
                "LEASES6_PREFIX_AT1_PREFIX_LEN_LEASES6_SUFIX=128\n"
@@ -671,7 +671,7 @@ TEST(RunScript, extractPkt6) {
                            "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_ID_PKT6_SUFIX=\n";
+                           "PKT6_PREFIX_CLIENT_ID_PKT6_SUFIX=\n";
     EXPECT_EQ(expected, join(vars));
     vars.clear();
     pkt6 = generatePkt6();
@@ -688,7 +688,7 @@ TEST(RunScript, extractPkt6) {
                "PKT6_PREFIX_REMOTE_HWADDR_PKT6_SUFIX=00:01:02:03\n"
                "PKT6_PREFIX_REMOTE_HWADDR_TYPE_PKT6_SUFIX=1\n"
                "PKT6_PREFIX_PROTO_PKT6_SUFIX=UDP\n"
-               "PKT6_PREFIX_CLIENT_ID_ID_PKT6_SUFIX=00:01:02:03:04:05:06\n";
+               "PKT6_PREFIX_CLIENT_ID_PKT6_SUFIX=00:01:02:03:04:05:06\n";
     EXPECT_EQ(expected, join(vars));
 }