fog-openstack 0.1.26 → 0.1.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3348399a88b9e9c9d222f75d2f0ded6f74a64f7
-  data.tar.gz: 5f1b769ff3bc1f12b2e238c6c53bcc585392f9ac
+  metadata.gz: d8ababc6eb5751d0de1a39cdb67d8b2ddf1bea19
+  data.tar.gz: e610365bca3f0560657855964ed2256f0ae9a335
 SHA512:
-  metadata.gz: f1308a13a800a9a95a21fc93d2be5f6d56e4f74c4da952589e3d1f1fce77707baaeb3b42d1cd99244aea26550f6ba5788340ed58bd70c4abb6ad1c1e4a6e70c3
-  data.tar.gz: 6243316e3b1aa9036847e0b3e052dd111954c0acc9b0e27c8c4dba1a9e4aee87d3a204a4ca6afe1428ce7fd73dbba2a530a1f7bd2606bde728619d34fa1c50c3
+  metadata.gz: 5a3af31657b4182f41ccb5b669eb64cf412ade2a99c9ea5f6ffe7ef1c6d655013e45f5b951411e78f77dc830367ce5d7e2427698d743b1f172484ee668cfe5af
+  data.tar.gz: 5ba34342b870c574670520189b7f8ac7be919601f61ece0dbd8ee1eb2753a3de785141d2f4548e8d954f68eed67497b9bc3a4bea69802b00536ac45ee0510ae7

data/lib/fog/compute/openstack.rb

@@ -116,6 +116,9 @@ module Fog
       request :migrate_server
       request :evacuate_server
 
+      # Server Remote Consoles
+      request :remote_consoles
+
       # Service CRUD
       request :list_services
       request :enable_service
@@ -338,7 +341,7 @@ module Fog
                   "port_state" => "ACTIVE"
                 }
               ]
-            }  
+            }
           end
         end
 

data/lib/fog/compute/openstack/models/key_pair.rb

@@ -25,9 +25,9 @@ module Fog
           requires :name
 
           data = if public_key
-                   service.create_key_pair(name, public_key).body['keypair']
+                   service.create_key_pair(name, public_key, user_id).body['keypair']
                  else
-                   service.create_key_pair(name).body['keypair']
+                   service.create_key_pair(name, nil, user_id).body['keypair']
                  end
           new_attributes = data.reject { |key, _value| !['fingerprint', 'public_key', 'name', 'private_key', 'user_id'].include?(key) }
           merge_attributes(new_attributes)

data/lib/fog/compute/openstack/requests/create_key_pair.rb

@@ -2,7 +2,7 @@ module Fog
   module Compute
     class OpenStack
       class Real
-        def create_key_pair(key_name, public_key = nil)
+        def create_key_pair(key_name, public_key = nil, user_id = nil)
           data = {
             'keypair' => {
               'name' => key_name
@@ -10,6 +10,7 @@ module Fog
           }
 
           data['keypair']['public_key'] = public_key unless public_key.nil?
+          data['keypair']['user_id'] = user_id unless user_id.nil?
 
           request(
             :body    => Fog::JSON.encode(data),

data/lib/fog/compute/openstack/requests/delete_key_pair.rb

@@ -2,7 +2,9 @@ module Fog
   module Compute
     class OpenStack
       class Real
-        def delete_key_pair(key_name)
+        def delete_key_pair(key_name, user_id = nil)
+          options = {}
+          options[:user_id] = user_id unless user_id.nil?
           request(
             :expects => [202, 204],
             :method  => 'DELETE',

data/lib/fog/compute/openstack/requests/get_vnc_console.rb

@@ -3,6 +3,7 @@ module Fog
     class OpenStack
       class Real
         # Get a vnc console for an instance.
+        # For microversion < 2.6 as it has been replaced with remote-consoles
         #
         # === Parameters
         # * server_id <~String> - The ID of the server.
@@ -13,12 +14,20 @@ module Fog
         #     * url <~String>
         #     * type <~String>
         def get_vnc_console(server_id, console_type)
+          fixed_microversion = nil
+          if microversion_newer_than?('2.5')
+            fixed_microversion = @microversion
+            @microversion = '2.5'
+          end
+
           body = {
             'os-getVNCConsole' => {
               'type' => console_type
             }
           }
-          server_action(server_id, body)
+          result = server_action(server_id, body)
+          @microversion = fixed_microversion if fixed_microversion
+          result
         end
       end
 

data/lib/fog/compute/openstack/requests/remote_consoles.rb

@@ -0,0 +1,54 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        # Get a vnc console for an instance.
+        # For microversion >= 2.6
+        #
+        # === Parameters
+        # * server_id <~String> - The ID of the server.
+        # * protocol <~String> - The protocol of remote console. The valid values are vnc, spice, rdp, serial and mks.
+        #   The protocol mks is added since Microversion 2.8.
+        # * type <~String> - The type of remote console. The valid values are novnc, xvpvnc, rdp-html5, spice-html5,
+        #   serial, and webmks. The type webmks is added since Microversion 2.8.
+        # === Returns
+        # * response <~Excon::Response>:
+        #   * body <~Hash>:
+        #     * url <~String>
+        #     * type <~String>
+        #     * protocol <~String>
+        def remote_consoles(server_id, protocol, type)
+          if microversion_newer_than?('2.6')
+            body = {
+              'remote_console' => {
+                'protocol' => protocol, 'type' => type
+              }
+            }
+
+            request(
+              :body    => Fog::JSON.encode(body),
+              :expects => 200,
+              :method  => 'POST',
+              :path    => "servers/#{server_id}/remote-consoles"
+            )
+          end
+        end
+      end
+
+      class Mock
+        def remote_consoles(_server_id, _protocol, _type)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "remote_console" => {
+              "url"      => "http://192.168.27.100:6080/vnc_auto.html?token=e629bcbf-6f9e-4276-9ea1-d6eb0e618da5",
+              "type"     => "novnc",
+              "protocol" => "vnc"
+            }
+          }
+          response
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module OpenStack
-    VERSION = '0.1.26'.freeze
+    VERSION = '0.1.27'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-openstack
 version: !ruby/object:Gem::Version
-  version: 0.1.26
+  version: 0.1.27
 platform: ruby
 authors:
 - Matt Darby
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-22 00:00:00.000000000 Z
+date: 2018-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core
@@ -426,6 +426,7 @@ files:
 - lib/fog/compute/openstack/requests/reboot_server.rb
 - lib/fog/compute/openstack/requests/rebuild_server.rb
 - lib/fog/compute/openstack/requests/release_address.rb
+- lib/fog/compute/openstack/requests/remote_consoles.rb
 - lib/fog/compute/openstack/requests/remove_aggregate_host.rb
 - lib/fog/compute/openstack/requests/remove_fixed_ip.rb
 - lib/fog/compute/openstack/requests/remove_flavor_access.rb