diff options
author | vsaienko <vsaienko@mirantis.com> | 2016-03-17 12:13:36 +0200 |
---|---|---|
committer | vsaienko <vsaienko@mirantis.com> | 2016-03-17 18:17:26 +0200 |
commit | 78f3962b6cdec731e2d2535124b06345041b2083 (patch) | |
tree | 0f64806e40bf86dd925cb779430655c8ed8bac72 /ironic/tests | |
parent | cb1a83f740c1c7a45985a8825d0366b5548dd58d (diff) | |
download | ironic-78f3962b6cdec731e2d2535124b06345041b2083.tar.gz |
Move _normalize_mac to driver utils
This function is going to be used by out of tree drivers.
To avoid code duplication make it available from Ironic's tree
Change-Id: I12211db38a3fdb3b2d733e5769f2c052c32c4a75
Diffstat (limited to 'ironic/tests')
-rw-r--r-- | ironic/tests/unit/drivers/modules/test_ssh.py | 10 | ||||
-rw-r--r-- | ironic/tests/unit/drivers/test_utils.py | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/ironic/tests/unit/drivers/modules/test_ssh.py b/ironic/tests/unit/drivers/modules/test_ssh.py index 76a1e0387..fc4f2dbef 100644 --- a/ironic/tests/unit/drivers/modules/test_ssh.py +++ b/ironic/tests/unit/drivers/modules/test_ssh.py @@ -156,16 +156,6 @@ class SSHValidateParametersTestCase(db_base.DbTestCase): ssh._parse_driver_info, node) - def test__normalize_mac_string(self): - mac_raw = "0A:1B-2C-3D:4F" - mac_clean = ssh._normalize_mac(mac_raw) - self.assertEqual("0a1b2c3d4f", mac_clean) - - def test__normalize_mac_unicode(self): - mac_raw = u"0A:1B-2C-3D:4F" - mac_clean = ssh._normalize_mac(mac_raw) - self.assertEqual("0a1b2c3d4f", mac_clean) - def test__parse_driver_info_with_custom_libvirt_uri(self): CONF.set_override('libvirt_uri', 'qemu:///foo', 'ssh') expected_base_cmd = "LC_ALL=C /usr/bin/virsh --connect qemu:///foo" diff --git a/ironic/tests/unit/drivers/test_utils.py b/ironic/tests/unit/drivers/test_utils.py index 93a8642a5..8144c4742 100644 --- a/ironic/tests/unit/drivers/test_utils.py +++ b/ironic/tests/unit/drivers/test_utils.py @@ -228,3 +228,13 @@ class UtilsTestCase(db_base.DbTestCase): ) self.assertEqual("Value of 'capabilities' must be string. Got " + str(int), str(exc)) + + def test_normalize_mac_string(self): + mac_raw = "0A:1B-2C-3D:4F" + mac_clean = driver_utils.normalize_mac(mac_raw) + self.assertEqual("0a1b2c3d4f", mac_clean) + + def test_normalize_mac_unicode(self): + mac_raw = u"0A:1B-2C-3D:4F" + mac_clean = driver_utils.normalize_mac(mac_raw) + self.assertEqual("0a1b2c3d4f", mac_clean) |