Also, test if the ConvertNicDiskModifications function operates as expected.
Signed-off-by: Alex Pyrgiotis <[email protected]> diff --git a/test/py/ganeti.client.gnt_instance_unittest.py b/test/py/ganeti.client.gnt_instance_unittest.py index 3349c1a..b908e03 100755 --- a/test/py/ganeti.client.gnt_instance_unittest.py +++ b/test/py/ganeti.client.gnt_instance_unittest.py @@ -129,26 +129,41 @@ class TestConsole(unittest.TestCase): class TestConvertNicDiskModifications(unittest.TestCase): - def test(self): + def testErrorMods(self): fn = gnt_instance._ConvertNicDiskModifications self.assertEqual(fn([]), []) # Error cases self.assertRaises(errors.OpPrereqError, fn, [ - (constants.DDM_REMOVE, { "param": "value", }), + (constants.DDM_REMOVE, {"param": "value", }), + ]) + self.assertRaises(errors.OpPrereqError, fn, [ + (0, {constants.DDM_REMOVE: True, "param": "value", }), ]) self.assertRaises(errors.OpPrereqError, fn, [ - (0, { constants.DDM_REMOVE: True, "param": "value", }), + (constants.DDM_DETACH, {"param": "value", }), ]) self.assertRaises(errors.OpPrereqError, fn, [ + (0, {constants.DDM_DETACH: True, "param": "value", }), + ]) + + self.assertRaises(errors.OpPrereqError, fn, [ (0, { constants.DDM_REMOVE: True, constants.DDM_ADD: True, }), ]) + self.assertRaises(errors.OpPrereqError, fn, [ + (0, { + constants.DDM_DETACH: True, + constants.DDM_MODIFY: True, + }), + ]) + + def testLegacyCalls(self): + fn = gnt_instance._ConvertNicDiskModifications - # Legacy calls for action in constants.DDMS_VALUES: self.assertEqual(fn([ (action, {}), @@ -172,7 +187,9 @@ class TestConvertNicDiskModifications(unittest.TestCase): }), ]) - # New-style calls + def testNewStyleCalls(self): + fn = gnt_instance._ConvertNicDiskModifications + self.assertEqual(fn([ (2, { constants.IDISK_MODE: constants.DISK_RDWR, @@ -213,7 +230,9 @@ class TestConvertNicDiskModifications(unittest.TestCase): }), ]) - # Names and UUIDs + def testNamesUUIDs(self): + fn = gnt_instance._ConvertNicDiskModifications + self.assertEqual(fn([ ('name', { constants.IDISK_MODE: constants.DISK_RDWR, diff --git a/test/py/ganeti.opcodes_unittest.py b/test/py/ganeti.opcodes_unittest.py index 010ea0c..7abb9b3 100755 --- a/test/py/ganeti.opcodes_unittest.py +++ b/test/py/ganeti.opcodes_unittest.py @@ -377,7 +377,9 @@ class TestOpInstanceSetParams(unittest.TestCase): def _GenericTests(self, fn): self.assertTrue(fn([])) self.assertTrue(fn([(constants.DDM_ADD, {})])) + self.assertTrue(fn([(constants.DDM_ATTACH, {})])) self.assertTrue(fn([(constants.DDM_REMOVE, {})])) + self.assertTrue(fn([(constants.DDM_DETACH, {})])) for i in [0, 1, 2, 3, 9, 10, 1024]: self.assertTrue(fn([(i, {})])) @@ -404,6 +406,7 @@ class TestOpInstanceSetParams(unittest.TestCase): for param in constants.IDISK_PARAMS: self.assertTrue(fn([[constants.DDM_ADD, {param: 0}]])) self.assertTrue(fn([[constants.DDM_ADD, {param: param}]])) + self.assertTrue(fn([[constants.DDM_ATTACH, {param: param}]])) if __name__ == "__main__": -- 1.7.10.4
