test: fix config tests (missing dhchap_ctrl_key)

Martin Belanger · Martin Belanger · commit 9d6516cf1743 · 2026-03-11T11:11:44.000-04:00
Signed-off-by: Martin Belanger &lt;martin.belanger@dell.com&gt;
diff --git a/libnvme/test/config/data/config-pcie-with-tcp-config.json b/libnvme/test/config/data/config-pcie-with-tcp-config.json
@@ -10,13 +10,15 @@
             "transport":"tcp",
             "traddr":"192.168.154.144",
             "trsvcid":"4420",
-            "dhchap_key":"none"
+            "dhchap_key":"none",
+            "dhchap_ctrl_key":"none"
           },
           {
             "transport":"tcp",
             "traddr":"192.168.154.144",
             "trsvcid":"4421",
-            "dhchap_key":"none"
+            "dhchap_key":"none",
+            "dhchap_ctrl_key":"none"
           }
         ]
       }
@@ -33,13 +35,15 @@
             "transport":"tcp",
             "traddr":"192.168.154.144",
             "trsvcid":"4420",
-            "dhchap_key":"none"
+            "dhchap_key":"none",
+            "dhchap_ctrl_key":"none"
           },
           {
             "transport":"tcp",
             "traddr":"192.168.154.144",
             "trsvcid":"4421",
-            "dhchap_key":"none"
+            "dhchap_key":"none",
+            "dhchap_ctrl_key":"none"
           }
         ]
       }
diff --git a/libnvme/test/config/data/config-pcie-with-tcp-config.out b/libnvme/test/config/data/config-pcie-with-tcp-config.out
@@ -10,13 +10,15 @@
             "transport":"tcp",
             "traddr":"192.168.154.144",
             "trsvcid":"4420",
-            "dhchap_key":"none"
+            "dhchap_key":"none",
+            "dhchap_ctrl_key":"none"
           },
           {
             "transport":"tcp",
             "traddr":"192.168.154.144",
             "trsvcid":"4421",
-            "dhchap_key":"none"
+            "dhchap_key":"none",
+            "dhchap_ctrl_key":"none"
           }
         ]
       }
@@ -33,13 +35,15 @@
             "transport":"tcp",
             "traddr":"192.168.154.144",
             "trsvcid":"4420",
-            "dhchap_key":"none"
+            "dhchap_key":"none",
+            "dhchap_ctrl_key":"none"
           },
           {
             "transport":"tcp",
             "traddr":"192.168.154.144",
             "trsvcid":"4421",
-            "dhchap_key":"none"
+            "dhchap_key":"none",
+            "dhchap_ctrl_key":"none"
           }
         ]
       }
diff --git a/libnvme/test/config/data/tls_key-1.json b/libnvme/test/config/data/tls_key-1.json
@@ -11,6 +11,7 @@
             "traddr":"192.168.154.148",
             "trsvcid":"4420",
             "dhchap_key":"none",
+            "dhchap_ctrl_key":"none",
             "tls":true,
             "tls_key":"NVMeTLSkey-1:01:Hhc5sFjwSZ6w5hPY19tqprajYtuYci3tN+Z2wGViDk3rpSR+:"
           }
diff --git a/libnvme/test/config/data/tls_key-1.out b/libnvme/test/config/data/tls_key-1.out
@@ -11,6 +11,7 @@
             "traddr":"192.168.154.148",
             "trsvcid":"4420",
             "dhchap_key":"none",
+            "dhchap_ctrl_key":"none",
             "tls":true,
             "tls_key":"NVMeTLSkey-1:01:Hhc5sFjwSZ6w5hPY19tqprajYtuYci3tN+Z2wGViDk3rpSR+:"
           }
diff --git a/libnvme/test/config/data/tls_key-2.json b/libnvme/test/config/data/tls_key-2.json
@@ -11,6 +11,7 @@
             "traddr":"192.168.154.148",
             "trsvcid":"4420",
             "dhchap_key":"none",
+            "dhchap_ctrl_key":"none",
             "tls":true,
             "tls_psk_identity":"NVMe1R01 nqn.2014-08.org.nvmexpress:uuid:befdec4c-2234-11b2-a85c-ca77c773af36 nqn.io-1 QMFIifx2SCVnlE2hc4MQb0r+2g56x3G7P6jJtDiYK+I=",
             "tls_key":"NVMeTLSkey-1:01:Hhc5sFjwSZ6w5hPY19tqprajYtuYci3tN+Z2wGViDk3rpSR+:"
diff --git a/libnvme/test/config/data/tls_key-2.out b/libnvme/test/config/data/tls_key-2.out
@@ -11,6 +11,7 @@
             "traddr":"192.168.154.148",
             "trsvcid":"4420",
             "dhchap_key":"none",
+            "dhchap_ctrl_key":"none",
             "tls":true,
             "tls_key":"NVMeTLSkey-1:01:Hhc5sFjwSZ6w5hPY19tqprajYtuYci3tN+Z2wGViDk3rpSR+:"
           }

Original file line number	Diff line number	Diff line change
`@@ -10,13 +10,15 @@`
`10`	`10`	`"transport":"tcp",`
`11`	`11`	`"traddr":"192.168.154.144",`
`12`	`12`	`"trsvcid":"4420",`
`13`		`- "dhchap_key":"none"`
	`13`	`+ "dhchap_key":"none",`
	`14`	`+ "dhchap_ctrl_key":"none"`
`14`	`15`	`},`
`15`	`16`	`{`
`16`	`17`	`"transport":"tcp",`
`17`	`18`	`"traddr":"192.168.154.144",`
`18`	`19`	`"trsvcid":"4421",`
`19`		`- "dhchap_key":"none"`
	`20`	`+ "dhchap_key":"none",`
	`21`	`+ "dhchap_ctrl_key":"none"`
`20`	`22`	`}`
`21`	`23`	`]`
`22`	`24`	`}`
`@@ -33,13 +35,15 @@`
`33`	`35`	`"transport":"tcp",`
`34`	`36`	`"traddr":"192.168.154.144",`
`35`	`37`	`"trsvcid":"4420",`
`36`		`- "dhchap_key":"none"`
	`38`	`+ "dhchap_key":"none",`
	`39`	`+ "dhchap_ctrl_key":"none"`
`37`	`40`	`},`
`38`	`41`	`{`
`39`	`42`	`"transport":"tcp",`
`40`	`43`	`"traddr":"192.168.154.144",`
`41`	`44`	`"trsvcid":"4421",`
`42`		`- "dhchap_key":"none"`
	`45`	`+ "dhchap_key":"none",`
	`46`	`+ "dhchap_ctrl_key":"none"`
`43`	`47`	`}`
`44`	`48`	`]`
`45`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`"traddr":"192.168.154.148",`
`12`	`12`	`"trsvcid":"4420",`
`13`	`13`	`"dhchap_key":"none",`
	`14`	`+ "dhchap_ctrl_key":"none",`
`14`	`15`	`"tls":true,`
`15`	`16`	`"tls_key":"NVMeTLSkey-1:01:Hhc5sFjwSZ6w5hPY19tqprajYtuYci3tN+Z2wGViDk3rpSR+:"`
`16`	`17`	`}`