fog-maestrodev 1.18.0.20131219033443 → 1.18.0.20131219193542

data/fog.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog-maestrodev'
-  s.version           = '1.18.0.20131219033443'
-  s.date              = '2013-12-18'
+  s.version           = '1.18.0.20131219193542'
+  s.date              = '2013-12-19'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog/google/compute.rb

@@ -84,7 +84,11 @@ module Fog
           response.body = body
           if response.body and response.body["error"]
             response.status = response.body["error"]["code"]
-            msg = response.body["error"]["errors"].map{|error| error["message"]}.join(", ")
+            if response.body["error"]["errors"]
+              msg = response.body["error"]["errors"].map{|error| error["message"]}.join(", ")
+            else
+              msg = "Error [#{response.body["error"]["code"]}]: #{response.body["error"]["message"] || "GCE didn't return an error message"}"
+            end
             case response.status
             when 404
               raise Fog::Errors::NotFound.new(msg)
@@ -301,8 +305,11 @@ module Fog
                       {
                         "kind" => "compute#attachedDisk",
                         "index" => 0,
-                        "type" => "SCRATCH",
-                        "mode" => "READ_WRITE"
+                        "type" => "PERSISTENT",
+                        "mode" => "READ_WRITE",
+                        "source" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/disks/fog-1",
+                        "deviceName" => "persistent-disk-0",
+                        "boot" => true
                       }
                     ],
                     "metadata" => {
@@ -777,7 +784,30 @@ module Fog
                   }
                 end,
                 :images => {},
-                :disks => {},
+                :disks => {
+                  "fog-1" => {
+                    "kind" => "compute#disk",
+                    "id" => "3338131294770784461",
+                    "creationTimestamp" => "2013-12-18T19:47:10.583-08:00",
+                    "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a",
+                    "status" => "READY",
+                    "name" => "fog-1",
+                    "sizeGb" => "10",
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/disks/fog-1",
+                    "sourceImage" => "https://www.googleapis.com/compute/#{api_version}/projects/debian-cloud/global/images/debian-7-wheezy-v20131120",
+                    "sourceImageId" => "17312518942796567788"
+                  },
+                  "fog-2" => {
+                    "kind" => "compute#disk",
+                    "id" => "3338131294770784462",
+                    "creationTimestamp" => "2013-12-18T19:47:10.583-08:00",
+                    "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a",
+                    "status" => "READY",
+                    "name" => "fog-2",
+                    "sizeGb" => "10",
+                    "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{key}/zones/us-central1-a/disks/fog-1"
+                  }
+                },
                 :operations => {}
               }
             end

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

@@ -63,8 +63,9 @@ module Fog
             'boot' => boot,
             'source' => self_link,
             'mode' => mode,
-            'deviceName' => device_name
-          }.select { |k, v| v.respond_to?(:empty?) ? !v.empty? : !v.nil? }
+            'deviceName' => device_name,
+            'type' => 'PERSISTENT'
+          }.select { |k, v| !v.nil? }
         end
 
         def get_as_boot_disk(writable=true)

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

@@ -16,6 +16,7 @@ module Fog
           :aliases => 'maximumPersistentDisks'
         attribute :maximum_persistent_disks_size,
           :aliases => 'maximumPersistentDisksSizeGb'
+        attribute :self_link, :aliases => 'selfLink'
 
       end
 

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

@@ -8,7 +8,9 @@ module Fog
 
         identity :name
 
+        attribute :id
         attribute :kind
+        attribute :self_link, :aliases => 'selfLink'
         attribute :creation_timestamp, :aliases => 'creationTimestamp'
         attribute :description
 

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

@@ -18,14 +18,22 @@ module Fog
         attribute :disks, :aliases => 'disks'
         attribute :metadata
         attribute :tags, :squash => 'items'
+        attribute :self_link, :aliases => 'selfLink'
 
         def image_name=(args)
           Fog::Logger.deprecation("image_name= is no longer used [light_black](#{caller.first})[/]")
         end
+
         def image_name
-          Fog::Logger.deprecation("image_name is deprecated, use source_image from boot disk [light_black](#{caller.first})[/]")
-          disks.first.source_image
+          boot_disk = disks.first
+          unless boot_disk.is_a?(Disk)
+            source = boot_disk['source']
+            match = source.match(%r{/zones/(.*)/disks/(.*)$})
+            boot_disk = service.disks.get match[2], match[1]
+          end
+          boot_disk.source_image.nil? ? nil : boot_disk.source_image
         end
+
         def kernel=(args)
           Fog::Logger.deprecation("kernel= is no longer used [light_black](#{caller.first})[/]")
         end

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

@@ -14,6 +14,7 @@ module Fog
         attribute :end_time, :aliases => 'endTime'
         attribute :quotas
         attribute :region
+        attribute :self_link, :aliases => 'selfLink'
 
         def up?
           self.status == "UP"

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

@@ -6,21 +6,15 @@ module Fog
 
         def insert_disk(disk_name, zone_name, image_name=nil, options={})
           # check that image and zone exist
-          image_project = nil
-          unless image_name.nil?
-            ([ @project ] + Fog::Compute::Google::Images::GLOBAL_PROJECTS).each do |project|
-              if data(project)[:images][image_name]
-                image_project = project
-                break;
-              end
-            end
-            raise ArgumentError.new("Invalid image specified: #{image_name}") unless image_project
-            get_image(image_name, image_project) # ok if image exists, will fail otherwise
+          image = nil
+          if image_name
+            image = images.get(image_name)
+            raise ArgumentError.new("Invalid image specified: #{image_name}") unless image
           end
           get_zone(zone_name)
 
           id = Fog::Mock.random_numbers(19).to_s
-          self.data[:disks][disk_name] = {
+          object = {
             "kind" => "compute#disk",
             "id" => id,
             "creationTimestamp" => Time.now.iso8601,
@@ -30,22 +24,37 @@ module Fog
             "sizeGb" => options['sizeGb'] || "10",
             "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/disks/#{disk_name}"
           }
+          if image
+            object.merge({
+              "sourceImage" => image.self_link,
+              "sourceImageId" => image.id
+            })
+          end
+          self.data[:disks][disk_name] = object
+
+          if image
+            object.merge!({
+              "sourceImage" => image.self_link,
+              "sourceImageId" => image.id
+            })
+          end
+          self.data[:disks][disk_name] = object
 
           operation = self.random_operation
           self.data[:operations][operation] = {
             "kind" => "compute#operation",
             "id" => Fog::Mock.random_numbers(19).to_s,
             "name" => operation,
-            "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
+            "zone" => object["zone"],
             "operationType" => "insert",
-            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/disks/#{disk_name}",
+            "targetLink" => object["selfLink"],
             "targetId" => id,
             "status" => Fog::Compute::Google::Operation::PENDING_STATE,
             "user" => "123456789012-qwertyuiopasdfghjkl1234567890qwe@developer.gserviceaccount.com",
             "progress" => 0,
             "insertTime" => Time.now.iso8601,
             "startTime" => Time.now.iso8601,
-            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/operations/#{operation}"
+            "selfLink" => "#{object["zone"]}/operations/#{operation}"
           }
 
           build_response(:body => self.data[:operations][operation])

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

@@ -29,6 +29,10 @@ module Fog
           # check that zone exists
           get_zone(zone_name)
 
+          if options['disks'].nil? or options['disks'].empty?
+            raise ArgumentError.new "Empty value for field 'disks'. Boot disk must be specified"
+          end
+
           id = Fog::Mock.random_numbers(19).to_s
           self.data[:servers][server_name] = {
             "kind" => "compute#instance",
@@ -55,14 +59,7 @@ module Fog
                 ]
               }
             ],
-            "disks" => options['disks'] ? handle_disks(options, zone_name) : [
-              {
-                "kind" => "compute#attachedDisk",
-                "index" => 0,
-                "type" => "SCRATCH",
-                "mode" => "READ_WRITE"
-              }
-            ],
+            "disks" => handle_disks(options, zone_name),
             "metadata" => {
               "kind" => "compute#metadata",
               "fingerprint" => "5_hasd_gC3E=",

data/tests/google/helpers/disk_helper.rb

@@ -0,0 +1,12 @@
+# create a disk to be used in tests
+def create_test_disk(connection, zone)
+  zone = 'us-central1-a'
+  disk = connection.disks.create({
+    :name => "fogservername",
+    :size_gb => "2",
+    :zone_name => zone,
+    :source_image => "debian-7-wheezy-v20131120",
+  })
+  disk.wait_for { ready? }
+  disk
+end

data/tests/google/models/compute/server_tests.rb

@@ -1,6 +1,9 @@
 Shindo.tests("Fog::Compute[:google] | server model", ['google']) do
 
-  model_tests(Fog::Compute[:google].disks, {:name => 'fogservername', :zone_name => 'us-central1-a', :machine_type => 'n1-standard-1'})
+  @zone = 'us-central1-a'
+  @disk = create_test_disk(Fog::Compute[:google], @zone)
+
+  model_tests(Fog::Compute[:google].servers, {:name => 'fogservername', :zone_name => @zone, :machine_type => 'n1-standard-1', :disks => [@disk]})
 
   tests('servers') do
     @instance = nil

data/tests/google/models/compute/servers_tests.rb

@@ -1,15 +1,7 @@
 Shindo.tests("Fog::Compute[:google] | servers", ['google']) do
 
-  @google = Fog::Compute[:google]
-
   @zone = 'us-central1-a'
-  @disk = @google.disks.create({
-    :name => "fogservername",
-    :size_gb => "2",
-    :zone_name => @zone,
-    :source_image => "debian-7-wheezy-v20131120",
-  })
-  @disk.wait_for { ready? }
+  @disk = create_test_disk(Fog::Compute[:google], @zone)
 
   collection_tests(Fog::Compute[:google].servers, {:name => 'fogservername', :zone_name => @zone, :machine_type => 'n1-standard-1', :disks => [@disk]})
 

data/tests/google/requests/compute/server_tests.rb

@@ -59,10 +59,11 @@ Shindo.tests('Fog::Compute[:google] | server requests', ['google']) do
     zone_name = "us-central1-a"
 
     tests("#insert_server").formats(@insert_server_format) do
+      disk = create_test_disk(Fog::Compute[:google], zone_name)
       @google.insert_server(
         server_name,
         zone_name,
-        { 'image' => image_name, 'machineType' => machine_type }
+        { 'image' => image_name, 'machineType' => machine_type, 'disks' => [disk] }
       ).body
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fog-maestrodev
 version: !ruby/object:Gem::Version
-  version: 1.18.0.20131219033443
+  version: 1.18.0.20131219193542
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
-  requirement: &9172940 !ruby/object:Gem::Requirement
+  requirement: &16462360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9172940
+  version_requirements: *16462360
 - !ruby/object:Gem::Dependency
   name: excon
-  requirement: &9171920 !ruby/object:Gem::Requirement
+  requirement: &16460300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.31.0
   type: :runtime
   prerelease: false
-  version_requirements: *9171920
+  version_requirements: *16460300
 - !ruby/object:Gem::Dependency
   name: formatador
-  requirement: &9197200 !ruby/object:Gem::Requirement
+  requirement: &16458820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *9197200
+  version_requirements: *16458820
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &9192820 !ruby/object:Gem::Requirement
+  requirement: &16457500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *9192820
+  version_requirements: *16457500
 - !ruby/object:Gem::Dependency
   name: mime-types
-  requirement: &9192040 !ruby/object:Gem::Requirement
+  requirement: &16456820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *9192040
+  version_requirements: *16456820
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &9190660 !ruby/object:Gem::Requirement
+  requirement: &16481540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *9190660
+  version_requirements: *16481540
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &8520740 !ruby/object:Gem::Requirement
+  requirement: &16479260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 2.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *8520740
+  version_requirements: *16479260
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &8520260 !ruby/object:Gem::Requirement
+  requirement: &16477720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: '1.5'
   type: :runtime
   prerelease: false
-  version_requirements: *8520260
+  version_requirements: *16477720
 - !ruby/object:Gem::Dependency
   name: ruby-hmac
-  requirement: &8519820 !ruby/object:Gem::Requirement
+  requirement: &16477160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8519820
+  version_requirements: *16477160
 - !ruby/object:Gem::Dependency
   name: jekyll
-  requirement: &8519220 !ruby/object:Gem::Requirement
+  requirement: &16491400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8519220
+  version_requirements: *16491400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &8518800 !ruby/object:Gem::Requirement
+  requirement: &16489860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8518800
+  version_requirements: *16489860
 - !ruby/object:Gem::Dependency
   name: rbvmomi
-  requirement: &8518340 !ruby/object:Gem::Requirement
+  requirement: &16487960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8518340
+  version_requirements: *16487960
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &8517900 !ruby/object:Gem::Requirement
+  requirement: &16487360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8517900
+  version_requirements: *16487360
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &8517400 !ruby/object:Gem::Requirement
+  requirement: &16486660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8517400
+  version_requirements: *16486660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &8516760 !ruby/object:Gem::Requirement
+  requirement: &16484620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,10 +175,10 @@ dependencies:
         version: 1.3.1
   type: :development
   prerelease: false
-  version_requirements: *8516760
+  version_requirements: *16484620
 - !ruby/object:Gem::Dependency
   name: rbovirt
-  requirement: &8516160 !ruby/object:Gem::Requirement
+  requirement: &16495180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
         version: 0.0.11
   type: :development
   prerelease: false
-  version_requirements: *8516160
+  version_requirements: *16495180
 - !ruby/object:Gem::Dependency
   name: shindo
-  requirement: &8515680 !ruby/object:Gem::Requirement
+  requirement: &16493780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -197,10 +197,10 @@ dependencies:
         version: 0.3.4
   type: :development
   prerelease: false
-  version_requirements: *8515680
+  version_requirements: *16493780
 - !ruby/object:Gem::Dependency
   name: fission
-  requirement: &8515260 !ruby/object:Gem::Requirement
+  requirement: &16492320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8515260
+  version_requirements: *16492320
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &8514780 !ruby/object:Gem::Requirement
+  requirement: &16522940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8514780
+  version_requirements: *16522940
 - !ruby/object:Gem::Dependency
   name: google-api-client
-  requirement: &8514120 !ruby/object:Gem::Requirement
+  requirement: &16522040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -230,10 +230,10 @@ dependencies:
         version: 0.6.2
   type: :development
   prerelease: false
-  version_requirements: *8514120
+  version_requirements: *16522040
 - !ruby/object:Gem::Dependency
   name: unf
-  requirement: &8513680 !ruby/object:Gem::Requirement
+  requirement: &16521300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -241,7 +241,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8513680
+  version_requirements: *16521300
 description: The Ruby cloud services library. Supports all major cloud providers including
   AWS, Rackspace, Linode, Blue Box, StormOnDemand, and many others. Full support for
   most AWS services including EC2, S3, CloudWatch, SimpleDB, ELB, and RDS.
@@ -4812,6 +4812,7 @@ files:
 - tests/glesys/requests/compute/server_tests.rb
 - tests/glesys/requests/compute/template_tests.rb
 - tests/go_grid/requests/compute/image_tests.rb
+- tests/google/helpers/disk_helper.rb
 - tests/google/models/compute/disk_tests.rb
 - tests/google/models/compute/disks_tests.rb
 - tests/google/models/compute/server_tests.rb
@@ -5413,7 +5414,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 193307169224408899
+      hash: -1401150800215848202
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -5746,6 +5747,7 @@ test_files:
 - tests/glesys/requests/compute/server_tests.rb
 - tests/glesys/requests/compute/template_tests.rb
 - tests/go_grid/requests/compute/image_tests.rb
+- tests/google/helpers/disk_helper.rb
 - tests/google/models/compute/disk_tests.rb
 - tests/google/models/compute/disks_tests.rb
 - tests/google/models/compute/server_tests.rb