fog-maestrodev 1.18.0.20131126183714 → 1.18.0.20131127194823

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjljMGQzOTJhMWQ4M2QxZmNmMDViM2M5OTJkZDg5OTk0MmVkZmU1Nw==
+    NDljMmI1YzY4MmE4YmJiOWU4Y2Q4YjA1NDFjNGZjYWUxZDZhMjg5Nw==
   data.tar.gz: !binary |-
-    OGIyYjg4N2YyNWMxMjk0MWY2ODg2ODFjODU1N2I1MzU3YWNkNWU5NA==
+    M2Y3MjkyNjgyYjU4ZWQyMWYwOGRiMmRjNDhiOWM5NGU1ODdkMjE0ZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZWVkMmUxNTBkYTg1MDdmZTk4M2I2OWY4ZDExNDVkYzFkOWVhYmJiZjQxYWYx
-    MzU4Yzg2NTExZjg1YjMzZTM4NzNiNmRiZTYwZGNjZTZkY2ViZTVkNGVjNDFm
-    N2Q1NGQ2NTQ4OGU5YzI0M2M5MzQ2MGRkNjdkZTZhOTVlODI0Y2E=
+    Nzg1NDY3OGM4YzQxOTVjM2QyYTgzZGYwM2VhMTBiMDc3ZjhiZTA4YTJiZGUz
+    OTY0YWRjNGVjM2Y4NzNjNjllMDE3NzFiMThiNjIzM2NlMWI0NGNhYjg4MGY0
+    N2U1MTUxYmZmNDllYzIwMGRlNWJhOGY2ZTE4ZDlkYjZjNDRlYjg=
   data.tar.gz: !binary |-
-    Y2EzYThmMzY4ZTE4YjFjZjc5MjkxOTljZmQ2ZWYxZmFjNGUyZTc2ZGRlODc4
-    ZDM1NGQwMmUwZWY2ZDE2ZGI0MTEwNzFlYzdhZjhhNDIzNTZjNzI0ZWQyZTc0
-    OWFiN2JkYmUyYWU4Y2NiMTUwZjNjMzI3Njc2OGNiNWY4YmU0NjY=
+    N2E1ZmUwMmEzOWYxNWM1YzdjZGIwZDIxYWYwZjNmZmMyYmEwOTJiYjA1OWVm
+    Mjc1Njk1ZWQ5MDBlZWM1YzhmMTMxNTZiM2ZjMTdlNGRjYjAxZTZjMDcwMzJl
+    YjQzYTlhNWFiNjlkODRmM2ViOTNkYzdjNzk4ZjljYWI3ZGY5Njc=

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.20131126183714'
-  s.date              = '2013-11-26'
+  s.version           = '1.18.0.20131127194823'
+  s.date              = '2013-11-27'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long

data/lib/fog/brightbox/compute/image_selector.rb

@@ -32,7 +32,7 @@ module Fog
             img["official"] == true &&
               img["arch"] == "i686" &&
               img["name"] =~ /ubuntu/i
-          end.sort do |a,b|
+          end.sort do |a, b|
             # Reverse sort so "raring" > "precise" and "13.10" > "13.04"
             b["name"].downcase <=> a["name"].downcase
           end.first["id"]

data/lib/fog/brightbox/compute/shared.rb

@@ -63,7 +63,7 @@ module Fog
           # Request account can be changed at anytime and changes behaviour of future requests
           @scoped_account      = @configured_account
 
-          credential_options   = {:username => username, :password => password}
+          credential_options   = { :username => username, :password => password }
           @credentials         = CredentialSet.new(client_id, client_secret, credential_options)
 
           # If existing tokens have been cached, allow continued use of them in the service
@@ -175,7 +175,7 @@ module Fog
           @default_image_id = Fog.credentials[:brightbox_default_image] || select_default_image
         end
 
-      private
+        private
 
         # This makes a request of the API based on the configured setting for
         # token management.
@@ -200,13 +200,11 @@ module Fog
         #
         # @return [Excon::Response]
         def managed_token_request(options)
-          begin
-            get_access_token unless access_token_available?
-            response = authenticated_request(options)
-          rescue Excon::Errors::Unauthorized
-            get_access_token
-            response = authenticated_request(options)
-          end
+          get_access_token unless access_token_available?
+          authenticated_request(options)
+        rescue Excon::Errors::Unauthorized
+          get_access_token
+          authenticated_request(options)
         end
 
         # This request makes an authenticated request of the API using currently
@@ -221,7 +219,7 @@ module Fog
           headers = options[:headers] || {}
           headers.merge!("Authorization" => "OAuth #{@credentials.access_token}", "Content-Type" => "application/json")
           options[:headers] = headers
-          # TODO This is just a wrapper around a call to Excon::Connection#request
+          # TODO: This is just a wrapper around a call to Excon::Connection#request
           #   so can be extracted from Compute by passing in the connection,
           #   credentials and options
           @connection.request(options)

data/lib/fog/brightbox/compute.rb

@@ -166,7 +166,7 @@ module Fog
           _request
         end
 
-      private
+        private
 
         def _request
           raise Fog::Errors::MockNotImplemented
@@ -236,7 +236,7 @@ module Fog
           _wrapped_request(method, path, expected_responses, parameters)
         end
 
-      private
+        private
 
         # Wrapped request is the non-standard form of request introduced by mistake
         #
@@ -256,20 +256,18 @@ module Fog
 
           # Select the account to scope for this request
           account = scoped_account(parameters.fetch(:account_id, nil))
-          if account
-            request_options[:query] = { :account_id => account }
-          end
+          request_options[:query] = { :account_id => account } if account
 
           request_options[:body] = Fog::JSON.encode(parameters) unless parameters.empty?
 
           response = make_request(request_options)
 
-          # FIXME We should revert to returning the Excon::Request after a suitable
+          # FIXME: We should revert to returning the Excon::Request after a suitable
           # configuration option is in place to switch back to this incorrect behaviour
-          unless response.body.empty?
-            Fog::JSON.decode(response.body)
-          else
+          if response.body.empty?
             response
+          else
+            Fog::JSON.decode(response.body)
           end
         end
 

data/lib/fog/brightbox/models/compute/api_client.rb

@@ -14,7 +14,7 @@ module Fog
           options = {
             :name => name,
             :description => description
-          }.delete_if {|k,v| v.nil? || v == "" }
+          }.delete_if { |k, v| v.nil? || v == "" }
           data = service.create_api_client(options)
           merge_attributes(data)
           true

data/lib/fog/brightbox/models/compute/application.rb

@@ -3,9 +3,7 @@ require 'fog/core/model'
 module Fog
   module Compute
     class Brightbox
-
       class Application < Fog::Model
-
         identity :id
         attribute :url
         attribute :name
@@ -15,12 +13,11 @@ module Fog
           raise Fog::Errors::Error.new('Resaving an existing object may create a duplicate') if persisted?
           options = {
             :name => name
-          }.delete_if {|k,v| v.nil? || v == "" }
+          }.delete_if { |k, v| v.nil? || v == "" }
           data = service.create_application(options)
           merge_attributes(data)
           true
         end
-
       end
     end
   end

data/lib/fog/brightbox/models/compute/cloud_ip.rb

@@ -26,13 +26,16 @@ module Fog
         attribute :port_translators
         attribute :name
 
+        # Attempt to map or point the Cloud IP to the destination resource.
+        #
+        # @param [Object] destination
+        #
         def map(destination)
           requires :identity
-          case destination
-          when Fog::Compute::Brightbox::Server
-            final_destination = destination.interfaces.first["id"]
-          when Fog::Compute::Brightbox::LoadBalancer
-            final_destination = destination.id
+          if destination.respond_to?(:mapping_identity)
+            final_destination = destination.mapping_identity
+          elsif destination.respond_to?(:identity)
+            final_destination = destination.identity
           else
             final_destination = destination
           end

data/lib/fog/brightbox/models/compute/collaboration.rb

@@ -43,9 +43,7 @@ module Fog
           merge_attributes(data)
           true
         end
-
       end
     end
   end
 end
-

data/lib/fog/brightbox/models/compute/collaborations.rb

@@ -31,7 +31,7 @@ module Fog
         def invite(email, role)
           return nil if email.nil? || email == ""
           return nil if role.nil? || role == ""
-          options = {:email => email, :role => role}
+          options = { :email => email, :role => role }
           data = service.create_collaboration(options)
           new(data)
         end

data/lib/fog/brightbox/models/compute/firewall_policy.rb

@@ -26,7 +26,7 @@ module Fog
             :server_group => server_group_id,
             :name => name,
             :description => description
-          }.delete_if {|k,v| v.nil? || v == "" }
+          }.delete_if { |k, v| v.nil? || v == "" }
           data = service.create_firewall_policy(options)
           merge_attributes(data)
           true
@@ -54,12 +54,10 @@ module Fog
 
         def destroy
           requires :identity
-          data = service.destroy_firewall_policy(identity)
+          service.destroy_firewall_policy(identity)
           true
         end
-
       end
-
     end
   end
 end

data/lib/fog/brightbox/models/compute/firewall_rule.rb

@@ -35,7 +35,7 @@ module Fog
             :destination => destination,
             :destination_port => destination_port,
             :icmp_type_name => icmp_type_name
-          }.delete_if {|k,v| v.nil? || v == "" }
+          }.delete_if { |k, v| v.nil? || v == "" }
           data = service.create_firewall_rule(options)
           merge_attributes(data)
           true

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

@@ -47,7 +47,7 @@ module Fog
             :name => name,
             :username => username,
             :description => description
-          }.delete_if {|k,v| v.nil? || v == "" }
+          }.delete_if { |k, v| v.nil? || v == "" }
           data = service.create_image(options)
           merge_attributes(data)
           true
@@ -58,9 +58,7 @@ module Fog
           service.destroy_image(identity)
           true
         end
-
       end
-
     end
   end
 end

data/lib/fog/brightbox/models/compute/load_balancer.rb

@@ -52,7 +52,7 @@ module Fog
             :name => name,
             :certificate_pem => certificate_pem,
             :certificate_private_key => certificate_private_key
-          }.delete_if {|k,v| v.nil? || v == "" }
+          }.delete_if { |k, v| v.nil? || v == "" }
           data = service.create_load_balancer(options)
           merge_attributes(data)
           true
@@ -94,16 +94,13 @@ module Fog
           end
         end
 
-      private
+        private
 
         def time_or_original(value)
-          begin
-            Time.parse(value)
-          rescue TypeError, ArgumentError
-            value
-          end
+          Time.parse(value)
+        rescue TypeError, ArgumentError
+          value
         end
-
       end
     end
   end

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

@@ -37,7 +37,7 @@ module Fog
         attribute :zone
         attribute :server_type
 
-        def initialize(attributes={})
+        def initialize(attributes = {})
           # Call super first to initialize the service object for our default image
           super
           self.image_id ||= service.default_image
@@ -83,10 +83,10 @@ module Fog
         def reboot(use_hard_reboot = true)
           requires :identity
           if ready?
-            unless use_hard_reboot
-              soft_reboot
-            else
+            if use_hard_reboot
               hard_reboot
+            else
+              soft_reboot
             end
           else
             # Not able to reboot if not ready in the first place
@@ -137,23 +137,23 @@ module Fog
         end
 
         def private_ip_address
-          unless interfaces.empty?
-            interfaces.first["ipv4_address"]
-          else
+          if interfaces.empty?
             nil
+          else
+            interfaces.first["ipv4_address"]
           end
         end
 
         def public_ip_address
-          unless cloud_ips.empty?
-            cloud_ips.first["public_ip"]
-          else
+          if cloud_ips.empty?
             nil
+          else
+            cloud_ips.first["public_ip"]
           end
         end
 
         def ready?
-          self.state == 'active'
+          state == "active"
         end
 
         def activate_console
@@ -171,20 +171,28 @@ module Fog
             :zone => zone_id,
             :user_data => user_data,
             :server_groups => server_groups
-          }.delete_if {|k,v| v.nil? || v == "" }
-          unless flavor_id.nil? || flavor_id == ""
-            options.merge!(:server_type => flavor_id)
-          end
+          }.delete_if { |k, v| v.nil? || v == "" }
+
+          options.merge!(:server_type => flavor_id) unless flavor_id.nil? || flavor_id == ""
+
           data = service.create_server(options)
           merge_attributes(data)
           true
         end
 
-      private
+        # Replaces the server's identifier with it's interface's identifier for Cloud IP mapping
+        #
+        # @return [String] the identifier to pass to a Cloud IP mapping request
+        def mapping_identity
+          interfaces.first["id"]
+        end
+
+        private
+
         # Hard reboots are fast, avoiding the OS by doing a "power off"
         def hard_reboot
           stop
-          wait_for { ! ready? }
+          wait_for { !ready? }
           start
         end
 
@@ -194,11 +202,11 @@ module Fog
         # @todo Needs cleaner error handling when the OS times out
         def soft_reboot
           shutdown
-          # FIXME Using side effect of wait_for's (evaluated block) to detect timeouts
+          # FIXME: Using side effect of wait_for's (evaluated block) to detect timeouts
           begin
-            wait_for(20) { ! ready? }
+            wait_for(20) { !ready? }
             start
-          rescue Fog::Errors::Timeout => e
+          rescue Fog::Errors::Timeout
             false
           end
         end

data/lib/fog/brightbox/models/compute/server_group.rb

@@ -3,7 +3,6 @@ require 'fog/core/model'
 module Fog
   module Compute
     class Brightbox
-
       # A server group is a collection of servers
       #
       # Certain actions can accept a server group and affect all members
@@ -24,15 +23,15 @@ module Fog
           options = {
             :name => name,
             :description => description
-          }.delete_if {|k,v| v.nil? || v == "" }
+          }.delete_if { |k, v| v.nil? || v == "" }
           data = service.create_server_group(options)
           merge_attributes(data)
           true
         end
 
         def servers
-          srv_ids = server_ids.collect {|srv| srv["id"]}
-          srv_ids.collect do |srv_id|
+          srv_ids = server_ids.map { |srv| srv["id"] }
+          srv_ids.map do |srv_id|
             service.servers.get(srv_id)
           end
         end
@@ -41,7 +40,7 @@ module Fog
         #
         # @param [Array] identifiers array of server identifier strings to add
         # @return [Fog::Compute::ServerGroup]
-        def add_servers identifiers
+        def add_servers(identifiers)
           requires :identity
           options = {
             :servers => server_references(identifiers)
@@ -54,7 +53,7 @@ module Fog
         #
         # @param [Array] identifiers array of server identifier strings to remove
         # @return [Fog::Compute::ServerGroup]
-        def remove_servers identifiers
+        def remove_servers(identifiers)
           requires :identity
           options = {
             :servers => server_references(identifiers)
@@ -68,7 +67,7 @@ module Fog
         # @param [Array] identifiers array of server identifier strings to move
         # @param [String] destination_group_id destination server group identifier
         # @return [Fog::Compute::ServerGroup]
-        def move_servers identifiers, destination_group_id
+        def move_servers(identifiers, destination_group_id)
           requires :identity
           options = {
             :servers => server_references(identifiers),
@@ -84,12 +83,11 @@ module Fog
           true
         end
 
-      protected
+        protected
 
-        def server_references identifiers
-          identifiers.map {|id| {"server" => id} }
+        def server_references(identifiers)
+          identifiers.map { |id| { "server" => id } }
         end
-
       end
     end
   end

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

@@ -19,4 +19,4 @@ module Fog
 
     end
   end
-end
+end

data/lib/fog/brightbox/oauth2.rb

@@ -18,7 +18,7 @@ module Fog::Brightbox::OAuth2
     header_content = "#{credentials.client_id}:#{credentials.client_secret}"
     encoded_credentials = Base64.encode64(header_content).chomp
 
-    connection.request({
+    connection.request(
       :path => "/token",
       :expects  => 200,
       :headers  => {
@@ -27,7 +27,7 @@ module Fog::Brightbox::OAuth2
       },
       :method   => 'POST',
       :body     => Fog::JSON.encode(token_strategy.authorization_body_data)
-    })
+    )
   end
 
   # Encapsulates credentials required to request access tokens from the
@@ -152,7 +152,7 @@ module Fog::Brightbox::OAuth2
     end
   end
 
-private
+  private
 
   # This updates the current credentials if passed a valid response
   #

data/lib/fog/google/compute.rb

@@ -29,13 +29,16 @@ module Fog
       request :get_network
       request :get_zone
       request :get_snapshot
+      request :get_global_operation
+      request :get_zone_operation
 
       request :delete_disk
       request :delete_firewall
       request :delete_image
       request :delete_network
-      request :delete_operation
       request :delete_server
+      request :delete_global_operation
+      request :delete_zone_operation
 
       request :insert_disk
       request :insert_firewall
@@ -59,6 +62,9 @@ module Fog
       model :disk
       collection :disks
 
+      model :operation
+      collection :operations
+
       model :snapshot
       collection :snapshots
 
@@ -73,10 +79,10 @@ module Fog
           @api_version = 'v1beta16'
         end
 
-        def build_excon_response(body)
+        def build_excon_response(body, status=200)
           response = Excon::Response.new
           response.body = body
-          if response.body["error"]
+          if response.body and response.body["error"]
             response.status = response.body["error"]["code"]
             msg = response.body["error"]["errors"].map{|error| error["message"]}.join(", ")
             case response.status
@@ -86,7 +92,7 @@ module Fog
               raise Fog::Errors::Error.new(msg)
             end
           else
-            response.status = 200
+            response.status = status
           end
           response
         end
@@ -763,7 +769,8 @@ module Fog
                   }
                 end,
                 :images => {},
-                :disks => {}
+                :disks => {},
+                :operations => {}
               }
             end
           end
@@ -782,6 +789,9 @@ module Fog
           self.class.data(api_version).delete(@project)
         end
 
+        def random_operation
+          "operation-#{Fog::Mock.random_numbers(13)}-#{Fog::Mock.random_hex(13)}-#{Fog::Mock.random_hex(8)}"
+        end
       end
 
       class Real
@@ -842,7 +852,7 @@ module Fog
         # result = Google::APIClient::Result
         # returns Excon::Response
         def build_response(result)
-          build_excon_response(Fog::JSON.decode(result.body))
+          build_excon_response(result.body.nil? ? nil : Fog::JSON.decode(result.body), result.status)
         end
 
       end

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

@@ -38,7 +38,13 @@ module Fog
 
         def destroy
           requires :name, :zone_name
-          service.delete_disk(name, zone_name)
+          operation = service.delete_disk(name, zone_name)
+          # wait until "RUNNING" or "DONE" to ensure the operation doesn't fail, raises exception on error
+          Fog.wait_for do
+            operation = service.get_zone_operation(zone_name, operation.body["name"])
+            operation.body["status"] != "PENDING"
+          end
+          operation
         end
 
         def zone

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

@@ -0,0 +1,42 @@
+require 'fog/core/model'
+
+module Fog
+  module Compute
+    class Google
+
+      class Operation < Fog::Model
+
+        identity :name
+
+        attribute :kind, :aliases => 'kind'
+        attribute :id, :aliases => 'id'
+        attribute :creation_timestamp, :aliases => 'creationTimestamp'
+        attribute :zone_name, :aliases => 'zone'
+        attribute :status, :aliases => 'status'
+        attribute :self_link, :aliases => 'selfLink'
+
+        def ready?
+          self.status == DONE_STATE
+        end
+
+        def pending?
+          self.status == PENDING_STATE
+        end
+
+        def reload
+          requires :identity
+
+          data = collection.get(identity, zone)
+          new_attributes = data.attributes
+          merge_attributes(new_attributes)
+          self
+        end
+
+        PENDING_STATE = "PENDING"
+        RUNNING_STATE = "RUNNING"
+        DONE_STATE = "DONE"
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+require 'fog/core/collection'
+require 'fog/google/models/compute/operation'
+
+module Fog
+  module Compute
+    class Google
+
+      class Operations < Fog::Collection
+
+        model Fog::Compute::Google::Operation
+
+        def get(identity, zone=nil)
+          if zone.nil?
+            response = service.get_global_operation(identity)
+          else
+            response = service.get_zone_operation(zone, identity)
+          end
+          return nil if response.nil?
+          new(response.body)
+        end
+
+      end
+
+    end
+  end
+end

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

@@ -30,7 +30,13 @@ module Fog
 
         def destroy
           requires :name, :zone
-          service.delete_server(name, zone)
+          operation = service.delete_server(name, zone)
+          # wait until "RUNNING" or "DONE" to ensure the operation doesn't fail, raises exception on error
+          Fog.wait_for do
+            operation = service.get_zone_operation(zone_name, operation.body["name"])
+            operation.body["status"] != "PENDING"
+          end
+          operation
         end
 
         def image

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

@@ -6,23 +6,26 @@ module Fog
 
         def delete_disk(disk_name, zone_name)
           get_disk(disk_name, zone_name)
-          self.data[:disks].delete disk_name
 
-          build_response(:body => {
+          operation = self.random_operation
+          self.data[:operations][operation] = {
             "kind" => "compute#operation",
-            "id" => "7145812689701515415",
-            "name" => "operation-1385125998242-4ebc3c7173e70-11e1ad0b",
+            "id" => Fog::Mock.random_numbers(19).to_s,
+            "name" => operation,
             "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
             "operationType" => "delete",
             "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/disks/#{disk_name}",
-            "targetId" => "6817095360746367667",
-            "status" => "PENDING",
+            "targetId" => self.data[:disks][disk_name]["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-1385125998242-4ebc3c7173e70-11e1ad0b"
-          })
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/operations/#{operation}"
+          }
+          self.data[:disks].delete disk_name
+
+          build_response(:body => self.data[:operations][operation])
         end
 
       end

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

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def delete_global_operation(operation)
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+        # https://developers.google.com/compute/docs/reference/latest/globalOperations
+
+        def delete_global_operation(operation)
+          api_method = @compute.global_operations.delete
+          parameters = {
+            'project' => @project,
+            'operation' => operation
+          }
+
+          result = self.build_result(api_method, parameters)
+          response = self.build_response(result)
+        end
+      end
+    end
+  end
+end

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

@@ -28,21 +28,25 @@ module Fog
           server = self.data[:servers][server_name]
           server["status"] = "STOPPED"
           server["mock-deletionTimestamp"] = Time.now.iso8601
-          build_response(:body => {
+
+          operation = self.random_operation
+          self.data[:operations][operation] = {
             "kind" => "compute#operation",
-            "id" => "10035781241131638365",
-            "name" => "operation-1380213292196-4e74bf2fbc3c1-ae707d47",
+            "id" => Fog::Mock.random_numbers(19).to_s,
+            "name" => operation,
             "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
             "operationType" => "delete",
             "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/instances/#{server_name}",
-            "targetId" => "14544909043643897380",
-            "status" => "PENDING",
+            "targetId" => self.data[:servers][server_name]["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-1380213292196-4e74bf2fbc3c1-ae707d47"
-          })
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/operations/#{operation}"
+          }
+
+          build_response(:body => self.data[:operations][operation])
         end
 
       end

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

@@ -0,0 +1,33 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def delete_zone_operation(zone, operation)
+          Fog::Mock.not_implemented
+        end
+
+      end
+
+      class Real
+        # https://developers.google.com/compute/docs/reference/latest/zoneOperations
+
+        def delete_zone_operation(zone_name, operation)
+          if zone_name.start_with? 'http'
+            zone_name = zone_name.split('/')[-1]
+          end
+          api_method = @compute.zone_operations.delete
+          parameters = {
+            'project' => @project,
+            'zone' => zone_name,
+            'operation' => operation
+          }
+
+          result = self.build_result(api_method, parameters)
+          response = self.build_response(result)
+        end
+      end
+    end
+  end
+end

data/lib/fog/google/requests/compute/{delete_operation.rb → get_global_operation.rb}

@@ -4,27 +4,26 @@ module Fog
 
       class Mock
 
-        def delete_operation(operation_name)
+        def get_global_operation(operation)
           Fog::Mock.not_implemented
         end
 
       end
 
       class Real
+        # https://developers.google.com/compute/docs/reference/latest/globalOperations
 
-        def delete_operation(operation_name)
-          api_method = @compute.operations.delete
+        def get_global_operation(operation)
+          api_method = @compute.global_operations.get
           parameters = {
             'project' => @project,
-            'operation' => operation_name
+            'operation' => operation
           }
 
           result = self.build_result(api_method, parameters)
           response = self.build_response(result)
         end
-
       end
-
     end
   end
 end

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

@@ -0,0 +1,58 @@
+module Fog
+  module Compute
+    class Google
+
+      class Mock
+
+        def get_zone_operation(zone_name, operation)
+          operation = self.data[:operations][operation]
+          if operation
+            case operation["status"]
+            when Fog::Compute::Google::Operation::PENDING_STATE
+              operation["status"] = Fog::Compute::Google::Operation::RUNNING_STATE
+              operation["progress"] = 50
+            else
+              operation["status"] = Fog::Compute::Google::Operation::DONE_STATE
+              operation["progress"] = 100
+            end
+          else
+            operation = {
+              "error" => {
+                "errors" => [
+                 {
+                  "domain" => "global",
+                  "reason" => "notFound",
+                  "message" => "The resource 'projects/#{project}/zones/#{zone_name}/operations/#{operation}' was not found"
+                 }
+                ],
+                "code" => 404,
+                "message" => "The resource 'projects/#{project}/zones/#{zone_name}/operations/#{operation}' was not found"
+              }
+            }
+          end
+          build_response(:body => operation)
+        end
+      end
+
+      class Real
+        # https://developers.google.com/compute/docs/reference/latest/zoneOperations
+
+        def get_zone_operation(zone_name, operation)
+          if zone_name.start_with? 'http'
+            zone_name = zone_name.split('/')[-1]
+          end
+
+          api_method = @compute.zone_operations.get
+          parameters = {
+            'project' => @project,
+            'zone' => zone_name,
+            'operation' => operation
+          }
+
+          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

@@ -16,9 +16,10 @@ module Fog
           end
           get_zone(zone_name)
 
+          id = Fog::Mock.random_numbers(19).to_s
           self.data[:disks][disk_name] = {
             "kind" => "compute#disk",
-            "id" => Fog::Mock.random_numbers(19),
+            "id" => id,
             "creationTimestamp" => Time.now.iso8601,
             "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
             "status" => "READY",
@@ -27,20 +28,24 @@ module Fog
             "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/disks/#{disk_name}"
           }
 
-          build_response(:body => {
+          operation = self.random_operation
+          self.data[:operations][operation] = {
             "kind" => "compute#operation",
-            "id" => "12498846269172327286",
-            "name" => "operation-1385124218076-4ebc35cfbe9f1-476486c5",
+            "id" => Fog::Mock.random_numbers(19).to_s,
+            "name" => operation,
             "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
             "operationType" => "insert",
             "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/disks/#{disk_name}",
-            "status" => "PENDING",
+            "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-1385124218076-4ebc35cfbe9f1-476486c5"
-          })
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/operations/#{operation}"
+          }
+
+          build_response(:body => self.data[:operations][operation])
         end
 
       end

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

@@ -37,9 +37,10 @@ module Fog
           end
           get_zone(zone_name)
 
+          id = Fog::Mock.random_numbers(19).to_s
           self.data[:servers][server_name] = {
             "kind" => "compute#instance",
-            "id" => Fog::Mock.random_numbers(19),
+            "id" => id,
             "creationTimestamp" => Time.now.iso8601,
             "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
             "status" => "PROVISIONING",
@@ -85,20 +86,24 @@ module Fog
             "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/instances/#{server_name}"
           }
 
-          build_response(:body => {
+          operation = self.random_operation
+          self.data[:operations][operation] = {
             "kind" => "compute#operation",
-            "id" => "4639689000254420481",
-            "name" => "operation-1380213292196-4e74bf2fbc3c1-ae707d47",
+            "id" => Fog::Mock.random_numbers(19).to_s,
+            "name" => operation,
             "zone" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}",
             "operationType" => "insert",
             "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/instances/#{server_name}",
-            "status" => "PENDING",
+            "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-1380213292196-4e74bf2fbc3c1-ae707d47"
-          })
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/operations/#{operation}"
+          }
+
+          build_response(:body => self.data[:operations][operation])
         end
 
       end

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

@@ -11,6 +11,7 @@ module Fog
       end
 
       class Real
+        # https://developers.google.com/compute/docs/reference/latest/zoneOperations
 
         def list_zone_operations(zone)
           api_method = @compute.zone_operations.list

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

@@ -1,21 +1,19 @@
 Shindo.tests("Fog::Compute[:brightbox] | Server model", ["brightbox"]) do
-
   pending if Fog.mocking?
 
   tests("success") do
-
-    unless Fog.mocking?
-      @server = Brightbox::Compute::TestSupport.get_test_server
-      server_id = @server.id
-    end
+    @server = Brightbox::Compute::TestSupport.get_test_server
+    server_id = @server.id
 
     tests("#dns_name") do
-      pending if Fog.mocking?
       returns("public.#{@server.fqdn}") { @server.dns_name }
     end
 
-    unless Fog.mocking?
-      @server.destroy
+    tests("#mapping_identity") do
+      first_interface_id = @server.interfaces.first["id"]
+      returns(first_interface_id) { @server.mapping_identity }
     end
+
+    @server.destroy
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-maestrodev
 version: !ruby/object:Gem::Version
-  version: 1.18.0.20131126183714
+  version: 1.18.0.20131127194823
 platform: ruby
 authors:
 - geemus (Wesley Beary)
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: builder
@@ -2194,6 +2194,8 @@ files:
 - lib/fog/google/models/compute/flavors.rb
 - lib/fog/google/models/compute/image.rb
 - lib/fog/google/models/compute/images.rb
+- lib/fog/google/models/compute/operation.rb
+- lib/fog/google/models/compute/operations.rb
 - lib/fog/google/models/compute/server.rb
 - lib/fog/google/models/compute/servers.rb
 - lib/fog/google/models/compute/snapshot.rb
@@ -2214,18 +2216,21 @@ files:
 - lib/fog/google/parsers/storage/get_service.rb
 - lib/fog/google/requests/compute/delete_disk.rb
 - lib/fog/google/requests/compute/delete_firewall.rb
+- lib/fog/google/requests/compute/delete_global_operation.rb
 - lib/fog/google/requests/compute/delete_image.rb
 - lib/fog/google/requests/compute/delete_network.rb
-- lib/fog/google/requests/compute/delete_operation.rb
 - lib/fog/google/requests/compute/delete_server.rb
+- lib/fog/google/requests/compute/delete_zone_operation.rb
 - lib/fog/google/requests/compute/get_disk.rb
 - lib/fog/google/requests/compute/get_firewall.rb
+- lib/fog/google/requests/compute/get_global_operation.rb
 - lib/fog/google/requests/compute/get_image.rb
 - lib/fog/google/requests/compute/get_machine_type.rb
 - lib/fog/google/requests/compute/get_network.rb
 - lib/fog/google/requests/compute/get_server.rb
 - lib/fog/google/requests/compute/get_snapshot.rb
 - lib/fog/google/requests/compute/get_zone.rb
+- lib/fog/google/requests/compute/get_zone_operation.rb
 - lib/fog/google/requests/compute/insert_disk.rb
 - lib/fog/google/requests/compute/insert_firewall.rb
 - lib/fog/google/requests/compute/insert_image.rb