fog-maestrodev 1.14.0.20130806165225 → 1.15.0.20130829165835

data/lib/fog/google/models/compute/server.rb

@@ -10,6 +10,8 @@ module Fog
         identity :name
         attribute :image_name, :aliases => 'image'
         attribute :network_interfaces, :aliases => 'networkInterfaces'
+        attribute :network, :aliases => 'network'
+        attribute :external_ip, :aliases => 'externalIP'
         attribute :state, :aliases => 'status'
         attribute :zone_name, :aliases => 'zone'
         attribute :machine_type, :aliases => 'machineType'
@@ -28,11 +30,13 @@ module Fog
 
         def public_ip_address
           ip = nil
-          if self.network_interfaces
+          if self.network_interfaces.respond_to? :each
             self.network_interfaces.each do |netif|
-              netif["accessConfigs"].each do |access_config|
-                if access_config["name"] == "External NAT"
-                  ip = access_config['natIP']
+              if netif["accessConfigs"].respond_to? :each
+                netif["accessConfigs"].each do |access_config|
+                  if access_config["name"] == "External NAT"
+                    ip = access_config['natIP']
+                  end
                 end
               end
             end
@@ -41,6 +45,14 @@ module Fog
           ip
         end
 
+        def private_ip_address
+          ip = nil
+          if self.network_interfaces.respond_to? :first
+            ip = self.network_interfaces.first['networkIP']
+          end
+          ip
+        end
+
         def ready?
           self.state == RUNNING
         end
@@ -55,6 +67,23 @@ module Fog
           end
         end
 
+        def add_ssh_key username, key
+          if self.metadata.nil?
+            self.metadata = Hash.new("")
+          end
+
+          # You can have multiple SSH keys, seperated by newlines.
+          # https://developers.google.com/compute/docs/console?hl=en#sshkeys
+          if !self.metadata["sshKeys"].empty?
+            self.metadata["sshKeys"] += "\n"
+          end
+
+          self.metadata["sshKeys"] += "#{username}:#{key.strip}"
+
+          return self.metadata
+        end
+
+
         def reload
           data = service.get_server(self.name, self.zone).body
           self.merge_attributes(data)
@@ -65,25 +94,26 @@ module Fog
           requires :machine_type
           requires :zone_name
 
-          if self.metadata.nil?
-            self.metadata = {}
+          if not service.zones.include? self.zone_name
+            raise ArgumentError.new "#{self.zone_name.inspect} is either down or you don't have permission to use it."
           end
 
-          self.metadata.merge!({
-            "sshKeys" => "#{username}:#{public_key.strip}"
-          }) if public_key
+          self.add_ssh_key(self.username, self.public_key) if self.public_key
 
           options = {
               'image' => image_name,
               'machineType' => machine_type,
               'networkInterfaces' => network_interfaces,
+              'network' => network,
+              'externalIp' => external_ip,
               'disks' => disks,
               'kernel' => kernel,
               'metadata' => metadata
-          }
-          options.delete_if {|key, value| value.nil?}
+          }.delete_if {|key, value| value.nil?}
+
           service.insert_server(name, zone_name, options)
           data = service.backoff_if_unfound {service.get_server(self.name, self.zone_name).body}
+
           service.servers.merge_attributes(data)
         end
 

data/lib/fog/google/models/compute/servers.rb

@@ -49,7 +49,7 @@ module Fog
             :name => "fog-#{Time.now.to_i}",
             :image_name => "debian-7-wheezy-v20130617",
             :machine_type => "n1-standard-1",
-            :zone_name => "us-central1-a",
+            :zone_name => "us-central1-b",
             :private_key_path => File.expand_path("~/.ssh/id_rsa"),
             :public_key_path => File.expand_path("~/.ssh/id_rsa.pub"),
             :username => ENV['USER'],

data/lib/fog/google/models/compute/snapshot.rb

@@ -0,0 +1,36 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Google
+
+      class Snapshot < Fog::Model
+
+        identity :name
+
+        attribute :kind
+        attribute :self_link         , :aliases => 'selfLink'
+        attribute :creation_timestamp, :aliases => 'creationTimestamp'
+        attribute :disk_size_gb      , :aliases => 'diskSizeGb'
+        attribute :source_disk       , :aliases => 'sourceDisk'
+        attribute :source_disk_id    , :aliases => 'sourceDiskId'
+        attribute :description
+
+        def reload
+          requires :name
+
+          data = service.get_snapshot(name, self.service.project).body
+
+          self.merge_attributes(data)
+          self
+        end
+
+        def resource_url
+          "#{self.service.project}/global/snapshots/#{name}"
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/google/models/compute/snapshots.rb

@@ -0,0 +1,28 @@
+require 'fog/core/collection'
+require 'fog/google/models/compute/snapshot'
+
+module Fog
+  module Compute
+    class Google
+
+      class Snapshots < Fog::Collection
+
+        model Fog::Compute::Google::Snapshot
+
+        def all
+          data = service.list_snapshots(self.service.project)
+          snapshots = data.body['items'] || []
+          load(snapshots)
+        end
+
+        def get(snap_id)
+          response = service.get_snapshot(snap_id, self.service.project)
+          return nil if response.nil?
+          new(response.body)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/google/requests/compute/delete_disk.rb

@@ -12,7 +12,11 @@ module Fog
 
       class Real
 
-        def delete_disk(disk_name, zone_name=@default_zone)
+        def delete_disk(disk_name, zone_name)
+          if zone_name.start_with? 'http'
+            zone_name = zone_name.split('/')[-1]
+          end
+
           api_method = @compute.disks.delete
           parameters = {
             'project' => @project,

data/lib/fog/google/requests/compute/get_disk.rb

@@ -12,10 +12,11 @@ module Fog
 
       class Real
 
-        def get_disk(disk_name, zone_name=@default_zone)
+        def get_disk(disk_name, zone_name)
           if zone_name.start_with? 'http'
             zone_name = zone_name.split('/')[-1]
           end
+
           api_method = @compute.disks.get
           parameters = {
             'project' => @project,

data/lib/fog/google/requests/compute/get_snapshot.rb

@@ -0,0 +1,34 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def get_snapshot(snap_name)
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def get_snapshot(snap_name, project=@project)
+          if snap_name.nil?
+            raise ArgumentError.new "snap_name must not be nil."
+          end
+
+          api_method = @compute.snapshots.get
+          parameters = {
+            'snapshot' => snap_name,
+            'project'  => project,
+          }
+
+          result = self.build_result(api_method, parameters)
+          response = self.build_response(result)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/google/requests/compute/insert_disk.rb

@@ -12,22 +12,38 @@ module Fog
 
       class Real
 
-        def insert_disk(disk_name, disk_size, zone_name=@default_zone, image_name=nil)
+        def insert_disk(disk_name, zone_name, image_name=nil, opts={})
           api_method = @compute.disks.insert
           parameters = {
             'project' => @project,
             'zone' => zone_name
           }
+
           if image_name
-            # We don't know the owner of the image.
-            image = images.create({:name => image_name})
+            image = images.get(image_name)
+            raise ArgumentError.new('Invalid image specified') unless image
             @image_url = @api_url + image.resource_url
             parameters['sourceImage'] = @image_url
           end
-          body_object = {
-            'name' => disk_name,
-            'sizeGb' => disk_size,
-          }
+
+          body_object = { 'name' => disk_name }
+
+          # These must be present if image_name is not specified
+          if image_name.nil?
+            unless opts.has_key?('sourceSnapshot') and opts.has_key?('sizeGb')
+              raise ArgumentError.new('Must specify image OR snapshot and '\
+                                      'disk size when creating a disk.')
+            end
+
+            body_object['sizeGb'] = opts.delete('sizeGb')
+
+            snap = snapshots.get(opts.delete('sourceSnapshot'))
+            raise ArgumentError.new('Invalid source snapshot') unless snap
+            body_object['sourceSnapshot'] = @api_url + snap.resource_url
+          end
+
+          # Merge in any remaining options (only 'description' should remain)
+          body_object.merge(opts)
 
           result = self.build_result(api_method, parameters,
                                      body_object)

data/lib/fog/google/requests/compute/insert_image.rb

@@ -12,22 +12,29 @@ module Fog
 
       class Real
 
-        def insert_image(image_name, source)
+        def insert_image(image_name, options={})
           api_method = @compute.images.insert
+
           parameters = {
             'project' => @project,
           }
+
+          kernel_url = @api_url + 'google/global/kernels/' + \
+                      options.delete('preferredKernel').to_s
+
           body_object = {
-            "name" => image_name,
-            "sourceType" => "RAW",
-            "source" => source,
-            "preferredKernel" => '',
+            'sourceType'      => 'RAW',
+            'name'            => image_name,
+            'rawDisk'         => options.delete('rawDisk'),
+            'preferredKernel' => kernel_url,
           }
 
-          result = self.build_result(
-            api_method,
-            parameters,
-            body_object=body_object)
+          # Merge in the remaining params (only 'description' should remain)
+          body_object.merge(options)
+
+          result = self.build_result(api_method,
+                                     parameters,
+                                     body_object=body_object)
           response = self.build_response(result)
         end
 

data/lib/fog/google/requests/compute/insert_server.rb

@@ -30,22 +30,34 @@ module Fog
 
           if options.has_key? 'image'
             image_name = options.delete 'image'
-            # We don't know the owner of the image.
-            image = images.create({:name => image_name})
+            image = images.get(image_name)
             @image_url = @api_url + image.resource_url
             body_object['image'] = @image_url
           end
           body_object['machineType'] = @api_url + @project + "/zones/#{zone_name}/machineTypes/#{options.delete 'machineType'}"
+          network = nil
+          if options.has_key? 'network'
+            network = options.delete 'network'
+          elsif @default_network
+            network = @default_network
+          end
+
+          # ExternalIP is default value for server creation
+          if options.has_key? 'externalIp'
+            external_ip = options.delete 'externalIp'
+          else
+             external_ip = true
+          end
+
           networkInterfaces = []
-          if @default_network
-            networkInterfaces << {
-                'network' => @api_url + @project + "/global/networks/#{@default_network}",
-                'accessConfigs' => [
-                    {'type' => 'ONE_TO_ONE_NAT',
-                     'name' => 'External NAT'}
-                ]
-            }
+          if ! network.nil?
+            networkInterface = { 'network' => @api_url + @project + "/global/networks/#{network}" }
+            if external_ip
+              networkInterface['accessConfigs'] = [{'type' => 'ONE_TO_ONE_NAT', 'name' => 'External NAT'}]
+            end
+            networkInterfaces <<  networkInterface
           end
+
           # TODO: add other networks
           body_object['networkInterfaces'] = networkInterfaces
 

data/lib/fog/google/requests/compute/list_disks.rb

@@ -12,7 +12,7 @@ module Fog
 
       class Real
 
-        def list_disks(zone_name=@default_zone)
+        def list_disks(zone_name)
           api_method = @compute.disks.list
           parameters = {
             'project' => @project,

data/lib/fog/google/requests/compute/list_snapshots.rb

@@ -0,0 +1,30 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def list_snapshots
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def list_snapshots(project=nil)
+          api_method = @compute.snapshots.list
+          project=@project if project.nil?
+          parameters = {
+            'project' => project
+          }
+
+          result = self.build_result(api_method, parameters)
+          response = self.build_response(result)
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/google/storage.rb

@@ -144,7 +144,6 @@ module Fog
         end
 
         def initialize(options={})
-          require 'mime/types'
           @google_storage_access_key_id = options[:google_storage_access_key_id]
         end
 
@@ -162,7 +161,7 @@ module Fog
 
       end
 
-    
+
       class Real
         include Utils
 
@@ -185,7 +184,6 @@ module Fog
         # * Storage object with connection to google.
         def initialize(options={})
           require 'fog/core/parser'
-          require 'mime/types'
 
           @google_storage_access_key_id = options[:google_storage_access_key_id]
           @google_storage_secret_access_key = options[:google_storage_secret_access_key]

data/lib/fog/hp/storage.rb

@@ -220,7 +220,6 @@ module Fog
         end
 
         def initialize(options={})
-          require 'mime/types'
           # deprecate hp_account_id
           if options[:hp_account_id]
             Fog::Logger.deprecation(":hp_account_id is deprecated, please use :hp_access_key instead.")
@@ -250,7 +249,6 @@ module Fog
         attr_reader :hp_cdn_ssl
 
         def initialize(options={})
-          require 'mime/types'
           # deprecate hp_account_id
           if options[:hp_account_id]
             Fog::Logger.deprecation(":hp_account_id is deprecated, please use :hp_access_key instead.")

data/lib/fog/internet_archive/storage.rb

@@ -196,7 +196,6 @@ module Fog
         end
 
         def initialize(options={})
-          require 'mime/types'
           setup_credentials(options)
           options[:region] ||= 'us-east-1'
           @host = options[:host] || Fog::InternetArchive::API_DOMAIN_NAME
@@ -248,7 +247,6 @@ module Fog
         # * S3 object with connection to aws.
         def initialize(options={})
           require 'fog/core/parser'
-          require 'mime/types'
 
           setup_credentials(options)
           @connection_options     = options[:connection_options] || {}

data/lib/fog/local/storage.rb

@@ -33,7 +33,6 @@ module Fog
         def initialize(options={})
           Fog::Mock.not_implemented
 
-          require 'mime/types'
           @local_root = ::File.expand_path(options[:local_root])
 
           @endpoint = options[:endpoint] || build_endpoint_from_options(options)
@@ -68,7 +67,6 @@ module Fog
         attr_reader :endpoint
 
         def initialize(options={})
-          require 'mime/types'
           @local_root = ::File.expand_path(options[:local_root])
 
           @endpoint = options[:endpoint] || build_endpoint_from_options(options)

data/lib/fog/ninefold/storage.rb

@@ -26,7 +26,6 @@ module Fog
         include Utils
 
         def initialize(options={})
-          require 'mime/types'
           @ninefold_storage_token = options[:ninefold_storage_token]
           @ninefold_storage_secret = options[:ninefold_storage_secret]
         end

data/lib/fog/openstack/models/storage/file.rb

@@ -10,6 +10,7 @@ module Fog
 
         attribute :content_length,  :aliases => ['bytes', 'Content-Length'], :type => :integer
         attribute :content_type,    :aliases => ['content_type', 'Content-Type']
+        attribute :content_disposition, :aliases => ['content_disposition', 'Content-Disposition']
         attribute :etag,            :aliases => ['hash', 'Etag']
         attribute :last_modified,   :aliases => ['last_modified', 'Last-Modified'], :type => :time
         attribute :access_control_allow_origin, :aliases => ['Access-Control-Allow-Origin']
@@ -72,6 +73,7 @@ module Fog
         def save(options = {})
           requires :body, :directory, :key
           options['Content-Type'] = content_type if content_type
+          options['Content-Disposition'] = content_disposition if content_disposition
           options['Access-Control-Allow-Origin'] = access_control_allow_origin if access_control_allow_origin
           options['Origin'] = origin if origin
           options.merge!(metadata_to_headers)

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

@@ -21,7 +21,7 @@ module Fog
           response = Excon::Response.new
           response.status = 200
           response.body = {
-            "flavor_access" => [{ "tenant_id" => tenant_id, "flavor_id" => flavor_ref }]
+            "flavor_access" => [{ "tenant_id" => tenant_id.to_s, "flavor_id" => flavor_ref.to_s }]
           }
           response
         end

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

@@ -33,15 +33,16 @@ module Fog
           response.status = 202
           data = {
             'id'                  => Fog::Mock.random_numbers(2),
-            'name'                => name,
-            'description'         => description,
+            'displayName'         => name,
+            'displayDescription'  => description,
             'size'                => size,
             'status'              => 'creating',
-            'snapshot_id'         => '4',
-            'volume_type'         => nil,
-            'availability_zone'   => 'nova',
-            'created_at'          => Time.now,
-            'attachments'         => []
+            'snapshotId'          => nil,
+            'volumeType'          => 'None',
+            'availabilityZone'    => 'nova',
+            'createdAt'           => Time.now.strftime('%FT%T.%6N'),
+            'attachments'         => [],
+            'metadata'            => {}
           }
           self.data[:volumes][data['id']] = data
           response.body = { 'volume' => data }

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

@@ -16,7 +16,7 @@ module Fog
           response = Excon::Response.new
           response.status = 200
           response.body = {
-            "flavor_access" => [{ "tenant_id" => @tenant_id, "flavor_id" => flavor_ref }]
+            "flavor_access" => [{ "tenant_id" => @tenant_id.to_s, "flavor_id" => flavor_ref.to_s }]
           }
           response
         end

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

@@ -6,7 +6,7 @@ module Fog
           request(
             :body => MultiJson.encode({
               "removeTenantAccess" => {
-                "tenant" => tenant_id
+                "tenant" => tenant_id.to_s
               }
             }),
             :expects  => [200, 203],

data/lib/fog/openstack/requests/image/create_image.rb

@@ -5,18 +5,18 @@ module Fog
 
         def create_image(attributes)
           data = {
-            'Content-Type'=>'application/octet-stream',
-            'x-image-meta-name' => attributes[:name],
-            'x-image-meta-disk-format' => attributes[:disk_format],
+            'Content-Type'                  =>'application/octet-stream',
+            'x-image-meta-name'             => attributes[:name],
+            'x-image-meta-disk-format'      => attributes[:disk_format],
             'x-image-meta-container-format' => attributes[:container_format],
-            'x-image-meta-size' => attributes[:size],
-            'x-image-meta-is-public' => attributes[:is_public],
-            'x-image-meta-min-ram'  => attributes[:min_ram],
-            'x-image-meta-min-disk' => attributes[:min_disk],
-            'x-image-meta-checksum' => attributes[:checksum],
-            'x-image-meta-owner' => attributes[:owner],
-            'x-glance-api-copy-from' => attributes[:copy_from]
-          }.reject { |k,v| v.nil? }
+            'x-image-meta-size'             => attributes[:size],
+            'x-image-meta-is-public'        => attributes[:is_public],
+            'x-image-meta-min-ram'          => attributes[:min_ram],
+            'x-image-meta-min-disk'         => attributes[:min_disk],
+            'x-image-meta-checksum'         => attributes[:checksum],
+            'x-image-meta-owner'            => attributes[:owner],
+            'x-glance-api-copy-from'        => attributes[:copy_from]
+          }.reject {|k,v| v.nil? }
 
           body = String.new
           if attributes[:location]
@@ -52,23 +52,23 @@ module Fog
 
           image_id = Fog::Mock.random_hex(32)
           image = self.data[:images][image_id] = {
-            'name'             => attributes['name'] || attributes[:name],
-            'size'             => Fog::Mock.random_numbers(8).to_i,
-            'min_disk'         => 0,
-            'disk_format'      => attributes['disk_format'] || attributes[:disk_format] || 'raw',
-            'created_at'       => Time.now.to_s,
-            'container_format' => attributes['container_format'] || attributes[:container_format] || 'bare',
+            'name'             => attributes[:name],
+            'size'             => attributes[:size] || Fog::Mock.random_numbers(8).to_i,
+            'min_disk'         => attributes[:min_disk] || 0,
+            'disk_format'      => attributes[:disk_format] || 'raw',
+            'created_at'       => Time.now.strftime('%FT%T.%6N'),
+            'container_format' => attributes[:container_format] || 'bare',
             'deleted_at'       => nil,
-            'updated_at'       => Time.now.to_s,
-            'checksum'         => Fog::Mock.random_hex(32),
+            'updated_at'       => Time.now.strftime('%FT%T.%6N'),
+            'checksum'         => attributes[:checksum] || Fog::Mock.random_hex(32),
             'id'               => image_id,
             'deleted'          => false,
             'protected'        => false,
-            'is_public'        => false,
+            'is_public'        => attributes[:is_public].to_s == 'true',
             'status'           => 'queued',
-            'min_ram'          => 0,
-            'owner'            => attributes['owner'] || attributes[:owner],
-            'properties'       => attributes['properties'] || attributes[:properties] || {}
+            'min_ram'          => attributes[:min_ram] || 0,
+            'owner'            => attributes[:owner],
+            'properties'       => attributes[:properties] || {}
           }
           response.body = { 'image'=> image }
           response