From d4804d3855b59845e4b4fc41b92244e6b6b807a2 Mon Sep 17 00:00:00 2001 From: jclong83 Date: Thu, 9 Jan 2014 12:45:31 -0600 Subject: [PATCH 1/3] Corrected Server createJson() for proper keypair handling --- lib/OpenCloud/Compute/Resource/Server.php | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/lib/OpenCloud/Compute/Resource/Server.php b/lib/OpenCloud/Compute/Resource/Server.php index 400a3d77c..f66d13bed 100644 --- a/lib/OpenCloud/Compute/Resource/Server.php +++ b/lib/OpenCloud/Compute/Resource/Server.php @@ -638,16 +638,13 @@ protected function createJson() . " keypair's name" )); } - if (empty($this->keypair['publicKey'])) { + if (empty($this->keypair['public_key'])) { throw new Exceptions\InvalidParameterError(sprintf( 'If you want to specify a keypair, you need to specify the' - . " keypair's publicKey value." + . " keypair's public_key value." )); } - $server->keypair = (object) array( - 'name' => $this->keypair['name'], - 'public_key' => $this->keypair['publicKey'] - ); + $server->key_name = $this->keypair['name'], } return (object) array('server' => $server); From c9396c82338cec27f28e88e5366e435e678e8f07 Mon Sep 17 00:00:00 2001 From: jclong83 Date: Thu, 9 Jan 2014 12:50:12 -0600 Subject: [PATCH 2/3] Corrected Server createJson() for proper keypair handling --- lib/OpenCloud/Compute/Resource/Server.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/OpenCloud/Compute/Resource/Server.php b/lib/OpenCloud/Compute/Resource/Server.php index f66d13bed..3b61e008e 100644 --- a/lib/OpenCloud/Compute/Resource/Server.php +++ b/lib/OpenCloud/Compute/Resource/Server.php @@ -644,7 +644,7 @@ protected function createJson() . " keypair's public_key value." )); } - $server->key_name = $this->keypair['name'], + $server->key_name = $this->keypair['name']; } return (object) array('server' => $server); From ce52902cc394073c2fb4c4f6a6326bfc86770d4c Mon Sep 17 00:00:00 2001 From: jclong83 Date: Thu, 9 Jan 2014 12:52:33 -0600 Subject: [PATCH 3/3] corrected unit test for create server keypair check --- tests/OpenCloud/Tests/Compute/Resource/ServerTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/OpenCloud/Tests/Compute/Resource/ServerTest.php b/tests/OpenCloud/Tests/Compute/Resource/ServerTest.php index b7b142606..8a84b6f1a 100644 --- a/tests/OpenCloud/Tests/Compute/Resource/ServerTest.php +++ b/tests/OpenCloud/Tests/Compute/Resource/ServerTest.php @@ -84,7 +84,7 @@ public function test_Create_With_KeyPair() $this->service->server()->create(array( 'keypair' => array( 'name' => 'foo', - 'publicKey' => 'bar' + 'public_key' => 'bar' ) )); } @@ -329,4 +329,4 @@ public function test_Create_Fails_Without_Correct_Networks() )); } -} \ No newline at end of file +}