fog 1.23.0 → 1.24.0

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

@@ -27,8 +27,7 @@ module Fog
           body_object['nextHopGateway'] = options[:next_hop_gateway] if options[:next_hop_gateway]
           body_object['nextHopIp'] = options[:next_hop_ip] if options[:next_hop_ip]
 
-          result = self.build_result(api_method, parameters, body_object)
-          response = self.build_response(result)
+          request(api_method, parameters, body_object)
         end
       end
     end

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

@@ -30,7 +30,6 @@ module Fog
           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",
@@ -88,7 +87,7 @@ module Fog
             "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/operations/#{operation}"
           }
 
-          build_response(:body => self.data[:operations][operation])
+          build_excon_response(self.data[:operations][operation])
         end
       end
 
@@ -130,8 +129,8 @@ module Fog
           network = nil
           if options.key? 'network'
             network = options.delete 'network'
-          elsif @default_network
-            network = @default_network
+          else
+            network = GOOGLE_COMPUTE_DEFAULT_NETWORK
           end
 
           # ExternalIP is default value for server creation
@@ -184,9 +183,7 @@ module Fog
 
           body_object.merge!(options) # Adds in all remaining options that weren't explicitly handled.
 
-          result = self.build_result(api_method, parameters,
-                                     body_object=body_object)
-          response = self.build_response(result)
+          request(api_method, parameters, body_object=body_object)
         end
       end
     end

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

@@ -32,9 +32,7 @@ module Fog
           # Merge in any remaining options (description)
           body_object.merge!(opts)
 
-          result = self.build_result(api_method, parameters,
-                                     body_object)
-          response = self.build_response(result)
+          request(api_method, parameters, body_object)
         end
       end
     end

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

@@ -0,0 +1,52 @@
+module Fog
+  module Compute
+    class Google
+      class Mock
+        def insert_target_http_proxy(name, options={})
+          id = Fog::Mock.random_numbers(19).to_s
+          self.data[:target_http_proxies][name] = {
+            "kind" => "compute#targetHttpProxy",
+            "id" => id,
+            "creationTimestamp" => Time.now.iso8601,
+            "name" => name,
+            "description" => '',
+            "urlMap" => options["urlMap"],
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/targetHttpProxies/#{name}"
+          }
+
+          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}/global",
+            "operationType" => "insert",
+            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/targetHttpProxies/#{name}",
+            "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}/global/operations/#{operation}"
+          }
+
+          build_excon_response(self.data[:operations][operation])
+        end
+      end
+
+      class Real
+        def insert_target_http_proxy(name, opts={})
+          api_method = @compute.target_http_proxies.insert
+          parameters = {
+            'project' => @project
+          }
+          body_object = { 'name' => name }
+          body_object.merge!(opts)
+
+          request(api_method, parameters, body_object)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,55 @@
+module Fog
+  module Compute
+    class Google
+      class Mock
+        def insert_target_instance(target_instance, zone_name, opts = {})
+          id = Fog::Mock.random_numbers(19).to_s
+          self.data[:target_instances][target_instance] = {
+            "kind" => "compute#targetInstance",
+            "id" => id,
+            "creationTimestamp" => Time.now.iso8601,
+            "name" => target_instance,
+            "description" => '',
+            "natPolicy" => '',
+            "zone" => zone_name,
+            "instance" => opts['instance'],
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/targetInstances/#{target_instance}"
+          }
+
+          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}",
+            "operationType" => "insert",
+            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone_name}/targetInstances/#{target_instance}",
+            "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}"
+          }
+
+          build_excon_response(self.data[:operations][operation])
+        end
+      end
+
+      class Real
+        def insert_target_instance(target_instance_name, zone_name, opts = {})
+          api_method = @compute.target_instances.insert
+          parameters = {
+            'project' => @project,
+            'zone' => zone_name,
+          }
+          body_object = { 'name' => target_pool_name }
+          body_object.merge!(opts)
+
+          request(api_method, parameters, body_object=body_object)
+        end
+      end
+    end
+  end
+end

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

@@ -2,8 +2,41 @@ module Fog
   module Compute
     class Google
       class Mock
-        def insert_target_pool(target_pool_name, region_name)
-          Fog::Mock.not_implemented
+        def insert_target_pool(name, region_name, opts = {})
+          # check that region exists
+          get_region(region_name)
+
+          id = Fog::Mock.random_numbers(19).to_s
+          self.data[:target_pools][name] = {
+            "kind" => "compute#targetPools",
+            "id" => id,
+            "creationTimestamp" => Time.now.iso8601,
+            "name" => name,
+            "description" => '',
+            "region" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/regions/#{region_name}",
+            "instances" => opts['instances'],
+            "healthChecks" => opts['healthChecks'],
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/regions/#{region_name}/targetPools/#{name}"
+          }
+
+          operation = self.random_operation
+          self.data[:operations][operation] = {
+            "kind" => "compute#operation",
+            "id" => Fog::Mock.random_numbers(19).to_s,
+            "name" => operation,
+            "region" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/regions/#{region_name}",
+            "operationType" => "insert",
+            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/regions/#{region_name}/targetPools/#{name}",
+            "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}/regions/#{region_name}/operations/#{operation}"
+          }
+
+          build_excon_response(self.data[:operations][operation])
         end
       end
 
@@ -17,9 +50,7 @@ module Fog
           body_object = { 'name' => target_pool_name }
           body_object.merge!(opts)
 
-          result = self.build_result(api_method, parameters,
-                                     body_object=body_object)
-          response = self.build_response(result)
+          request(api_method, parameters, body_object=body_object)
         end
       end
     end

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

@@ -0,0 +1,55 @@
+module Fog
+  module Compute
+    class Google
+      class Mock
+        def insert_url_map(url_map_name, opts)
+          id = Fog::Mock.random_numbers(19).to_s
+          self.data[:url_maps][url_map_name] = {
+            "kind" => "compute#urlMap",
+            "id" => id,
+            "creationTimestamp" => Time.now.iso8601,
+            "name" => url_map_name,
+            "description" => '',
+            "hostRules" => [],
+            "pathMatchers" => [],
+            "tests" => [],
+            "defaultService" => opts['defaultService'],
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/urlMaps/#{url_map_name}"
+          }
+
+          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}/global",
+            "operationType" => "insert",
+            "targetLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/urlMaps/#{url_map_name}",
+            "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}/global/operations/#{operation}"
+          }
+
+          build_excon_response(self.data[:operations][operation])
+        end
+      end
+
+      class Real
+        def insert_url_map(url_map_name, opts = {})
+          api_method = @compute.url_maps.insert
+          parameters = {
+            'project' => @project,
+          }
+          body_object = { 'name' => url_map_name }
+          body_object.merge!(opts)
+
+          request(api_method, parameters, body_object=body_object)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+module Fog
+  module Compute
+    class Google
+      class Mock
+        def insert_zone_view(zone_view_name, zone_name)
+          Fog::Mock.not_implemented
+        end
+      end
+
+      class Real
+        def insert_zone_view(zone_view_name, zone_name, opts = {})
+          api_method = @resourceviews.zone_views.insert
+          parameters = {
+            'projectName' => @project,
+            'zone' => zone_name
+#            'zone' => zone_name
+          }
+          body_object = { 'name' => zone_view_name }
+          body_object.merge!(opts)
+
+          request(api_method, parameters, body_object=body_object)
+        end
+      end
+    end
+  end
+end
+

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

@@ -15,8 +15,7 @@ module Fog
             'region' => region_name
           }
 
-          result = self.build_result(api_method, parameters)
-          response = self.build_response(result)
+          request(api_method, parameters)
         end
       end
     end

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

@@ -15,8 +15,7 @@ module Fog
           }
           parameters['filter'] = options[:filter] if options[:filter]
 
-          result = self.build_result(api_method, parameters)
-          response = self.build_response(result)
+          request(api_method, parameters)
         end
       end
     end

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

@@ -16,7 +16,7 @@ module Fog
               disk_types_items["zones/#{zone}"] = { 'diskTypes' => disk_types }
             end
           end
-          build_response(:body => {
+          build_excon_response({
             'kind' => 'compute#diskTypeAggregatedList',
             'selfLink' => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/aggregated/diskTypes",
             'items' => disk_types_items,
@@ -32,8 +32,7 @@ module Fog
           }
           parameters['filter'] = options[:filter] if options[:filter]
 
-          result = self.build_result(api_method, parameters)
-          response = self.build_response(result)
+          request(api_method, parameters)
         end
       end
     end

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

@@ -14,7 +14,7 @@ module Fog
             # Fill the zones Hash with the disks attached to each zone
             self.data[:disks].values.each { |disk| zones["zones/#{disk['zone'].split('/')[-1]}"]['disks'].concat([disk]) }
           end
-          build_response(:body => {
+          build_excon_response({
             "kind" => "compute#diskAggregatedList",
             "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/aggregated/disks",
             "id" => "projects/#{@project}/aggregated/disks",
@@ -32,8 +32,7 @@ module Fog
           }
           parameters['filter'] = options[:filter] if options[:filter]
 
-          result = self.build_result(api_method, parameters)
-          response = self.build_response(result)
+          request(api_method, parameters)
         end
       end
     end

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

@@ -14,8 +14,7 @@ module Fog
             'project' => @project,
           }
 
-          result = self.build_result(api_method, parameters)
-          response = self.build_response(result)
+          request(api_method, parameters)
         end
       end
     end

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

@@ -14,7 +14,7 @@ module Fog
             # Fill the zones Hash with the servers attached to each zone
             self.data[:servers].values.each { |server| zones["zones/#{server['zone'].split('/')[-1]}"]['instances'].concat([server]) }
           end
-          build_response(:body => {
+          build_excon_response({
             "kind" => "compute#instanceAggregatedList",
             "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/aggregated/instances",
             "id" => "projects/#{@project}/aggregated/instances",
@@ -32,8 +32,7 @@ module Fog
           }
           parameters['filter'] = options[:filter] if options[:filter]
 
-          result = self.build_result(api_method, parameters)
-          response = self.build_response(result)
+          request(api_method, parameters)
         end
       end
     end

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

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class Google
+      class Mock
+        def list_backend_services
+          backend_services = self.data[:backend_services].values
+
+          build_excon_response({
+            "kind" => "compute#backendServiceList",
+            "selfLink" => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/global/backendServices",
+            "id" => "projects/#{@project}/global/backendServices",
+            "items" => backend_services
+          })
+        end
+      end
+
+      class Real
+        def list_backend_services
+          api_method = @compute.backend_services.list
+          parameters = {
+            'project' => @project,
+          }
+
+          request(api_method, parameters)
+        end
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@ module Fog
     class Google
       class Mock
         def list_disk_types(zone)
-          build_response(:body => {
+          build_excon_response({
             'kind' => 'compute#diskTypeList',
             'selfLink' => "https://www.googleapis.com/compute/#{api_version}/projects/#{@project}/zones/#{zone}/diskTypes",
             'items' => [
@@ -38,8 +38,7 @@ module Fog
             'zone'    => zone.split('/')[-1],
           }
 
-          result = self.build_result(api_method, parameters)
-          response = self.build_response(result)
+          request(api_method, parameters)
         end
       end
     end