fog-google 0.6.0 → 1.0.0

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

@@ -9,13 +9,7 @@ module Fog
 
       class Real
         def get_network(network_name)
-          api_method = @compute.networks.get
-          parameters = {
-            "project" => @project,
-            "network" => network_name
-          }
-
-          request(api_method, parameters)
+          @compute.get_network(@project, network_name)
         end
       end
     end

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

@@ -9,12 +9,7 @@ module Fog
 
       class Real
         def get_project(identity)
-          api_method = @compute.projects.get
-          parameters = {
-            :project => identity
-          }
-
-          request(api_method, parameters)
+          @compute.get_project(identity)
         end
       end
     end

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

@@ -2,34 +2,14 @@ module Fog
   module Compute
     class Google
       class Mock
-        def get_region(identity)
-          rname = identity.split("/")[-1]
-          region = data[:regions][rname] || {
-            "error" => {
-              "errors" => [
-                {
-                  "domain" => "global",
-                  "reason" => "notFound",
-                  "message" => "The resource 'projects/#{project}/regions/#{rname}' was not found"
-                }
-              ],
-              "code" => 404,
-              "message" => "The resource 'projects/#{project}/regions/#{rname}' was not found"
-            }
-          }
-          build_excon_response(region)
+        def get_region(_identity)
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
         def get_region(identity)
-          api_method = @compute.regions.get
-          parameters = {
-            "project" => @project,
-            "region" => identity.split("/")[-1]
-          }
-
-          request(api_method, parameters)
+          @compute.get_region(@project, identity.split("/")[-1])
         end
       end
     end

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

@@ -2,52 +2,17 @@ module Fog
   module Compute
     class Google
       class Mock
-        def get_region_operation(region_name, operation)
-          operation = 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}/regions/#{region_name}/operations/#{operation}' was not found"
-                  }
-                ],
-                "code" => 404,
-                "message" => "The resource 'projects/#{project}/regions/#{region_name}/operations/#{operation}' was not found"
-              }
-            }
-          end
-          build_excon_response(operation)
+        def get_region_operation(_region, _operation)
+          raise Fog::Errors::MockNotImplemented
         end
       end
 
       class Real
-        # https://developers.google.com/compute/docs/reference/latest/regionOperations
-
-        def get_region_operation(region_name, operation)
-          if region_name.start_with? "http"
-            region_name = region_name.split("/")[-1]
-          end
-
-          api_method = @compute.region_operations.get
-          parameters = {
-            "project" => @project,
-            "region" => region_name,
-            "operation" => operation
-          }
-
-          request(api_method, parameters)
+        # Retrieves the specified region-specific Operations resource
+        # @see https://developers.google.com/compute/docs/reference/latest/regionOperations/get
+        def get_region_operation(region, operation)
+          region = region.split("/")[-1] if region.start_with? "http"
+          @compute.get_region_operation(@project, region, operation)
         end
       end
     end

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

@@ -8,14 +8,11 @@ module Fog
       end
 
       class Real
+        # List address resources in the specified project
+        #
+        # @see https://cloud.google.com/compute/docs/reference/latest/routes/list
         def get_route(identity)
-          api_method = @compute.routes.get
-          parameters = {
-            "project" => @project,
-            "route" => identity
-          }
-
-          request(api_method, parameters)
+          @compute.get_route(@project, identity)
         end
       end
     end

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

@@ -2,68 +2,14 @@ module Fog
   module Compute
     class Google
       class Mock
-        def get_server(server_name, zone_name)
-          server = data[:servers][server_name]
-          get_zone(zone_name)
-          zone = data[:zones][zone_name]
-          if server.nil? || server["zone"] != zone["selfLink"]
-            return build_excon_response("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
-            end
-          when "TERMINATED"
-            if Time.now - Time.iso8601(server["mock-deletionTimestamp"]) > Fog::Mock.delay
-              data[:servers][server_name] = nil
-            end
-          end
-
-          build_excon_response(server)
+        def get_server(_instance, _zone)
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def get_server(server_name, zone_name)
-          if zone_name.is_a? Excon::Response
-            zone = zone_name.body["name"]
-          else
-            zone = zone_name
-          end
-
-          api_method = @compute.instances.get
-          parameters = {
-            "project" => @project,
-            "zone" => zone,
-            "instance" => server_name
-          }
-
-          request(api_method, parameters)
+        def get_server(instance, zone)
+          @compute.get_instance(@project, zone.split("/")[-1], instance)
         end
       end
     end

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

@@ -8,15 +8,27 @@ module Fog
       end
 
       class Real
-        def get_server_serial_port_output(identity, zone)
-          api_method = @compute.instances.get_serial_port_output
-          parameters = {
-            "project"  => @project,
-            "instance" => identity,
-            "zone"     => zone.split("/")[-1]
-          }
-
-          request(api_method, parameters)
+        # Returns the specified instance's serial port output.
+        # @param [String] zone Zone for the given instance
+        # @param [String] instance Instance scoping this request.
+        # @param [Fixnum] port
+        #   Specifies which COM or serial port to retrieve data from.
+        #   Acceptable values are 1 to 4, inclusive. (Default: 1)
+        # @param [Fixnum] start
+        #   Returns output starting from a specific byte position.
+        #   Use this to page through output when the output is too large to
+        #   return in a single request. For the initial request,
+        #   leave this field unspecified. For subsequent calls, this field
+        #   should be set to the next value returned in the previous call.
+        # @see https://cloud.google.com/compute/docs/reference/latest/instances/getSerialPortOutput
+        def get_server_serial_port_output(identity, zone, port: nil, start: nil)
+          @compute.get_instance_serial_port_output(
+            @project,
+            zone.split("/")[-1],
+            identity,
+            :port => port,
+            :start => start
+          )
         end
       end
     end

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

@@ -10,14 +10,7 @@ module Fog
       class Real
         def get_snapshot(snap_name, project = @project)
           raise ArgumentError.new "snap_name must not be nil." if snap_name.nil?
-
-          api_method = @compute.snapshots.get
-          parameters = {
-            "snapshot" => snap_name,
-            "project"  => project
-          }
-
-          request(api_method, parameters)
+          @compute.get_snapshot(project, snap_name)
         end
       end
     end

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

@@ -9,12 +9,7 @@ module Fog
 
       class Real
         def get_ssl_certificate(certificate_name)
-          api_method = @compute.ssl_certificates.get
-          parameters = {
-            "project" => @project,
-            "sslCertificate" => certificate_name
-          }
-          request(api_method, parameters)
+          @compute.get_ssl_certificate(@project, certificate_name)
         end
       end
     end

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

@@ -2,42 +2,24 @@ module Fog
   module Compute
     class Google
       class Mock
-        def get_subnetwork(subnetwork_name, region_name)
-          subnetwork_name = subnetwork_name.split("/")[-1] if subnetwork_name.start_with? "http"
-          region_name = region_name.split("/")[-1] if region_name.start_with? "http"
-          subnetwork = data[:subnetworks][subnetwork_name]
-
-          unless subnetwork && subnetwork["region"].split("/")[-1] == region_name
-            return build_excon_response("error" => {
-                                          "errors" => [
-                                            {
-                                              "domain" => "global",
-                                              "reason" => "notFound",
-                                              "message" => "The resource 'projects/#{@project}/regions/#{region_name}/subnetworks/#{subnetwork_name}' was not found"
-                                            }
-                                          ],
-                                          "code" => 404,
-                                          "message" => "The resource 'projects/#{@project}/regions/#{region_name}/subnetworks/#{subnetwork_name}' was not found"
-                                        })
-          end
-
-          build_excon_response(subnetwork)
+        def get_subnetwork(_subnetwork_name, _region_name)
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
+        ##
+        # Returns the specified subnetwork.
+        #
+        # @param subnetwork_name [String] the name of the subnetwork
+        # @param region_name [String] the name of the subnetwork's region
+        # @return [Google::Apis::ComputeV1::Operation] an operation response
+        #
+        # @see https://cloud.google.com/compute/docs/reference/latest/subnetworks/get
         def get_subnetwork(subnetwork_name, region_name)
           subnetwork_name = subnetwork_name.split("/")[-1] if subnetwork_name.start_with? "http"
           region_name = region_name.split("/")[-1] if region_name.start_with? "http"
-
-          api_method = @compute.subnetworks.get
-          parameters = {
-            "project"    => @project,
-            "region"     => region_name,
-            "subnetwork" => subnetwork_name
-          }
-
-          request(api_method, parameters)
+          @compute.get_subnetwork(@project, region_name, subnetwork_name)
         end
       end
     end

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

@@ -2,22 +2,14 @@ module Fog
   module Compute
     class Google
       class Mock
-        def get_target_http_proxy(name)
-          proxy = data[:target_http_proxies][name]
-          return nil if proxy.nil?
-          build_excon_response(proxy)
+        def get_target_http_proxy(_proxy_name)
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def get_target_http_proxy(name)
-          api_method = @compute.target_http_proxies.get
-          parameters = {
-            "project" => @project,
-            "targetHttpProxy" => name
-          }
-
-          request(api_method, parameters)
+        def get_target_http_proxy(proxy_name)
+          @compute.get_target_http_proxy(@project, proxy_name)
         end
       end
     end

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

@@ -2,20 +2,14 @@ module Fog
   module Compute
     class Google
       class Mock
-        def get_target_https_proxy(_name)
+        def get_target_https_proxy(_proxy_name)
           Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def get_target_https_proxy(name)
-          api_method = @compute.target_https_proxies.get
-          parameters = {
-            "project" => @project,
-            "targetHttpsProxy" => name
-          }
-
-          request(api_method, parameters)
+        def get_target_https_proxy(proxy_name)
+          @compute.get_target_https_proxy(@project, proxy_name)
         end
       end
     end

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

@@ -2,25 +2,15 @@ module Fog
   module Compute
     class Google
       class Mock
-        def get_target_instance(name, _zone_name)
-          target_instance = data[:target_instances][name]
-          return nil if target_instance.nil?
-          build_excon_response(target_instance)
+        def get_target_instance(_target_name, _zone)
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def get_target_instance(target_instance_name, zone_name)
-          zone_name = zone_name.split("/")[-1] if zone_name.start_with? "http"
-
-          api_method = @compute.target_instances.get
-          parameters = {
-            "project" => @project,
-            "targetInstance" => target_instance_name,
-            "zone" => zone_name
-          }
-
-          request(api_method, parameters)
+        def get_target_instance(target_name, zone)
+          zone = zone.split("/")[-1] if zone.start_with? "http"
+          @compute.get_target_instance(@project, zone, target_name)
         end
       end
     end

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

@@ -2,37 +2,15 @@ module Fog
   module Compute
     class Google
       class Mock
-        def get_target_pool(name, region_name)
-          region = get_region(region_name)
-          target_pool = data[:target_pools][name] || {
-            "error" => {
-              "errors" => [{
-                "domain" => "global",
-                "reason" => "notFound",
-                "message" => "The resource 'projects/#{project}/regions/#{region_name}/targetPools/#{name}' was not found"
-              }],
-              "code" => 404,
-              "message" => "The resource 'projects/#{project}/regions/#{region_name}/targetPools/#{name}' was not found"
-            }
-          }
-          build_excon_response(target_pool)
+        def get_target_pool(_target_pool, _region)
+          Fog::Mock.not_implemented
         end
       end
 
       class Real
-        def get_target_pool(target_pool_name, region_name)
-          if region_name.start_with? "http"
-            region_name = region_name.split("/")[-1]
-          end
-
-          api_method = @compute.target_pools.get
-          parameters = {
-            "project" => @project,
-            "targetPool" => target_pool_name,
-            "region" => region_name
-          }
-
-          request(api_method, parameters)
+        def get_target_pool(target_pool, region)
+          region = region.split("/")[-1] if region.start_with? "http"
+          @compute.get_target_pool(@project, region, target_pool)
         end
       end
     end