From 8d09bd69b23c7cfcad406db780b3f066b45d4915 Mon Sep 17 00:00:00 2001 From: Bertrand Lallau Date: Thu, 26 May 2016 11:21:09 +0200 Subject: [PATCH] Fix spelling error on get_docker_quantity method Change-Id: Ie52ae02df2d78e684bc861e4869f22239a24fafe --- magnum/api/utils.py | 2 +- magnum/common/utils.py | 2 +- magnum/conductor/handlers/docker_conductor.py | 2 +- magnum/tests/unit/common/test_utils.py | 16 ++++++++-------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/magnum/api/utils.py b/magnum/api/utils.py index 7e17a63e7a..50eca354c8 100644 --- a/magnum/api/utils.py +++ b/magnum/api/utils.py @@ -56,7 +56,7 @@ def validate_sort_dir(sort_dir): def validate_docker_memory(mem_str): """Docker require that Minimum memory limit >= 4M.""" try: - mem = utils.get_docker_quanity(mem_str) + mem = utils.get_docker_quantity(mem_str) except exception.UnsupportedDockerQuantityFormat: raise wsme.exc.ClientSideError(_("Invalid docker memory specified. " "Acceptable values are format: " diff --git a/magnum/common/utils.py b/magnum/common/utils.py index 919258e3ef..984eeaa101 100644 --- a/magnum/common/utils.py +++ b/magnum/common/utils.py @@ -582,7 +582,7 @@ def get_k8s_quantity(quantity): raise exception.UnsupportedK8sQuantityFormat() -def get_docker_quanity(quantity): +def get_docker_quantity(quantity): """This function is used to get swarm Memory quantity. Memory format must be in the format of: diff --git a/magnum/conductor/handlers/docker_conductor.py b/magnum/conductor/handlers/docker_conductor.py index 8daa353681..d909fc2a4f 100644 --- a/magnum/conductor/handlers/docker_conductor.py +++ b/magnum/conductor/handlers/docker_conductor.py @@ -88,7 +88,7 @@ class Handler(object): if container.memory is not None: kwargs['host_config'] = { 'Memory': - magnum_utils.get_docker_quanity(container.memory)} + magnum_utils.get_docker_quantity(container.memory)} else: kwargs['mem_limit'] = container.memory diff --git a/magnum/tests/unit/common/test_utils.py b/magnum/tests/unit/common/test_utils.py index 9d48f8b4b6..a7d6084ea5 100644 --- a/magnum/tests/unit/common/test_utils.py +++ b/magnum/tests/unit/common/test_utils.py @@ -132,17 +132,17 @@ class UtilsTestCase(base.TestCase): self.assertRaises(exception.UnsupportedK8sQuantityFormat, utils.get_k8s_quantity, '1E1E') - def test_get_docker_quanity(self): - self.assertEqual(512, utils.get_docker_quanity('512')) - self.assertEqual(512, utils.get_docker_quanity('512b')) - self.assertEqual(512 * 1024, utils.get_docker_quanity('512k')) - self.assertEqual(512 * 1024 * 1024, utils.get_docker_quanity('512m')) + def test_get_docker_quantity(self): + self.assertEqual(512, utils.get_docker_quantity('512')) + self.assertEqual(512, utils.get_docker_quantity('512b')) + self.assertEqual(512 * 1024, utils.get_docker_quantity('512k')) + self.assertEqual(512 * 1024 * 1024, utils.get_docker_quantity('512m')) self.assertEqual(512 * 1024 * 1024 * 1024, - utils.get_docker_quanity('512g')) + utils.get_docker_quantity('512g')) self.assertRaises(exception.UnsupportedDockerQuantityFormat, - utils.get_docker_quanity, '512bb') + utils.get_docker_quantity, '512bb') self.assertRaises(exception.UnsupportedDockerQuantityFormat, - utils.get_docker_quanity, '512B') + utils.get_docker_quantity, '512B') class ExecuteTestCase(base.TestCase):