From 220cb9ac057918484224abae007824f88d65e679 Mon Sep 17 00:00:00 2001 From: Decklin Foster Date: Thu, 1 Mar 2012 13:08:07 -0500 Subject: [PATCH] [ibm] Generated key needs different name, supplied key only returns success --- lib/fog/ibm/requests/compute/create_key.rb | 10 +++++----- tests/ibm/requests/compute/key_tests.rb | 6 +++--- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/lib/fog/ibm/requests/compute/create_key.rb b/lib/fog/ibm/requests/compute/create_key.rb index 851269609f..2d3fecc4c7 100644 --- a/lib/fog/ibm/requests/compute/create_key.rb +++ b/lib/fog/ibm/requests/compute/create_key.rb @@ -46,12 +46,12 @@ def create_key(name, public_key=nil) if public_key.nil? private_key = Fog::IBM::Mock.key_material public_key = private_key.public_key + response.body = attributes.merge("keyMaterial" => private_key.to_s) + else + response.body = { 'success' => true } end - public_key = { "keyMaterial" => public_key.to_s }.merge(attributes.dup) - private_key = { "keyMaterial" => private_key.to_s }.merge(attributes.dup) - response.body = private_key - self.data[:keys][name] = public_key - self.data[:private_keys][name] = private_key + self.data[:keys][name] = attributes.merge("keyMaterial" => public_key.to_s) + self.data[:private_keys][name] = attributes.merge("keyMaterial" => private_key.to_s) response end diff --git a/tests/ibm/requests/compute/key_tests.rb b/tests/ibm/requests/compute/key_tests.rb index a3fe2f0362..e23a3dec9a 100644 --- a/tests/ibm/requests/compute/key_tests.rb +++ b/tests/ibm/requests/compute/key_tests.rb @@ -18,11 +18,11 @@ @public_key = 'AAAAB3NzaC1yc2EAAAADAQABAAABAQCvVCQA6JWWCAwjUjXDFUH8wOm15slX+WJOYCPNNrW+xipvHq5zDOCnus0xfl/zjWLVDkIz+1ku0Qapd4Q2a+NyyyH09iRxmclQaZdNoj+l4RRL0TRzeJT+l9FU0e4eUYKylrEgQCkZPFVsgn8Vly9Nh/NRcBMA1BgLMiCMebPu3N3bZIVjUrVp8MB66hqAivA36zVQ4ogykTXO8XKG9Mth7yblLjcVyDq7tecSrvM/RAUkZp0Z6SHihQwdnJwqLTcBMXeV3N2VRF3TZWayOWFgTlr1M3ZL7HD3adjRFzY8lmzbOdL/L6BamwDL9nP6bnHeH5oDnUuOIsJng04BC9Ht' tests("#create_key('#{@key_name}')").formats(@key_format) do - Fog::Compute[:ibm].create_key(@key_name).body + Fog::Compute[:ibm].create_key(@key_name + '-gen').body end - tests("#create_key('#{@key_name}', '#{@public_key}')").formats(@key_format) do - Fog::Compute[:ibm].create_key(@key_name, @public_key).body + tests("#create_key('#{@key_name}', '#{@public_key}')") do + returns(true) { Fog::Compute[:ibm].create_key(@key_name, @public_key).body['success'] } end tests("#list_keys").formats(@keys_format) do