fog-google 1.24.1 → 1.26.0

data/lib/fog/{compute/google → google/compute}/models/machine_type.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class MachineType < Fog::Model
         identity :name
 

data/lib/fog/{compute/google → google/compute}/models/machine_types.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class MachineTypes < Fog::Collection
-        model Fog::Compute::Google::MachineType
+        model Fog::Google::Compute::MachineType
 
         def all(zone: nil, filter: nil, max_results: nil, order_by: nil, page_token: nil)
           opts = {

data/lib/fog/{compute/google → google/compute}/models/network.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       ##
       # Represents a Network resource
       #
@@ -30,7 +30,7 @@ module Fog
           requires :identity
 
           data = service.insert_network(identity, attributes)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           # Since network has no "state" we can query, we have to wait for the operation to finish
           # TODO: change back to async when there's a proper state API
@@ -42,7 +42,7 @@ module Fog
           requires :identity
 
           data = service.delete_network(identity)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? } unless async
           operation

data/lib/fog/{compute/google → google/compute}/models/networks.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Networks < Fog::Collection
-        model Fog::Compute::Google::Network
+        model Fog::Google::Compute::Network
 
         def all(opts = {})
           items = []

data/lib/fog/{compute/google → google/compute}/models/operation.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Operation < Fog::Model
         identity :name
 

data/lib/fog/{compute/google → google/compute}/models/operations.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Operations < Fog::Collection
-        model Fog::Compute::Google::Operation
+        model Fog::Google::Compute::Operation
 
         def all(zone: nil, region: nil, filter: nil, max_results: nil,
                 order_by: nil, page_token: nil)

data/lib/fog/{compute/google → google/compute}/models/project.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       ##
       # Represents a Project resource
       #
@@ -20,7 +20,7 @@ module Fog
           requires :identity
 
           operation = service.set_common_instance_metadata(identity, common_instance_metadata["fingerprint"], metadata)
-          Fog::Compute::Google::Operations.new(:service => service).get(operation.id)
+          Fog::Google::Compute::Operations.new(:service => service).get(operation.id)
         end
       end
     end

data/lib/fog/{compute/google → google/compute}/models/projects.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Projects < Fog::Collection
-        model Fog::Compute::Google::Project
+        model Fog::Google::Compute::Project
 
         def get(identity)
           if identity

data/lib/fog/{compute/google → google/compute}/models/region.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       ##
       # Represents a Region resource
       #

data/lib/fog/{compute/google → google/compute}/models/regions.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Regions < Fog::Collection
-        model Fog::Compute::Google::Region
+        model Fog::Google::Compute::Region
 
         def all(opts = {})
           items = []

data/lib/fog/{compute/google → google/compute}/models/route.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       ##
       # Represents a Route resource
       #
@@ -28,7 +28,7 @@ module Fog
           requires :identity, :network, :dest_range, :priority
 
           data = service.insert_route(identity, network, dest_range, priority, attributes)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? }
           reload
@@ -38,7 +38,7 @@ module Fog
           requires :identity
 
           data = service.delete_route(identity)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? } unless async
           operation

data/lib/fog/{compute/google → google/compute}/models/routes.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Routes < Fog::Collection
-        model Fog::Compute::Google::Route
+        model Fog::Google::Compute::Route
 
         def all(opts = {})
           items = []

data/lib/fog/{compute/google → google/compute}/models/server.rb

@@ -1,8 +1,8 @@
 require "fog/compute/models/server"
 
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Server < Fog::Compute::Server
         identity :name
 
@@ -202,12 +202,12 @@ module Fog
         # Destroy a server.
         #
         # @param async [TrueClass] execute the command asynchronously
-        # @return [Fog::Compute::Google::Operation]
+        # @return [Fog::Google::Compute::Operation]
         def destroy(async = true)
           requires :name, :zone
 
           data = service.delete_server(name, zone_name)
-          operation = Fog::Compute::Google::Operations
+          operation = Fog::Google::Compute::Operations
                       .new(:service => service)
                       .get(data.name, data.zone)
           operation.wait_for { ready? } unless async
@@ -277,13 +277,13 @@ module Fog
           requires :identity, :zone
 
           if disk.is_a? Disk
-            disk_obj = disk.get_attached_disk
+            disk_obj = disk.attached_disk_obj(**attached_disk_options)
           elsif disk.is_a? String
             disk_obj = service.disks.attached_disk_obj(disk, **attached_disk_options)
           end
 
           data = service.attach_disk(identity, zone_name, disk_obj)
-          operation = Fog::Compute::Google::Operations
+          operation = Fog::Google::Compute::Operations
                       .new(:service => service)
                       .get(data.name, data.zone)
           operation.wait_for { ready? } unless async
@@ -294,12 +294,12 @@ module Fog
         #
         # @param device_name [Object]
         # @param async [TrueClass]
-        # @returns [Fog::Compute::Google::Server] server object
+        # @returns [Fog::Google::Compute::Server] server object
         def detach_disk(device_name, async = true)
           requires :identity, :zone
 
           data = service.detach_disk(identity, zone, device_name)
-          operation = Fog::Compute::Google::Operations
+          operation = Fog::Google::Compute::Operations
                       .new(:service => service)
                       .get(data.name, data.zone)
           operation.wait_for { ready? } unless async
@@ -321,7 +321,7 @@ module Fog
           requires :identity, :zone
 
           data = service.reset_server(identity, zone_name)
-          operation = Fog::Compute::Google::Operations
+          operation = Fog::Google::Compute::Operations
                       .new(:service => service)
                       .get(data.name, data.zone)
           operation.wait_for { ready? } unless async
@@ -332,7 +332,7 @@ module Fog
           requires :identity, :zone
 
           data = service.start_server(identity, zone_name)
-          operation = Fog::Compute::Google::Operations
+          operation = Fog::Google::Compute::Operations
                       .new(:service => service)
                       .get(data.name, data.zone)
           operation.wait_for { ready? } unless async
@@ -343,7 +343,7 @@ module Fog
           requires :identity, :zone
 
           data = service.stop_server(identity, zone_name, discard_local_ssd)
-          operation = Fog::Compute::Google::Operations
+          operation = Fog::Google::Compute::Operations
                       .new(:service => service)
                       .get(data.name, data.zone)
           operation.wait_for { ready? } unless async
@@ -368,7 +368,7 @@ module Fog
             identity, zone_name, auto_delete, device_name
           )
 
-          operation = Fog::Compute::Google::Operations
+          operation = Fog::Google::Compute::Operations
                       .new(:service => service)
                       .get(data.name, data.zone)
           operation.wait_for { ready? } unless async
@@ -387,7 +387,7 @@ module Fog
             :preemptible => preemptible
           )
 
-          operation = Fog::Compute::Google::Operations
+          operation = Fog::Google::Compute::Operations
                       .new(:service => service)
                       .get(data.name, data.zone)
           operation.wait_for { ready? } unless async
@@ -400,7 +400,7 @@ module Fog
         # @param [Hash] new_metadata A new metadata object
         #   Format: {'foo' => 'bar', 'baz'=>'foo'}
         #
-        # @returns [Fog::Compute::Google::Server] server object
+        # @returns [Fog::Google::Compute::Server] server object
         def set_metadata(new_metadata = {}, async = true)
           requires :identity, :zone
 
@@ -414,7 +414,7 @@ module Fog
           data = service.set_server_metadata(
             identity, zone_name, metadata[:fingerprint], new_metadata_items
           )
-          operation = Fog::Compute::Google::Operations
+          operation = Fog::Google::Compute::Operations
                       .new(:service => service)
                       .get(data.name, data.zone)
           operation.wait_for { ready? } unless async
@@ -429,7 +429,7 @@ module Fog
           data = service.set_server_machine_type(
             identity, zone_name, new_machine_type
           )
-          operation = Fog::Compute::Google::Operations
+          operation = Fog::Google::Compute::Operations
                       .new(:service => service)
                       .get(data.name, data.zone)
           operation.wait_for { ready? } unless async
@@ -442,7 +442,7 @@ module Fog
           data = service.set_server_tags(
             identity, zone_name, tags[:fingerprint], new_tags
           )
-          operation = Fog::Compute::Google::Operations
+          operation = Fog::Google::Compute::Operations
                       .new(:service => service)
                       .get(data.name, data.zone)
           operation.wait_for { ready? } unless async
@@ -490,7 +490,7 @@ module Fog
             identity, zone_name, metadata[:fingerprint], metadata[:items]
           )
 
-          operation = Fog::Compute::Google::Operations
+          operation = Fog::Google::Compute::Operations
                       .new(:service => service)
                       .get(data.name, data.zone)
           operation.wait_for { ready? } unless async
@@ -559,7 +559,7 @@ module Fog
 
           data = service.insert_server(name, zone_name, options)
 
-          operation = Fog::Compute::Google::Operations
+          operation = Fog::Google::Compute::Operations
                       .new(:service => service)
                       .get(data.name, data.zone)
           operation.wait_for { ready? }

data/lib/fog/{compute/google → google/compute}/models/servers.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Servers < Fog::Collection
-        model Fog::Compute::Google::Server
+        model Fog::Google::Compute::Server
 
         def all(zone: nil, filter: nil, max_results: nil,
                 order_by: nil, page_token: nil)

data/lib/fog/{compute/google → google/compute}/models/snapshot.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Snapshot < Fog::Model
         identity :name
 
@@ -31,7 +31,7 @@ module Fog
           requires :identity
 
           data = service.delete_snapshot(identity)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? } unless async
           operation

data/lib/fog/{compute/google → google/compute}/models/snapshots.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Snapshots < Fog::Collection
-        model Fog::Compute::Google::Snapshot
+        model Fog::Google::Compute::Snapshot
 
         def all
           items = []

data/lib/fog/{compute/google → google/compute}/models/ssl_certificate.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       ##
       # Represents a SslCertificate resource
       #
@@ -22,7 +22,7 @@ module Fog
             identity, certificate, private_key,
             :description => description
           )
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? }
           reload
@@ -31,7 +31,7 @@ module Fog
         def destroy(async = true)
           requires :identity
           data = service.delete_ssl_certificate(identity)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? } unless async
           operation

data/lib/fog/{compute/google → google/compute}/models/ssl_certificates.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class SslCertificates < Fog::Collection
-        model Fog::Compute::Google::SslCertificate
+        model Fog::Google::Compute::SslCertificate
 
         def get(identity)
           if identity

data/lib/fog/{compute/google → google/compute}/models/subnetwork.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       ##
       # Represents a Subnetwork resource
       #
@@ -24,7 +24,7 @@ module Fog
           requires :identity, :network, :region, :ip_cidr_range
 
           data = service.insert_subnetwork(identity, region, network, ip_cidr_range, attributes)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name, nil, data.region)
           operation.wait_for { ready? }
           reload
@@ -34,7 +34,7 @@ module Fog
           requires :identity, :region
 
           data = service.delete_subnetwork(identity, region)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name, nil, data.region)
           operation.wait_for { ready? } unless async
           operation
@@ -51,7 +51,7 @@ module Fog
           data = service.expand_subnetwork_ip_cidr_range(
             identity, region, range
           )
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name, nil, data.region)
           operation.wait_for { ready? } unless async
           reload
@@ -63,7 +63,7 @@ module Fog
           data = service.set_subnetwork_private_ip_google_access(
             identity, region, access
           )
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name, nil, data.region)
 
           operation.wait_for { ready? } unless async

data/lib/fog/{compute/google → google/compute}/models/subnetworks.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class Subnetworks < Fog::Collection
-        model Fog::Compute::Google::Subnetwork
+        model Fog::Google::Compute::Subnetwork
 
         def all(region: nil, filter: nil, max_results: nil, order_by: nil, page_token: nil)
           filters = {

data/lib/fog/{compute/google → google/compute}/models/target_http_proxies.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class TargetHttpProxies < Fog::Collection
-        model Fog::Compute::Google::TargetHttpProxy
+        model Fog::Google::Compute::TargetHttpProxy
 
         def all(opts = {})
           items = []

data/lib/fog/{compute/google → google/compute}/models/target_http_proxy.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class TargetHttpProxy < Fog::Model
         identity :name
 
@@ -16,7 +16,7 @@ module Fog
           data = service.insert_target_http_proxy(
             identity, :description => description, :url_map => url_map
           )
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? }
           reload
@@ -26,7 +26,7 @@ module Fog
           requires :identity
 
           data = service.delete_target_http_proxy(identity)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? } unless async
           operation
@@ -36,7 +36,7 @@ module Fog
           requires :identity
 
           data = service.set_target_http_proxy_url_map(identity, url_map)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? } unless async
           reload

data/lib/fog/{compute/google → google/compute}/models/target_https_proxies.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class TargetHttpsProxies < Fog::Collection
-        model Fog::Compute::Google::TargetHttpsProxy
+        model Fog::Google::Compute::TargetHttpsProxy
 
         def all(opts = {})
           items = []

data/lib/fog/{compute/google → google/compute}/models/target_https_proxy.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class TargetHttpsProxy < Fog::Model
         identity :name
 
@@ -16,7 +16,7 @@ module Fog
         #   [cert_one.self_link', cert_two.self_link]
         #
         # , where 'cert_one' and 'cert_two' are instances of
-        # Fog::Compute::Google::SslCertificate
+        # Fog::Google::Compute::SslCertificate
         #
         # @return [Array<String>]
         attribute :ssl_certificates, :aliases => "sslCertificates"
@@ -34,7 +34,7 @@ module Fog
             :url_map => url_map,
             :ssl_certificates => ssl_certificates
           )
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? }
           reload
@@ -44,7 +44,7 @@ module Fog
           requires :identity
 
           data = service.delete_target_https_proxy(identity)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? } unless async
           operation
@@ -56,7 +56,7 @@ module Fog
           data = service.set_target_https_proxy_url_map(
             identity, url_map
           )
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? } unless async
           reload
@@ -68,7 +68,7 @@ module Fog
           data = service.set_target_https_proxy_ssl_certificates(
             identity, ssl_certificates
           )
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name)
           operation.wait_for { ready? } unless async
           reload

data/lib/fog/{compute/google → google/compute}/models/target_instance.rb

@@ -1,6 +1,6 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class TargetInstance < Fog::Model
         identity :name
 
@@ -24,7 +24,7 @@ module Fog
           }
 
           data = service.insert_target_instance(identity, zone, options)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name, data.zone)
           operation.wait_for { ready? }
           reload
@@ -33,7 +33,7 @@ module Fog
         def destroy(async = true)
           requires :name, :zone
           data = service.delete_target_instance(name, zone)
-          operation = Fog::Compute::Google::Operations.new(:service => service)
+          operation = Fog::Google::Compute::Operations.new(:service => service)
                                                       .get(data.name, data.zone)
           operation.wait_for { ready? } unless async
           operation

data/lib/fog/{compute/google → google/compute}/models/target_instances.rb

@@ -1,8 +1,8 @@
 module Fog
-  module Compute
-    class Google
+  module Google
+    class Compute
       class TargetInstances < Fog::Collection
-        model Fog::Compute::Google::TargetInstance
+        model Fog::Google::Compute::TargetInstance
 
         def all(zone: nil, filter: nil, max_results: nil, order_by: nil,
                 page_token: nil)