Updated BSDNvmecli and a nvme test case to run on freebsd. (#3829)

Author: r-dailey

lisa/tools/nvmecli.py

@@ -170,6 +170,16 @@ class BSDNvmecli(Nvmecli):
     # nvme0ns1 (1831420MB)
     # nvme10ns12 (1831420MB)
     _namespace_cli_pattern = re.compile(r"(?P<namespace>nvme\d+ns\d+)")
+    # nvme0ns1 (10293847MB)
+    _devicename_from_namespace_pattern = re.compile(r"(?P<devicename>nvme\d+)ns\d+")
+    # Total NVM Capacity:          1920383410176 bytes
+    _total_storage_pattern = re.compile(
+        r"Total NVM Capacity:\s+(?P<storage>\d+)\s+bytes"
+    )
+    # Format NVM:                  Supported
+    __format_device_support = "Format NVM:                  Supported"
+    # Namespace Management:        Supported
+    __ns_management_attachement_support = "Namespace Management:        Supported"
 
     @property
     def command(self) -> str:
@@ -196,3 +206,55 @@ def get_namespaces(self, force_run: bool = False) -> List[str]:
                 namespaces_cli.append(f"/dev/{namespace}")
 
         return namespaces_cli
+
+    def support_device_format(self, device_name: str) -> bool:
+        name_without_dev = device_name.replace("/dev/", "")
+        cmd_result = self.run(f"identify {name_without_dev}", shell=True, sudo=True)
+        cmd_result.assert_exit_code(
+            message=f"Failed to identify settings for {device_name}."
+        )
+        return self.__format_device_support in cmd_result.stdout
+
+    def support_ns_manage_attach(self, device_name: str) -> bool:
+        name_without_dev = device_name.replace("/dev/", "")
+        cmd_result = self.run(f"identify {name_without_dev}", shell=True, sudo=True)
+        cmd_result.assert_exit_code()
+        return self.__ns_management_attachement_support in cmd_result.stdout
+
+    def create_namespace(self, namespace: str) -> ExecutableResult:
+        device_name = find_patterns_in_lines(
+            namespace, [self._devicename_from_namespace_pattern]
+        )[0][0]
+        cmd_result = self.run(f"identify {device_name}", shell=True, sudo=True)
+        cmd_result.assert_exit_code(
+            message="Failed to identify devicename and collect"
+            " requirements for namespace creation."
+        )
+        total_storage_space_in_bytes = find_patterns_in_lines(
+            cmd_result.stdout, [self._total_storage_pattern]
+        )[0][0]
+        # Using the same block size as linux tests of 4096 bytes
+        total_storage_space_in_blocks = int(total_storage_space_in_bytes) // 4096
+        cmd_result = self.run(
+            f"ns create -s {total_storage_space_in_blocks} -c "
+            f"{total_storage_space_in_blocks} {device_name}",
+            shell=True,
+            sudo=True,
+        )
+        return cmd_result
+
+    def delete_namespace(self, namespace: str, id_: int) -> ExecutableResult:
+        device_name = find_patterns_in_lines(
+            namespace, [self._devicename_from_namespace_pattern]
+        )[0][0]
+        return self.run(f"ns delete -n {id_} {device_name}", shell=True, sudo=True)
+
+    def detach_namespace(self, namespace: str, id_: int) -> ExecutableResult:
+        device_name = find_patterns_in_lines(
+            namespace, [self._devicename_from_namespace_pattern]
+        )[0][0]
+        return self.run(f"ns detach -n {id_} -c 0 {device_name}", shell=True, sudo=True)
+
+    def format_namespace(self, namespace: str) -> ExecutableResult:
+        name_without_dev = namespace.replace("/dev/", "")
+        return self.run(f"format {name_without_dev}", shell=True, sudo=True)

microsoft/testsuites/nvme/nvme.py

@@ -296,8 +296,9 @@ def verify_nvme_manage_ns(self, node: Node) -> None:
         if not nvme_cli.support_ns_manage_attach(nvme_devices[0]):
             # for old nvme cli version, it returns 22
             # for new nvme cli version, it returns 1
+            # for nvmecontrol on FreeBSD, it returns 69
             # refer https://github.com/linux-nvme/nvme-cli/issues/1120
-            ns_management_exit_code = [1, 22]
+            ns_management_exit_code = [1, 22, 69]
         for namespace in nvme_namespaces:
             # 2. `nvme format namespace` - format a namespace.
             format_namespace = nvme_cli.format_namespace(namespace)