fog-ecloud 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 459d2651c0917b467a2109cc810310357389222d
-  data.tar.gz: f5acec7647a8e21e9f6673ca50b2c32d4692db7d
+  metadata.gz: 46a64b15ab3ff353edc6229933d67550309b34d7
+  data.tar.gz: b681e30075993fd7082e217c3b7e2fb6d7e6dc99
 SHA512:
-  metadata.gz: 881243ebcd9138ec3cd4bd8c1caf94411cef534e27780459b15b93c95e6d8e402298dca795d8896885729dbb3e2ad10849f077fb1afa43b989d676edcb762bae
-  data.tar.gz: ddf645d726fc3d5539a4da82c203718ada9d2d8d436c466cf7ce0ca79aab13e35b58c65d9c4a2a2521b8b67d0bebd40aae753ce00067a2f04a518ec2f9deec12
+  metadata.gz: c6dcd86fb9737e4c468698f515957f1861ca438d588c4b0f94ac06815f7e3ff733a2d28bd44711d5562c521765ed9040bdd187d477a0718b7bc75d3a72fe7337
+  data.tar.gz: 7d23e7506ae33631fbd4680916dd23d0d56ded1f7e0b51f14bc6617e9c7778464879c059f85c8bead278b09d3d902135141fc4d81d0692905efd908161b4f25a

data/lib/fog/compute/ecloud.rb

@@ -229,6 +229,9 @@ module Fog
       request :rows_edit
       request :rows_movedown
       request :rows_moveup
+      request :ssh_key_create
+      request :ssh_key_delete
+      request :ssh_key_edit
       request :trusted_network_groups_create
       request :trusted_network_groups_delete
       request :trusted_network_groups_edit
@@ -287,7 +290,7 @@ module Fog
           @connection_options      = options[:connection_options] || {}
           @host                    = options[:ecloud_host] || API_URL
           @persistent              = options[:persistent] || false
-          @version                 = options[:ecloud_version] || "2013-06-01"
+          @version                 = options[:ecloud_version] || "2015-05-01"
           @authentication_method   = options[:ecloud_authentication_method] || :cloud_api_auth
           @access_key              = options[:ecloud_access_key]
           @private_key             = options[:ecloud_private_key]
@@ -352,10 +355,18 @@ module Fog
 
         # if Authorization and x-tmrk-authorization are used, the x-tmrk-authorization takes precendence.
         def set_extra_headers_for(params)
+          length_required = ["PUT", "POST", "DELETE"]
           params[:headers] = {
             "x-tmrk-version" => @version,
             "Date"           => Time.now.utc.strftime("%a, %d %b %Y %H:%M:%S GMT"),
           }.merge(params[:headers] || {})
+          if length_required.include?(params[:method]) && !params[:headers]["Content-Length"]
+            body_size = 0
+            if params[:body]
+              body_size = params[:body].size
+            end
+            params[:headers].merge!("Content-Length" => body_size)
+          end
           if params[:method] == "POST" || params[:method] == "PUT"
             params[:headers].merge!("Content-Type" => "application/xml") unless params[:headers]["Content-Type"]
             params[:headers].merge!("Accept" => "application/xml")

data/lib/fog/compute/ecloud/models/ssh_key.rb

@@ -9,6 +9,30 @@ module Fog
         attribute :other_links, :aliases => :Links
         attribute :default, :aliases => :Default, :type => :boolean
         attribute :finger_print, :aliases => :FingerPrint
+        attribute :private_key, :aliases => :PrivateKey
+
+        def delete
+          service.ssh_key_delete(href).body
+        end
+        alias_method :destroy, :delete
+
+        def edit(options = {})
+          # Make sure we only pass what we should
+          new_options = {}
+          new_options[:uri] = href
+          if options[:Name].nil?
+            new_options[:Name] = name
+          else
+            new_options[:Name] = options[:Name]
+          end
+          if options[:Default].nil?
+            new_options[:Default] = default
+          else
+            new_options[:Default] = options[:Default]
+          end
+
+          service.ssh_key_edit(new_options)
+        end
 
         def id
           href.scan(/\d+/)[0]

data/lib/fog/compute/ecloud/models/ssh_keys.rb

@@ -14,12 +14,28 @@ module Fog
         end
 
         def get(uri)
-          if data = service.get_ssh_key(uri)
-            new(data.body)
+          if data = service.get_ssh_key(uri).body
+            new(data)
           end
-        rescue Fog::Errors::NotFound
+        rescue Excon::Errors::NotFound
           nil
         end
+
+        def create(options = {})
+          # Make sure we only pass what we should
+          new_options           = {}
+          new_options[:Name]    = options[:Name] unless options[:Name].nil?
+          new_options[:Default] = options[:Default] || false
+          new_options[:uri]     = href + "/action/createSshKey"
+
+          data = service.ssh_key_create(new_options)
+          object = service.ssh_keys.new(data)
+          object
+        end
+
+        def environment_id
+          href.scan(/\d+/)[0]
+        end
       end
     end
   end

data/lib/fog/compute/ecloud/requests/get_ssh_key.rb

@@ -12,7 +12,7 @@ module Fog
 
           if ssh_key
             response(:body => Fog::Ecloud.slice(ssh_key, :id, :admin_organization))
-          else response(:status => 404) # ?
+          else response(:expects => 200, :status => 404) # ?
           end
         end
       end

data/lib/fog/compute/ecloud/requests/ssh_key_create.rb

@@ -0,0 +1,77 @@
+module Fog
+  module Compute
+    class Ecloud
+      class Real
+        include Shared
+
+        def ssh_key_create(data)
+          validate_data([:Name], data)
+
+          request(
+            :body => generate_ssh_key_create_request(data),
+            :expects => 201,
+            :method => "POST",
+            :headers => {},
+            :uri => data[:uri],
+            :parse => true
+          ).body
+        end
+
+        private
+
+        def generate_ssh_key_create_request(data)
+          xml = Builder::XmlMarkup.new
+          xml.CreateSshKey(:name => data[:Name]) do
+            xml.Default data[:Default]
+          end
+        end
+      end
+
+      class Mock
+        include Shared
+
+        def ssh_key_create(data)
+          validate_data([:Name], data)
+          ssh_key_id          = Fog::Mock.random_numbers(7).to_i
+          ssh_key_fingerprint = ""
+          (1..15).each do
+            ssh_key_fingerprint = ssh_key_fingerprint + Fog::Mock.random_hex(2) + ":"
+          end
+          ssh_key_fingerprint = ssh_key_fingerprint + Fog::Mock.random_hex(2)
+          ssh_private_key     = Fog::Mock.random_base64(512)
+          org_id              = self.data[:organization_id]
+          org_name            = self.data[:organization_name]
+
+          ssh_key = {
+            :href                  => "/cloudapi/ecloud/admin/sshKeys/#{ssh_key_id}",
+            :Name                  => data[:Name],
+            :type                  => "application/vnd.tmrk.cloud.admin.sshKey",
+            :Links => {
+              :Link => {
+                :href => "/cloudapi/ecloud/admin/organizations/#{org_id}",
+                :name => org_name,
+                :type => "application/vnd.tmrk.cloud.admin.organization",
+                :rel  => "up",
+              },
+              :Link => {
+                :href => "/cloudapi/ecloud/organizations/#{org_id}",
+                :name => org_name,
+                :type => "application/vnd.tmrk.cloud.organization",
+                :rel  => "up",
+              },
+            },
+            :Default => data[:Default] || false,
+            :FingerPrint => ssh_key_fingerprint,
+            :PrivateKey => ssh_private_key,
+          }
+
+          ssh_key_response = response(:body =>  ssh_key)
+
+          self.data[:ssh_keys][ssh_key_id] = ssh_key
+
+          ssh_key_response.body
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/ecloud/requests/ssh_key_delete.rb

@@ -0,0 +1,18 @@
+module Fog
+  module Compute
+    class Ecloud
+      class Real
+        basic_request :ssh_key_delete, 204, "DELETE"
+      end
+
+      class Mock
+        def ssh_key_delete(uri)
+          ssh_key_id = id_from_uri(uri)
+
+          data[:ssh_keys].delete(ssh_key_id)
+          response(:body =>  nil, :status => 204)
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/ecloud/requests/ssh_key_edit.rb

@@ -0,0 +1,43 @@
+module Fog
+  module Compute
+    class Ecloud
+      class Real
+        include Shared
+
+        def ssh_key_edit(data)
+          request(
+            :body => generate_ssh_key_edit_request(data),
+            :expects => 200,
+            :method => "PUT",
+            :headers => {},
+            :uri => data[:uri],
+            :parse => true
+          ).body
+        end
+
+        private
+
+        def generate_ssh_key_edit_request(data)
+          xml = Builder::XmlMarkup.new
+          xml.SshKey(:name => data[:Name]) do
+            xml.Default data[:Default]
+          end
+        end
+      end
+
+      class Mock
+        def ssh_key_edit(options)
+          ssh_key_id = id_from_uri(options[:uri]).to_i
+          if data[:ssh_keys][ssh_key_id]
+            data[:ssh_keys][ssh_key_id][:Name] = options[:Name]
+            data[:ssh_keys][ssh_key_id][:Default] = options[:Default]
+            ssh_key = data[:ssh_keys][ssh_key_id]
+            response(:body => Fog::Ecloud.slice(ssh_key, :id, :admin_organization)).body
+          else
+            response(:expects => 200, :status => 404)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/ecloud/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Ecloud
-    VERSION = "0.1.3"
+    VERSION = "0.2.0"
   end
 end

data/tests/compute/models/ssh_key_tests.rb

@@ -7,13 +7,42 @@ Shindo.tests("Fog::Compute[:#{provider}] | ssh_keys", [provider.to_s]) do
   @admin_organization.reload
   @ssh_keys = @admin_organization.ssh_keys
 
-  tests('#all').succeeds do
+  tests("#all").succeeds do
     returns(false) { @ssh_keys.empty? }
   end
 
-  tests('#get').succeeds do
+  tests("#get").succeeds do
     ssh_key = @ssh_keys.first
 
     returns(false) { @ssh_keys.get(ssh_key.href).nil? }
+    returns(false) { @ssh_keys.get("/notfound" + ssh_key.href).nil? }
+  end
+
+  tests("#create").succeeds do
+    new_key = @ssh_keys.create(:Name => "testing")
+    @key_id = new_key.id || nil
+    returns(false) { new_key.nil? }
+    raises(ArgumentError) { @ssh_keys.create }
+  end
+
+  tests("#edit").succeeds do
+    the_key = @ssh_keys.get(@key_id)
+    returns(false) { the_key.nil? }
+
+    the_key.edit(:Name => "more testing")
+    the_key.reload
+    returns(false) { the_key.name != "more testing" }
+
+    the_key.edit(:Default => true)
+    the_key.reload
+    returns(true) { the_key.default }
+  end
+
+  tests("#delete").succeeds do
+    the_key = @ssh_keys.get(@key_id)
+    returns(false) { the_key.nil? }
+    the_key.delete
+    the_key = @ssh_keys.get(@key_id)
+    returns(false) { !the_key.nil? }
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-ecloud
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Paulo Henrique Lopes Ribeiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-11 00:00:00.000000000 Z
+date: 2015-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -382,6 +382,9 @@ files:
 - lib/fog/compute/ecloud/requests/rows_edit.rb
 - lib/fog/compute/ecloud/requests/rows_movedown.rb
 - lib/fog/compute/ecloud/requests/rows_moveup.rb
+- lib/fog/compute/ecloud/requests/ssh_key_create.rb
+- lib/fog/compute/ecloud/requests/ssh_key_delete.rb
+- lib/fog/compute/ecloud/requests/ssh_key_edit.rb
 - lib/fog/compute/ecloud/requests/trusted_network_groups_create.rb
 - lib/fog/compute/ecloud/requests/trusted_network_groups_delete.rb
 - lib/fog/compute/ecloud/requests/trusted_network_groups_edit.rb