fog 1.36.0 → 1.37.0

data/lib/fog/openstack/volume_v1.rb

@@ -0,0 +1,163 @@
+require 'fog/openstack/core'
+require 'fog/openstack/common'
+require 'fog/openstack/volume'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V1 < Fog::Volume::OpenStack
+        SUPPORTED_VERSIONS = /v1(\.(0-9))*/
+
+        requires :openstack_auth_url
+
+        recognizes *@@recognizes
+
+        model_path 'fog/openstack/models/volume_v1'
+
+        model :volume
+        collection :volumes
+
+        model :availability_zone
+        collection :availability_zones
+
+        model :volume_type
+        collection :volume_types
+
+        model :transfer
+        collection :transfers
+
+        request_path 'fog/openstack/requests/volume_v1'
+
+        # Volume
+        request :list_volumes
+        request :list_volumes_detailed
+        request :create_volume
+        request :get_volume_details
+        request :extend_volume
+        request :delete_volume
+
+        request :list_zones
+
+        request :list_volume_types
+        request :create_volume_type
+        request :delete_volume_type
+        request :get_volume_type_details
+
+        request :create_volume_snapshot
+        request :list_snapshots
+        request :list_snapshots_detailed
+        request :get_snapshot_details
+        request :delete_snapshot
+
+        request :list_transfers
+        request :list_transfers_detailed
+        request :create_transfer
+        request :get_transfer_details
+        request :accept_transfer
+        request :delete_transfer
+
+        request :update_quota
+        request :get_quota
+        request :get_quota_defaults
+
+        request :get_quota_usage
+
+        request :set_tenant
+
+        class Mock
+          def self.data
+            @data ||= Hash.new do |hash, key|
+              hash[key] = {
+                  :users   => {},
+                  :tenants => {},
+                  :quota   => {
+                      'gigabytes' => 1000,
+                      'volumes'   => 10,
+                      'snapshots' => 10
+                  }
+              }
+            end
+          end
+
+          def self.reset
+            @data = nil
+          end
+
+          def initialize(options={})
+            @openstack_username = options[:openstack_username]
+            @openstack_tenant   = options[:openstack_tenant]
+            @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
+
+            @auth_token            = Fog::Mock.random_base64(64)
+            @auth_token_expiration = (Time.now.utc + 86400).iso8601
+
+            management_url            = URI.parse(options[:openstack_auth_url])
+            management_url.port       = 8776
+            management_url.path       = '/v1'
+            @openstack_management_url = management_url.to_s
+
+            @data ||= {:users => {}}
+            unless @data[:users].find { |u| u['name'] == options[:openstack_username] }
+              id                = Fog::Mock.random_numbers(6).to_s
+              @data[:users][id] = {
+                  'id'       => id,
+                  'name'     => options[:openstack_username],
+                  'email'    => "#{options[:openstack_username]}@mock.com",
+                  'tenantId' => Fog::Mock.random_numbers(6).to_s,
+                  'enabled'  => true
+              }
+            end
+          end
+
+          def data
+            self.class.data[@openstack_username]
+          end
+
+          def reset_data
+            self.class.data.delete(@openstack_username)
+          end
+
+          def credentials
+            {:provider                 => 'openstack',
+             :openstack_auth_url       => @openstack_auth_uri.to_s,
+             :openstack_auth_token     => @auth_token,
+             :openstack_management_url => @openstack_management_url}
+          end
+        end
+
+        class Real
+          include Fog::OpenStack::Core
+          def self.not_found_class
+            Fog::Volume::OpenStack::NotFound
+          end
+          include Fog::OpenStack::Common
+
+          def initialize(options={})
+            initialize_identity options
+
+            @openstack_service_type  = options[:openstack_service_type] || ['volume']
+            @openstack_service_name  = options[:openstack_service_name]
+            @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL'
+
+            @connection_options = options[:connection_options] || {}
+
+            authenticate
+
+            unless @path.match(SUPPORTED_VERSIONS)
+              @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS,
+                                                                @openstack_management_uri,
+                                                                @auth_token,
+                                                                @connection_options)
+            end
+
+            @persistent = options[:persistent] || false
+            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          end
+
+          private
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/volume_v2.rb

@@ -0,0 +1,164 @@
+require 'fog/openstack/core'
+require 'fog/openstack/common'
+require 'fog/openstack/volume'
+
+module Fog
+  module Volume
+    class OpenStack
+      class V2 < Fog::Volume::OpenStack
+        SUPPORTED_VERSIONS = /v2(\.(0-9))*/
+
+        requires :openstack_auth_url
+
+        recognizes *@@recognizes
+
+        model_path 'fog/openstack/models/volume_v2'
+
+        model :volume
+        collection :volumes
+
+        model :availability_zone
+        collection :availability_zones
+
+        model :volume_type
+        collection :volume_types
+
+        model :transfer
+        collection :transfers
+
+        request_path 'fog/openstack/requests/volume_v2'
+
+        # Volume
+        request :list_volumes
+        request :list_volumes_detailed
+        request :create_volume
+        request :get_volume_details
+        request :extend_volume
+        request :delete_volume
+
+        request :list_zones
+
+        request :list_volume_types
+        request :create_volume_type
+        request :update_volume_type
+        request :delete_volume_type
+        request :get_volume_type_details
+
+        request :create_volume_snapshot
+        request :list_snapshots
+        request :list_snapshots_detailed
+        request :get_snapshot_details
+        request :delete_snapshot
+
+        request :list_transfers
+        request :list_transfers_detailed
+        request :create_transfer
+        request :get_transfer_details
+        request :accept_transfer
+        request :delete_transfer
+
+        request :update_quota
+        request :get_quota
+        request :get_quota_defaults
+
+        request :get_quota_usage
+
+        request :set_tenant
+
+        class Mock
+          def self.data
+            @data ||= Hash.new do |hash, key|
+              hash[key] = {
+                  :users   => {},
+                  :tenants => {},
+                  :quota   => {
+                      'gigabytes' => 1000,
+                      'volumes'   => 10,
+                      'snapshots' => 10
+                  }
+              }
+            end
+          end
+
+          def self.reset
+            @data = nil
+          end
+
+          def initialize(options={})
+            @openstack_username = options[:openstack_username]
+            @openstack_tenant   = options[:openstack_tenant]
+            @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
+
+            @auth_token            = Fog::Mock.random_base64(64)
+            @auth_token_expiration = (Time.now.utc + 86400).iso8601
+
+            management_url            = URI.parse(options[:openstack_auth_url])
+            management_url.port       = 8776
+            management_url.path       = '/v1'
+            @openstack_management_url = management_url.to_s
+
+            @data ||= {:users => {}}
+            unless @data[:users].find { |u| u['name'] == options[:openstack_username] }
+              id                = Fog::Mock.random_numbers(6).to_s
+              @data[:users][id] = {
+                  'id'       => id,
+                  'name'     => options[:openstack_username],
+                  'email'    => "#{options[:openstack_username]}@mock.com",
+                  'tenantId' => Fog::Mock.random_numbers(6).to_s,
+                  'enabled'  => true
+              }
+            end
+          end
+
+          def data
+            self.class.data[@openstack_username]
+          end
+
+          def reset_data
+            self.class.data.delete(@openstack_username)
+          end
+
+          def credentials
+            {:provider                 => 'openstack',
+             :openstack_auth_url       => @openstack_auth_uri.to_s,
+             :openstack_auth_token     => @auth_token,
+             :openstack_management_url => @openstack_management_url}
+          end
+        end
+
+        class Real
+          include Fog::OpenStack::Core
+          def self.not_found_class
+            Fog::Volume::OpenStack::NotFound
+          end
+          include Fog::OpenStack::Common
+
+          def initialize(options={})
+            initialize_identity options
+
+            @openstack_service_type  = options[:openstack_service_type] || ['volumev2']
+            @openstack_service_name  = options[:openstack_service_name]
+            @openstack_endpoint_type = options[:openstack_endpoint_type] || 'adminURL'
+
+            @connection_options = options[:connection_options] || {}
+
+            authenticate
+
+            unless @path.match(SUPPORTED_VERSIONS)
+              @path = Fog::OpenStack.get_supported_version_path(SUPPORTED_VERSIONS,
+                                                                @openstack_management_uri,
+                                                                @auth_token,
+                                                                @connection_options)
+            end
+
+            @persistent = options[:persistent] || false
+            @connection = Fog::Core::Connection.new("#{@scheme}://#{@host}:#{@port}", @persistent, @connection_options)
+          end
+
+          private
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/compute_v2.rb

@@ -117,6 +117,7 @@ module Fog
       request :list_virtual_interfaces
       request :create_virtual_interface
       request :delete_virtual_interface
+      request :get_vnc_console
 
       class Mock < Fog::Rackspace::Service
         include Fog::Rackspace::MockData

data/lib/fog/rackspace/docs/compute_v2.md

@@ -120,7 +120,7 @@ To see a list of requests supported by the service:
 	
 This returns:
 
-	:list_servers, :get_server, :create_server, :update_server, :delete_server, :change_server_password, :reboot_server, :rebuild_server, :resize_server, :confirm_resize_server, :revert_resize_server, :list_images, :get_image, :list_flavors, :get_flavor, :attach_volume, :get_attachment, :list_attachments, :delete_attachment
+	:list_servers, :get_server, :create_server, :update_server, :delete_server, :change_server_password, :reboot_server, :rebuild_server, :resize_server, :confirm_resize_server, :revert_resize_server, :list_images, :get_image, :list_flavors, :get_flavor, :attach_volume, :get_attachment, :list_attachments, :delete_attachment, :get_vnc_console
 
 
 #### Example Request

data/lib/fog/rackspace/models/compute_v2/server.rb

@@ -618,6 +618,20 @@ module Fog
           @virtual_interfaces ||= Fog::Compute::RackspaceV2::VirtualInterfaces.new :server => self, :service => service
         end
 
+        # VNC Console URL
+        # @param [String] Type of vnc console to get ('novnc' or 'xvpvnc')
+        # @return [String] returns URL to vnc console
+        # @raise [Fog::Compute::RackspaceV2::NotFound] - HTTP 404
+        # @raise [Fog::Compute::RackspaceV2::BadRequest] - HTTP 400
+        # @raise [Fog::Compute::RackspaceV2::InternalServerError] - HTTP 500
+        # @raise [Fog::Compute::RackspaceV2::ServiceError]
+        # @note This URL will time out due to inactivity
+        def get_vnc_console(console_type = "xvpvnc")
+          requires :identity
+          data = service.get_vnc_console(identity, console_type)
+          data.body['console']['url']
+        end
+
         private
 
         def adminPass=(new_admin_pass)

data/lib/fog/rackspace/requests/compute_v2/get_vnc_console.rb

@@ -0,0 +1,45 @@
+module Fog
+  module Compute
+    class RackspaceV2
+      class Real
+        # Get a vnc console for an instance.
+        #
+        # === Parameters
+        # * server_id <~String> - The ID of the server.
+        # * console_type <~String> - Type of vnc console to get ('novnc' or 'xvpvnc').
+        # === Returns
+        # * response <~Excon::Response>:
+        #   * body <~Hash>:
+        #     * url <~String>
+        #     * type <~String>
+        def get_vnc_console(server_id, console_type)
+          data = {
+            'os-getVNCConsole' => {
+              'type' => console_type
+            }
+          }
+          request(
+            :body => Fog::JSON.encode(data),
+            :expects => [200],
+            :method => 'POST',
+            :path => "servers/#{server_id}/action"
+          )
+        end # def get_vnc_console
+      end # class Real
+
+      class Mock
+        def get_vnc_console(server_id, console_type)
+          response = Excon::Response.new
+          response.status = 200
+          response.body = {
+            "console" => {
+              "url"  => "http://192.168.27.100:6080/vnc_auto.html?token=c3606020-d1b7-445d-a88f-f7af48dd6a20",
+              "type" => "novnc"
+            }
+          }
+          response
+        end # def get_vnc_console
+      end # class Mock
+    end # class OpenStack
+  end # module Compute
+end # module Fog

data/lib/fog/rackspace/requests/storage/put_container.rb

@@ -11,12 +11,16 @@ module Fog
         # @raise [Fog::Storage::Rackspace::InternalServerError] - HTTP 500
         # @raise [Fog::Storage::Rackspace::ServiceError]
         def put_container(name, options={})
-          request(
-            :expects  => [201, 202],
-            :method   => 'PUT',
-            :headers => options,
-            :path     => Fog::Rackspace.escape(name)
-          )
+          if name =~ /\//
+            raise Fog::Errors::Error.new('Folder names cannot include "/".')
+          else
+            request(
+              :expects  => [201, 202],
+              :method   => 'PUT',
+              :headers => options,
+              :path     => Fog::Rackspace.escape(name)
+            )
+          end
         end
       end
 

data/lib/fog/vcloud_director/compute.rb

@@ -225,6 +225,7 @@ module Fog
       request :post_power_off_vapp
       request :post_power_on_vapp
       request :post_reboot_vapp
+      request :post_reconfigure_vm
       request :post_remove_all_snapshots
       request :post_reset_vapp
       request :post_revert_snapshot
@@ -506,12 +507,16 @@ module Fog
       class Mock
         attr_reader :end_point, :api_version
 
+        # This is used in some mocks so it's a method rather than a variable
+        def default_network_uuid
+          @default_network_uuid ||= uuid
+        end
+
         def data
           @@data ||= Hash.new do |hash, key|
 
             vdc1_uuid = uuid
             vdc2_uuid = uuid
-            default_network_uuid = uuid
             uplink_network_uuid  = uuid
             isolated_vdc1_network_uuid = uuid
             isolated_vdc2_network_uuid = uuid
@@ -521,6 +526,7 @@ module Fog
             vapp2vm1_id = "vm-#{uuid}"
             vapp2vm2_id = "vm-#{uuid}"
             catalog_uuid = uuid
+            template_uuid = uuid
 
             hash[key] = {
               :catalogs => {
@@ -533,9 +539,16 @@ module Fog
                   :type    => 'vAppTemplate',
                   :name    => 'vAppTemplate 1',
                   :catalog => catalog_uuid,
+                  :template_id => template_uuid
+                }
+              },
+              :disks => {
+                uuid => {
+                  :name => 'Hard Disk 1',
+                  :capacity => 10240,
+                  :parent_vm => vapp1vm1_id
                 }
               },
-              :disks => {},
               :edge_gateways => {
                 uuid => {
                   :name => 'MockEdgeGateway',
@@ -677,6 +690,9 @@ module Fog
                 :name => org_name,
                 :uuid => uuid
               },
+              
+              :tags => {},
+              
               :tasks => {},
 
               :vapps => {