diff --git a/os_brick/initiator/connectors/nvme.py b/os_brick/initiator/connectors/nvme.py index 6dff6f3dd..d60246875 100644 --- a/os_brick/initiator/connectors/nvme.py +++ b/os_brick/initiator/connectors/nvme.py @@ -61,7 +61,7 @@ class NVMeConnector(base.BaseLinuxConnector): LOG.debug("Unable to locate dmidecode. For Cinder RSD Backend," " please make sure it is installed: %s", e) out = "" - return out + return out.strip() @staticmethod def get_connector_properties(root_helper, *args, **kwargs): diff --git a/os_brick/tests/initiator/connectors/test_nvme.py b/os_brick/tests/initiator/connectors/test_nvme.py index 639c04067..7589c3fe8 100644 --- a/os_brick/tests/initiator/connectors/test_nvme.py +++ b/os_brick/tests/initiator/connectors/test_nvme.py @@ -40,6 +40,14 @@ class NVMeConnectorTestCase(test_connector.ConnectorTestCase): self.connector = nvme.NVMeConnector(None, execute=self.fake_execute) + @mock.patch.object(nvme.NVMeConnector, '_execute') + def test_get_sysuuid_without_newline(self, mock_execute): + mock_execute.return_value = ( + "9126E942-396D-11E7-B0B7-A81E84C186D1\n", "") + uuid = self.connector._get_system_uuid() + expected_uuid = "9126E942-396D-11E7-B0B7-A81E84C186D1" + self.assertEqual(expected_uuid, uuid) + @mock.patch.object(nvme.NVMeConnector, '_execute') def test_get_connector_properties_without_sysuuid( self, mock_execute):