summaryrefslogtreecommitdiffstats
path: root/nova
diff options
context:
space:
mode:
authorIsaku Yamahata <yamahata@valinux.co.jp>2011-06-22 12:54:32 +0900
committerIsaku Yamahata <yamahata@valinux.co.jp>2011-06-22 12:54:32 +0900
commit181ae36fe34edd206c33e3a0b7e10800ced93e97 (patch)
tree0d3591b50772593e9ad2dda4ae82e525c03eb0ee /nova
parentd81d75bec04fe19492544e5bf7548dce5a2366ad (diff)
test_api: unit tests for ec2utils.id_to_ec2_{snap, vol}_id()
Diffstat (limited to 'nova')
-rw-r--r--nova/tests/test_api.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/nova/tests/test_api.py b/nova/tests/test_api.py
index 20b20fcbf..e74ae839e 100644
--- a/nova/tests/test_api.py
+++ b/nova/tests/test_api.py
@@ -107,6 +107,8 @@ class Ec2utilsTestCase(test.TestCase):
def test_ec2_id_to_id(self):
self.assertEqual(ec2utils.ec2_id_to_id('i-0000001e'), 30)
self.assertEqual(ec2utils.ec2_id_to_id('ami-1d'), 29)
+ self.assertEqual(ec2utils.ec2_id_to_id('snap-0000001c'), 28)
+ self.assertEqual(ec2utils.ec2_id_to_id('vol-0000001b'), 27)
def test_bad_ec2_id(self):
self.assertRaises(exception.InvalidEc2Id,
@@ -116,7 +118,8 @@ class Ec2utilsTestCase(test.TestCase):
def test_id_to_ec2_id(self):
self.assertEqual(ec2utils.id_to_ec2_id(30), 'i-0000001e')
self.assertEqual(ec2utils.id_to_ec2_id(29, 'ami-%08x'), 'ami-0000001d')
-
+ self.assertEqual(ec2utils.id_to_ec2_snap_id(28), 'snap-0000001c')
+ self.assertEqual(ec2utils.id_to_ec2_vol_id(27), 'vol-0000001b')
class ApiEc2TestCase(test.TestCase):
"""Unit test for the cloud controller on an EC2 API"""