fog-maestrodev 1.15.0.20130927082724 → 1.18.0.20131111203459

data/lib/fog/google/examples/bootstrap.rb

@@ -5,5 +5,5 @@ def test
   server.wait_for { sshable? }
 
   raise "Could not bootstrap sshable server." unless server.ssh("whoami")
-  raise "Cloud note delete server." unless server.destroy
+  raise "Could not delete server." unless server.destroy
 end

data/lib/fog/google/examples/create.rb

@@ -9,6 +9,7 @@ def test
     :private_key_path => File.expand_path("~/.ssh/id_rsa"),
     :public_key_path => File.expand_path("~/.ssh/id_rsa.pub"),
     :user => ENV['USER'],
+    :tags => ["fog"]
   })
 
   # My own wait_for because it hides errors

data/lib/fog/google/examples/get_list_images.rb

@@ -19,9 +19,8 @@ def test
   if custom_img_name
     # puts 'Fetching a single image from the custom project'
     # puts '----------------------------------------------'
-    img = connection.images.get(custom_img_name)
+    img = connection.images.get(custom_img_name.name)
     raise 'Could not GET the (custom) image' unless img
     # puts img.inspect
   end
-
 end

data/lib/fog/google/examples/network.rb

@@ -18,4 +18,6 @@ def test
 
   # The network won't have any firewall rules, so we won't be able to ssh in.
   server.wait_for { ready? }
+
+  raise "Could not delete server." unless server.destroy
 end

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

@@ -27,9 +27,10 @@ module Fog
           options = {}
           if source_image.nil?
             options['sourceSnapshot'] = source_snapshot
-            options['sizeGb']         = size_gb
           end
 
+          options['sizeGb'] = size_gb
+
           data = service.insert_disk(name, zone_name, source_image, options).body
           data = service.backoff_if_unfound {service.get_disk(name, zone_name).body}
           service.disks.merge_attributes(data)
@@ -83,6 +84,29 @@ module Fog
           self
         end
 
+        def create_snapshot(snapshot_name, snapshot_description="")
+          requires :name
+          requires :zone_name
+
+          if snap_name.nil? or snap_name.empty?
+            raise ArgumentError, 'Invalid snapshot name'
+          end
+
+          options = {
+            'name'        => snapshot_name,
+            'description' => snapshot_description,
+          }
+
+          service.insert_snapshot(name, self.zone, service.project, options)
+          data = service.backoff_if_unfound {
+            service.get_snapshot(snapshot_name, service.project).body
+          }
+          service.snapshots.merge_attributes(data)
+
+          # Try to return the representation of the snapshot we created
+          service.snapshots.get(snapshot_name)
+        end
+
         RUNNING_STATE = "READY"
 
       end

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

@@ -9,8 +9,15 @@ module Fog
 
         model Fog::Compute::Google::Disk
 
-        def all(zone)
-          data = service.list_disks(zone).body["items"] || []
+        def all(filters={})
+          if filters['zone'].nil?
+            data = []
+            service.list_zones.body['items'].each do |zone|
+              data += service.list_disks(zone['name']).body["items"] || []
+            end
+          else
+            data = service.list_disks(filters['zone']).body["items"] || []
+          end
           load(data)
         end
 

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

@@ -18,6 +18,7 @@ module Fog
         attribute :disks, :aliases => 'disks'
         attribute :kernel, :aliases => 'kernel'
         attribute :metadata
+        attribute :tags, :squash => 'items'
 
         def destroy
           requires :name, :zone
@@ -74,6 +75,10 @@ module Fog
 
           # You can have multiple SSH keys, seperated by newlines.
           # https://developers.google.com/compute/docs/console?hl=en#sshkeys
+          if !self.metadata["sshKeys"]
+            self.metadata["sshKeys"] = ""
+          end
+
           if !self.metadata["sshKeys"].empty?
             self.metadata["sshKeys"] += "\n"
           end
@@ -94,7 +99,7 @@ module Fog
           requires :machine_type
           requires :zone_name
 
-          if not service.zones.include? self.zone_name
+          if not service.zones.find{ |zone| zone.name == self.zone_name }
             raise ArgumentError.new "#{self.zone_name.inspect} is either down or you don't have permission to use it."
           end
 
@@ -108,7 +113,8 @@ module Fog
               'externalIp' => external_ip,
               'disks' => disks,
               'kernel' => kernel,
-              'metadata' => metadata
+              'metadata' => metadata,
+              'tags' => tags
           }.delete_if {|key, value| value.nil?}
 
           service.insert_server(name, zone_name, options)

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

@@ -47,7 +47,7 @@ module Fog
         def bootstrap(new_attributes = {})
           defaults = {
             :name => "fog-#{Time.now.to_i}",
-            :image_name => "debian-7-wheezy-v20130617",
+            :image_name => "debian-7-wheezy-v20130816",
             :machine_type => "n1-standard-1",
             :zone_name => "us-central1-b",
             :private_key_path => File.expand_path("~/.ssh/id_rsa"),

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

@@ -15,6 +15,7 @@ module Fog
         attribute :source_disk       , :aliases => 'sourceDisk'
         attribute :source_disk_id    , :aliases => 'sourceDiskId'
         attribute :description
+        attribute :status
 
         def reload
           requires :name

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

@@ -0,0 +1,25 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Google
+
+      class Zone < Fog::Model
+
+        identity :name
+        attribute :description
+        attribute :status
+        attribute :maintenance_windows, :aliases => 'maintenanceWindows'
+        attribute :begin_time, :aliases => 'beginTime'
+        attribute :end_time, :aliases => 'endTime'
+        attribute :quotas
+        attribute :region
+
+        def up?
+          self.status == "UP"
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require 'fog/core/collection'
+require 'fog/google/models/compute/zone'
+
+module Fog
+  module Compute
+    class Google
+
+      class Zones < Fog::Collection
+
+        model Fog::Compute::Google::Zone
+
+        def all
+          data = service.list_zones.body["items"] || []
+          load(data)
+        end
+
+        def get(identity)
+          data = connection.get_zone(identity).body
+          new(data)
+        rescue Excon::Errors::NotFound
+          nil
+        end
+
+      end
+    end
+  end
+end

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

@@ -2,29 +2,56 @@ module Fog
   module Compute
     class Google
 
-      class Mock
-
-        def delete_server(server_name)
-          Fog::Mock.not_implemented
-        end
-
-      end
-
-      class Real
-
-        def delete_server(server_name, zone_name=nil)
+      module Shared
+        def find_zone(zone_name)
           if zone_name.nil?
             list_zones.body['items'].each do |zone|
               if get_server(server_name, zone['name']).status == 200
-                zone_name = zone['name']
+                return zone['name']
               end
             end
           else
             if zone_name.is_a? Excon::Response
-              zone_name = zone_name.body["name"]
+              return zone_name.body["name"]
             end
           end
+          return zone_name
+        end
+      end
 
+      class Mock
+        include Shared
+
+        def delete_server(server_name, zone_name=nil)
+          zone_name = find_zone(zone_name)
+          get_server(server_name, zone_name)
+          server = self.data[:servers][server_name]
+          server["status"] = "STOPPED"
+          server["mock-deletionTimestamp"] = Time.now.iso8601
+          build_response(:body => {
+            "kind" => "compute#operation",
+            "id" => "10035781241131638365",
+            "name" => "operation-1380213292196-4e74bf2fbc3c1-ae707d47",
+            "zone" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}",
+            "operationType" => "delete",
+            "targetLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/instances/#{server_name}",
+            "targetId" => "14544909043643897380",
+            "status" => "PENDING",
+            "user" => "123456789012-qwertyuiopasdfghjkl1234567890qwe@developer.gserviceaccount.com",
+            "progress" => 0,
+            "insertTime" => Time.now.iso8601,
+            "startTime" => Time.now.iso8601,
+            "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/operations/operation-1380213292196-4e74bf2fbc3c1-ae707d47"
+          })
+        end
+
+      end
+
+      class Real
+        include Shared
+
+        def delete_server(server_name, zone_name=nil)
+          zone_name = find_zone(zone_name)
           api_method = @compute.instances.delete
           parameters = {
             'project' => @project,

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

@@ -4,8 +4,21 @@ module Fog
 
       class Mock
 
-        def get_image(image_name)
-          Fog::Mock.not_implemented
+        def get_image(image_name, project=@project)
+          image = self.class.data[project][:images][image_name] || {
+            "error" => {
+              "errors" => [
+                {
+                  "domain" => "global",
+                  "reason" => "invalid",
+                  "message" => "Invalid value for field 'resource.images': 'https://www.googleapis.com/compute/v1beta15/projects/#{project}/global/images/#{image_name}'.  Resource was not found."
+                }
+              ],
+              "code" => 400,
+              "message" => "Invalid value for field 'resource.images': 'https://www.googleapis.com/compute/v1beta15/projects/#{project}/global/images/#{image_name}'.  Resource was not found."
+            }
+          }
+          build_response(:body => image)
         end
 
       end

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

@@ -5,7 +5,22 @@ module Fog
       class Mock
 
         def get_machine_type(machine_type_name, zone_name = nil)
-          Fog::Mock.not_implemented
+          zone_name = self.data[:zones].keys.first if zone_name.nil?
+          get_zone(zone_name)
+          machine_type = self.data[:machine_types][zone_name][machine_type_name] || {
+            "error" => {
+             "errors" => [
+              {
+               "domain" => "global",
+               "reason" => "notFound",
+               "message" => "The resource 'projects/google/zones/#{zone_name}/machineTypes/#{machine_type_name}' was not found"
+              }
+             ],
+             "code" => 404,
+             "message" => "The resource 'projects/google/zones/#{zone_name}/machineTypes/#{machine_type_name}' was not found"
+            }
+          }
+          build_response(:body => machine_type)
         end
 
       end

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

@@ -4,8 +4,52 @@ module Fog
 
       class Mock
 
-        def get_server(server_name)
-          Fog::Mock.not_implemented
+        def get_server(server_name, zone_name)
+          server = self.data[:servers][server_name]
+          zone = self.data[:zones][zone_name]
+          if server.nil? or server["zone"] != zone["selfLink"]
+            return build_response(:body => {
+              "error" => {
+                "errors" => [
+                 {
+                  "domain" => "global",
+                  "reason" => "notFound",
+                  "message" => "The resource 'projects/#{@project}/zones/#{zone_name}/instances/#{server_name}' was not found"
+                 }
+                ],
+                "code" => 404,
+                "message" => "The resource 'projects/#{@project}/zones/#{zone_name}/instances/#{server_name}' was not found"
+              }
+            })
+          end
+
+          # transition the server through the provisioning -> staging -> running states
+          creation_time = Time.iso8601(server['creationTimestamp'])
+          case server['status']
+          when 'PROVISIONING'
+            if Time.now - creation_time > Fog::Mock.delay/2
+              server['status'] = 'STAGING'
+            end
+          when 'STAGING'
+            if Time.now - creation_time > Fog::Mock.delay
+              server['status'] = 'RUNNING'
+            end
+          when 'STOPPED'
+            if server['mock-deletionTimestamp']
+              # stopped -> terminated
+              if Time.now - Time.iso8601(server['mock-deletionTimestamp']) > Fog::Mock.delay
+                server['status'] = 'TERMINATED'
+              end
+            else
+              # TODO stopped -> provisioning
+            end
+          when 'TERMINATED'
+            if Time.now - Time.iso8601(server['mock-deletionTimestamp']) > Fog::Mock.delay
+              self.data[:servers][server_name] = nil
+            end
+          end
+
+          build_response(:body => server)
         end
 
       end

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

@@ -5,7 +5,20 @@ module Fog
       class Mock
 
         def get_zone(zone_name)
-          Fog::Mock.not_implemented
+          zone = self.data[:zones][zone_name] || {
+            "error" => {
+              "errors" => [
+               {
+                "domain" => "global",
+                "reason" => "notFound",
+                "message" => "The resource 'projects/#{project}/zones/#{zone_name}' was not found"
+               }
+              ],
+              "code" => 404,
+              "message" => "The resource 'projects/#{project}/zones/#{zone_name}' was not found"
+            }
+          }
+          build_response(:body => zone)
         end
 
       end

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

@@ -3,9 +3,81 @@ module Fog
     class Google
 
       class Mock
+        def insert_server(server_name, zone_name, options={}, *deprecated_args)
+
+          # check that image and zone exist
+          image_project = nil
+          if options.has_key? 'image'
+            ([ @project ] + Fog::Compute::Google::Images::GLOBAL_PROJECTS).each do |project|
+              image_project = project
+              break if self.class.data[project][:images][options['image']]
+            end
+            get_image(options['image'], image_project) # ok if image exists, will fail otherwise
+          end
+          get_zone(zone_name)
 
-        def insert_server(server_name)
-          Fog::Mock.not_implemented
+          self.data[:servers][server_name] = {
+            "kind" => "compute#instance",
+            "id" => Fog::Mock.random_numbers(19),
+            "creationTimestamp" => Time.now.iso8601,
+            "zone" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}",
+            "status" => "PROVISIONING",
+            "name" => server_name,
+            "tags" => { "fingerprint" => "42WmSpB8rSM=" },
+            "machineType" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/machineTypes/#{options['machineType']}",
+            "image" => "https://www.googleapis.com/compute/v1beta15/projects/centos-cloud/global/images/#{options['image']}",
+            "kernel" => "https://www.googleapis.com/compute/v1beta15/projects/google/global/kernels/gce-v20130813",
+            "canIpForward" => false,
+            "networkInterfaces" => [
+              {
+                "network" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/global/networks/default",
+                "networkIP" => Fog::Mock.random_ip,
+                "name" => "nic0",
+                "accessConfigs" => [
+                  {
+                    "kind" => "compute#accessConfig",
+                    "type" => "ONE_TO_ONE_NAT",
+                    "name" => "External NAT",
+                    "natIP" => Fog::Mock.random_ip
+                  }
+                ]
+              }
+            ],
+            "disks" => [
+              {
+                "kind" => "compute#attachedDisk",
+                "index" => 0,
+                "type" => "SCRATCH",
+                "mode" => "READ_WRITE"
+              }
+            ],
+            "metadata" => {
+              "kind" => "compute#metadata",
+              "fingerprint" => "5_hasd_gC3E=",
+              "items" => [
+                {
+                  "key" => "sshKeys",
+                  "value" => "sysadmin:ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAgEA1zc7mx+0H8Roywet/L0aVX6MUdkDfzd/17kZhprAbpUXYOILv9AG4lIzQk6xGxDIltghytjfVGme/4A42Sb0Z9LN0pxB4KnWTNoOSHPJtp6jbXpq6PdN9r3Z5NKQg0A/Tfw7gt2N0GDsj6vpK8VbHHdW78JAVUxql18ootJxjaksdocsiHNK8iA6/v9qiLRhX3fOgtK7KpxxdZxLRzFg9vkp8jcGISgpZt27kOgXWhR5YLhi8pRJookzphO5O4yhflgoHoAE65XkfrsRCe0HU5QTbY2jH88rBVkq0KVlZh/lEsuwfmG4d77kEqaCGGro+j1Wrvo2K3DSQ+rEcvPp2CYRUySjhaeLF18UzQLtxNeoN14QOYqlm9ITdkCnmq5w4Wn007MjSOFp8LEq2RekrnddGXjg1/vgmXtaVSGzJAlXwtVfZor3dTRmF0JCpr7DsiupBaDFtLUlGFFlSKmPDVMPOOB5wajexmcvSp2Vu4U3yP8Lai/9/ZxMdsGPhpdCsWVL83B5tF4oYj1HVIycbYIxIIfFqOxZcCru3CMfe9jmzKgKLv2UtkfOS8jpS/Os2gAiB3wPweH3agvtwYAYBVMDwt5cnrhgHYWoOz7ABD8KgmCrD7Y9HikiCqIUNkgUFd9YmjcYi5FkU5rFXIawN7efs341lsdf923lsdf923fs= johndoe@acme"
+                }
+              ]
+            },
+            "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/instances/#{server_name}"
+          }
+
+          build_response(:body => {
+            "kind" => "compute#operation",
+            "id" => "4639689000254420481",
+            "name" => "operation-1380213292196-4e74bf2fbc3c1-ae707d47",
+            "zone" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}",
+            "operationType" => "insert",
+            "targetLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/instances/#{server_name}",
+            "status" => "PENDING",
+            "user" => "123456789012-qwertyuiopasdfghjkl1234567890qwe@developer.gserviceaccount.com",
+            "progress" => 0,
+            "insertTime" => Time.now.iso8601,
+            "startTime" => Time.now.iso8601,
+            "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/operations/operation-1380213292196-4e74bf2fbc3c1-ae707d47"
+          })
         end
 
       end
@@ -43,18 +115,16 @@ module Fog
           end
 
           # ExternalIP is default value for server creation
+          access_config = {'type' => 'ONE_TO_ONE_NAT', 'name' => 'External NAT'}
+          # leave natIP undefined to use an IP from a shared ephemeral IP address pool
           if options.has_key? 'externalIp'
-            external_ip = options.delete 'externalIp'
-          else
-             external_ip = true
+            access_config['natIP'] = options.delete 'externalIp'
           end
 
           networkInterfaces = []
           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
+            networkInterface['accessConfigs'] = [access_config]
             networkInterfaces <<  networkInterface
           end
 
@@ -75,6 +145,8 @@ module Fog
 
           options['metadata'] = format_metadata options['metadata'] if options['metadata']
 
+          body_object['tags'] = { 'items' => options.delete('tags') } if options['tags']
+
           if options['kernel']
             body_object['kernel'] = @api_url + "google/global/kernels/#{options.delete 'kernel'}"
           end

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

@@ -0,0 +1,49 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def insert_snapshot(snap_name)
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+
+        def insert_snapshot(disk_name, zone_name, project=@project, opts={})
+
+          # This is unfortunate, since we might be called from 2 contexts
+          # 1. disk.snapshot <-- here validation of disk_name is not needed
+          # 2. snapshot.create <-- here we must validate the disk_name
+          #
+          # Validation would involve 'get'ing the disk by that name. This is
+          # redundant (and expensive) for case (1) which is likely the common
+          # codepath. So we won't do it.
+
+          api_method = @compute.disks.create_snapshot
+
+          parameters = {
+            'disk'    => disk_name,
+            'zone'    => zone_name,
+            'project' => @project,
+          }
+
+          snap_name = opts.delete('name')
+          raise ArgumentError.new('Must specify snapshot name') unless snap_name
+          body_object = { 'name' => snap_name }
+
+          # Merge in any remaining options (description)
+          body_object.merge(opts)
+
+          result = self.build_result(api_method, parameters,
+                                     body_object)
+          response = self.build_response(result)
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -4,8 +4,14 @@ module Fog
 
       class Mock
 
-        def list_images
-          Fog::Mock.not_implemented
+        def list_images(project=@project)
+          images = self.class.data[project][:images].values
+          build_response(:body => {
+            "kind" => "compute#imageList",
+            "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{project}/global/images",
+            "id" => "projects/#{project}/global/images",
+            "items" => images
+          })
         end
 
       end

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

@@ -4,8 +4,15 @@ module Fog
 
       class Mock
 
-        def list_machine_types
-          Fog::Mock.not_implemented
+        def list_machine_types(zone_name)
+          get_zone(zone_name)
+          machine_types = self.class.data[project][:machine_types][zone_name].values
+          build_response(:body => {
+            "kind" => "compute#machineTypeList",
+            "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/machineTypes",
+            "id" => "projects/high-cistern-340/zones/us-central1-a/machineTypes",
+            "items" => machine_types
+          })
         end
 
       end

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

@@ -4,8 +4,16 @@ module Fog
 
       class Mock
 
-        def list_servers
-          Fog::Mock.not_implemented
+        def list_servers(zone_name)
+          zone = self.data[:zones][zone_name]
+          raise Fog::Errors::Error.new("Invalid value for field 'zone': '#{zone_name}'.  Unknown zone.") if zone.nil?
+          servers = self.data[:servers].values.select{|s| s["zone"] == zone["selfLink"]}
+          build_response(:body => {
+            "kind" => "compute#instanceList",
+            "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones/#{zone_name}/instances",
+            "id" => "projects/#{@project}/zones/#{zone_name}/instances",
+            "items" => servers
+          })
         end
 
       end

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

@@ -5,7 +5,13 @@ module Fog
       class Mock
 
         def list_zones
-          Fog::Mock.not_implemented
+          zones = self.data[:zones].values
+          build_response(:body => {
+            "kind" => "compute#zoneList",
+            "selfLink" => "https://www.googleapis.com/compute/v1beta15/projects/#{@project}/zones",
+            "id" => "projects/#{@project}/zones",
+            "items" => zones
+          })
         end
 
       end