diff options
| author | Masanori Itoh <itoumsn@nttdata.co.jp> | 2011-03-04 10:47:17 +0900 |
|---|---|---|
| committer | Masanori Itoh <itoumsn@nttdata.co.jp> | 2011-03-04 10:47:17 +0900 |
| commit | 0265cf6f3f60e1354610064340cc1b21dfa79353 (patch) | |
| tree | 65fd456ffcf0dda49abb3189be311c6452376e92 /nova | |
| parent | 6606b4d438327b5405ef810c26cf801fa64433eb (diff) | |
| parent | 458bf9682df0514a7f180f1ab1566bb7846cd281 (diff) | |
| download | nova-0265cf6f3f60e1354610064340cc1b21dfa79353.tar.gz nova-0265cf6f3f60e1354610064340cc1b21dfa79353.tar.xz nova-0265cf6f3f60e1354610064340cc1b21dfa79353.zip | |
Merged to trunk rev 759.
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/ec2/cloud.py | 2 | ||||
| -rw-r--r-- | nova/tests/test_cloud.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py index 844ccbe5e..c6309f03c 100644 --- a/nova/api/ec2/cloud.py +++ b/nova/api/ec2/cloud.py @@ -298,7 +298,7 @@ class CloudController(object): 'keyFingerprint': key_pair['fingerprint'], }) - return {'keypairsSet': result} + return {'keySet': result} def create_key_pair(self, context, key_name, **kwargs): LOG.audit(_("Create key pair %s"), key_name, context=context) diff --git a/nova/tests/test_cloud.py b/nova/tests/test_cloud.py index 061910013..b195fa520 100644 --- a/nova/tests/test_cloud.py +++ b/nova/tests/test_cloud.py @@ -267,7 +267,7 @@ class CloudTestCase(test.TestCase): self._create_key('test1') self._create_key('test2') result = self.cloud.describe_key_pairs(self.context) - keys = result["keypairsSet"] + keys = result["keySet"] self.assertTrue(filter(lambda k: k['keyName'] == 'test1', keys)) self.assertTrue(filter(lambda k: k['keyName'] == 'test2', keys)) |