fog-google 1.12.1 → 1.16.0

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

@@ -15,7 +15,7 @@ module Fog
             @project,
             check_name,
             ::Google::Apis::ComputeV1::HttpHealthCheck.new(
-              opts.merge(:name => check_name)
+              **opts.merge(:name => check_name)
             )
           )
         end

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

@@ -18,7 +18,7 @@ module Fog
           @compute.update_url_map(
             @project, url_map_name,
             ::Google::Apis::ComputeV1::UrlMap.new(
-              url_map.merge(:name => url_map_name)
+              url_map.merge(name: url_map_name)
             )
           )
         end

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

@@ -14,7 +14,7 @@ module Fog
           @compute.validate_url_map(
             @project, url_map_name,
             ::Google::Apis::ComputeV1::ValidateUrlMapsRequest.new(
-              :url_map => ::Google::Apis::ComputeV1::UrlMap.new(url_map)
+              url_map: ::Google::Apis::ComputeV1::UrlMap.new(**url_map)
             )
           )
         end

data/lib/fog/dns/google/requests/create_change.rb

@@ -10,8 +10,8 @@ module Fog
           @dns.create_change(
             @project, zone_name_or_id,
             ::Google::Apis::DnsV1::Change.new(
-              :additions => additions,
-              :deletions => deletions
+              additions: additions,
+              deletions: deletions
             )
           )
         end

data/lib/fog/google/models/sql/instance.rb

@@ -98,7 +98,7 @@ module Fog
           requires :identity
 
           data = service.insert_instance(identity, attributes[:tier], attributes)
-          operation = Fog::Google::SQL::Operations.new(:service => service).get(data.name)
+          operation = Fog::Google::SQL::Operations.new(service: service).get(data.name)
           operation.wait_for { ready? } unless async
           reload
         end
@@ -271,7 +271,7 @@ module Fog
           requires :identity
 
           data = service.restore_instance_backup(identity, backup_run_id)
-          operation = Fog::Google::SQL::Operations.new(:service => service).get(data.name)
+          operation = Fog::Google::SQL::Operations.new(service: service).get(data.name)
           operation.tap { |o| o.wait_for { ready? } unless async }
         end
 

data/lib/fog/google/requests/monitoring/create_metric_descriptor.rb

@@ -25,14 +25,14 @@ module Fog
         def create_metric_descriptor(metric_type: nil, unit: nil, value_type: nil,
                                      description: nil, display_name: nil, labels: [], metric_kind: nil)
           metric_descriptor = ::Google::Apis::MonitoringV3::MetricDescriptor.new(
-            :name => "projects/#{@project}/metricDescriptors/#{metric_type}",
-            :type => metric_type,
-            :unit => unit,
-            :value_type => value_type,
-            :description => description,
-            :display_name => display_name,
-            :labels => labels.map { |l| ::Google::Apis::MonitoringV3::LabelDescriptor.new(l) },
-            :metric_kind => metric_kind
+            name: "projects/#{@project}/metricDescriptors/#{metric_type}",
+            type: metric_type,
+            unit: unit,
+            value_type: value_type,
+            description: description,
+            display_name: display_name,
+            labels: labels.map { |l| ::Google::Apis::MonitoringV3::LabelDescriptor.new(**l) },
+            metric_kind: metric_kind
           )
 
           @monitoring.create_project_metric_descriptor("projects/#{@project}", metric_descriptor)

data/lib/fog/google/requests/monitoring/create_timeseries.rb

@@ -11,7 +11,7 @@ module Fog
         #
         def create_timeseries(timeseries: [])
           request = ::Google::Apis::MonitoringV3::CreateTimeSeriesRequest.new(
-            :time_series => timeseries
+            time_series: timeseries
           )
           @monitoring.create_project_time_series("projects/#{@project}", request)
         end

data/lib/fog/google/requests/monitoring/list_timeseries.rb

@@ -39,7 +39,7 @@ module Fog
             end
           end
 
-          @monitoring.list_project_time_series("projects/#{@project}", options)
+          @monitoring.list_project_time_series("projects/#{@project}", **options)
         end
       end
 

data/lib/fog/google/requests/pubsub/acknowledge_subscription.rb

@@ -12,7 +12,7 @@ module Fog
             ack_ids = [ack_ids]
           end
           ack_request = ::Google::Apis::PubsubV1::AcknowledgeRequest.new(
-            :ack_ids => ack_ids
+            ack_ids: ack_ids
           )
 
           @pubsub.acknowledge_subscription(subscription, ack_request)

data/lib/fog/google/requests/pubsub/create_subscription.rb

@@ -18,9 +18,9 @@ module Fog
         # @see https://cloud.google.com/pubsub/reference/rest/v1/projects.subscriptions/create
         def create_subscription(subscription_name, topic, push_config = {}, ack_deadline_seconds = nil)
           subscription = ::Google::Apis::PubsubV1::Subscription.new(
-            :topic => topic,
-            :ack_deadline_seconds => ack_deadline_seconds,
-            :push_config => push_config
+            topic: topic,
+            ack_deadline_seconds: ack_deadline_seconds,
+            push_config: push_config
           )
 
           @pubsub.create_subscription(subscription_name, subscription)

data/lib/fog/google/requests/sql/clone_instance.rb

@@ -15,14 +15,14 @@ module Fog
 
           unless log_filename.nil? || log_position.nil?
             context[:bin_log_coordinates] = ::Google::Apis::SqladminV1beta4::BinLogCoordinates.new(
-              :kind => "sql#binLogCoordinates",
-              :log_filename => log_filename,
-              :log_position => log_position
+              kind: "sql#binLogCoordinates",
+              log_filename: log_filename,
+              log_position: log_position
             )
           end
 
           clone_request = ::Google::Apis::SqladminV1beta4::CloneInstancesRequest.new(
-            :clone_context => ::Google::Apis::SqladminV1beta4::CloneContext.new(context)
+            clone_context: ::Google::Apis::SqladminV1beta4::CloneContext.new(**context)
           )
 
           @sql.clone_instance(@project, instance_id, clone_request)

data/lib/fog/google/requests/sql/export_instance.rb

@@ -24,12 +24,12 @@ module Fog
 
           unless csv_export_options.empty?
             data[:csv_export_options] =
-              ::Google::Apis::SqladminV1beta4::ExportContext::CsvExportOptions.new(csv_export_options)
+              ::Google::Apis::SqladminV1beta4::ExportContext::CsvExportOptions.new(**csv_export_options)
           end
 
           unless sql_export_options.nil?
             data[:sql_export_options] =
-              ::Google::Apis::SqladminV1beta4::ExportContext::SqlExportOptions.new(sql_export_options)
+              ::Google::Apis::SqladminV1beta4::ExportContext::SqlExportOptions.new(**sql_export_options)
           end
 
           export_context = ::Google::Apis::SqladminV1beta4::ExportContext.new(export_context)
@@ -37,7 +37,7 @@ module Fog
             @project,
             instance_id,
             ::Google::Apis::SqladminV1beta4::ExportInstancesRequest.new(
-              :export_context => export_context
+              export_context: export_context
             )
           )
         end

data/lib/fog/google/requests/sql/import_instance.rb

@@ -19,14 +19,14 @@ module Fog
           data[:import_user] = import_user unless import_user.nil?
           unless csv_import_options.nil?
             data[:csv_import_options] =
-              ::Google::Apis::SqladminV1beta4::ImportContext::CsvImportOptions.new(csv_import_options)
+              ::Google::Apis::SqladminV1beta4::ImportContext::CsvImportOptions.new(**csv_import_options)
           end
 
           @sql.import_instance(
             @project,
             instance_id,
             ::Google::Apis::SqladminV1beta4::ImportInstancesRequest.new(
-              :import_context => ::Google::Apis::SqladminV1beta4::ImportContext.new(data)
+              import_context: ::Google::Apis::SqladminV1beta4::ImportContext.new(**data)
             )
           )
         end

data/lib/fog/google/requests/sql/insert_backup_run.rb

@@ -11,7 +11,7 @@ module Fog
           @sql.insert_backup_run(
             @project,
             instance_id,
-            ::Google::Apis::SqladminV1beta4::BackupRun.new(backup_run)
+            ::Google::Apis::SqladminV1beta4::BackupRun.new(**backup_run)
           )
         end
       end

data/lib/fog/google/requests/sql/insert_instance.rb

@@ -8,9 +8,9 @@ module Fog
 
       class Real
         def insert_instance(name, tier, options = {})
-          instance = ::Google::Apis::SqladminV1beta4::DatabaseInstance.new(options)
+          instance = ::Google::Apis::SqladminV1beta4::DatabaseInstance.new(**options)
           instance.name = name
-          instance.settings = ::Google::Apis::SqladminV1beta4::Settings.new(instance.settings || {})
+          instance.settings = ::Google::Apis::SqladminV1beta4::Settings.new(**instance.settings || {})
           instance.settings.tier = tier
           @sql.insert_instance(@project, instance)
         end

data/lib/fog/google/requests/sql/insert_ssl_cert.rb

@@ -12,7 +12,7 @@ module Fog
             @project,
             instance_id,
             ::Google::Apis::SqladminV1beta4::InsertSslCertsRequest.new(
-              :common_name => common_name
+              common_name: common_name
             )
           )
         end

data/lib/fog/google/requests/sql/insert_user.rb

@@ -9,7 +9,7 @@ module Fog
       class Real
         def insert_user(instance_id, user)
           @sql.insert_user(@project, instance_id,
-                           ::Google::Apis::SqladminV1beta4::User.new(user))
+                           ::Google::Apis::SqladminV1beta4::User.new(**user))
         end
       end
 

data/lib/fog/google/requests/sql/restore_instance_backup.rb

@@ -9,10 +9,10 @@ module Fog
       class Real
         def restore_instance_backup(instance_id, backup_run_id)
           request = ::Google::Apis::SqladminV1beta4::RestoreInstancesBackupRequest.new(
-            :restore_backup_context => ::Google::Apis::SqladminV1beta4::RestoreBackupContext.new(
-              :backup_run_id => backup_run_id,
-              :instance_id => instance_id,
-              :kind => "sql#restoreBackupContext"
+            restore_backup_context: ::Google::Apis::SqladminV1beta4::RestoreBackupContext.new(
+              backup_run_id: backup_run_id,
+              instance_id: instance_id,
+              kind: "sql#restoreBackupContext"
             )
           )
           @sql.restore_instance_backup(@project, instance_id, request)

data/lib/fog/google/requests/sql/update_instance.rb

@@ -7,14 +7,14 @@ module Fog
       # @see https://cloud.google.com/sql/docs/mysql/admin-api/v1beta4/instances/update
       class Real
         def update_instance(instance_id, settings_version, tier, settings = {})
-          settings = ::Google::Apis::SqladminV1beta4::Settings.new(settings)
+          settings = ::Google::Apis::SqladminV1beta4::Settings.new(**settings)
           settings.tier = tier
           settings.settings_version = settings_version
 
           @sql.update_instance(
             @project,
             instance_id,
-            ::Google::Apis::SqladminV1beta4::DatabaseInstance.new(:settings => settings)
+            ::Google::Apis::SqladminV1beta4::DatabaseInstance.new(settings: settings)
           )
         end
       end

data/lib/fog/google/shared.rb

@@ -87,10 +87,10 @@ module Fog
       # Applies given options to the client instance
       #
       # @param [Google::Apis::Core::BaseService] service API service client instance
-      # @param [Hash] google_client_options Service client options to apply
-      # @param [Hash] _ignored Rest of the options (for convenience, ignored)
+      # @param [Hash] options (all ignored a.t.m., except :google_client_options)
       # @return [void]
-      def apply_client_options(service, google_client_options: nil, **_ignored)
+      def apply_client_options(service, options = {})
+        google_client_options = options[:google_client_options]
         return if google_client_options.nil? || google_client_options.empty?
         (service.client_options.members & google_client_options.keys).each do |option|
           service.client_options[option] = google_client_options[option]

data/lib/fog/google/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Google
-    VERSION = "1.12.1".freeze
+    VERSION = "1.16.0".freeze
   end
 end

data/lib/fog/storage/google_json/models/directories.rb

@@ -5,7 +5,7 @@ module Fog
         model Fog::Storage::GoogleJSON::Directory
 
         def all(opts = {})
-          data = service.list_buckets(opts).to_h[:items] || []
+          data = service.list_buckets(**opts).to_h[:items] || []
           load(data)
         end
 

data/lib/fog/storage/google_json/models/directory.rb

@@ -52,7 +52,7 @@ module Fog
 
         def save
           requires :key
-          service.put_bucket(key, attributes)
+          service.put_bucket(key, **attributes)
           true
         end
       end

data/lib/fog/storage/google_json/models/file.rb

@@ -45,7 +45,16 @@ module Fog
         end
 
         def body
-          last_modified && (file = collection.get(identity)) ? attributes[:body] ||= file.body : attributes[:body] ||= ""
+          return attributes[:body] if attributes.key?(:body)
+
+          file = collection.get(identity)
+
+          attributes[:body] =
+            if file
+              file.attributes[:body]
+            else
+              ""
+            end
         end
 
         def body=(new_body)
@@ -105,7 +114,7 @@ module Fog
           
           options[:predefined_acl] ||= @predefined_acl
 
-          service.put_object(directory.key, key, body, options)
+          service.put_object(directory.key, key, body, **options)
           self.content_length = Fog::Storage.get_body_size(body)
           self.content_type ||= Fog::Storage.get_content_type(body)
           true

data/lib/fog/storage/google_json/models/files.rb

@@ -33,7 +33,7 @@ module Fog
 
         def get(key, options = {}, &block)
           requires :directory
-          data = service.get_object(directory.key, key, options, &block).to_h
+          data = service.get_object(directory.key, key, **options, &block).to_h
           new(data)
         rescue ::Google::Apis::ClientError => e
           raise e unless e.status_code == 404
@@ -42,12 +42,12 @@ module Fog
 
         def get_https_url(key, expires, options = {})
           requires :directory
-          service.get_object_https_url(directory.key, key, expires, options)
+          service.get_object_https_url(directory.key, key, expires, **options)
         end
 
         def metadata(key, options = {})
           requires :directory
-          data = service.get_object_metadata(directory.key, key, options).to_h
+          data = service.get_object_metadata(directory.key, key, **options).to_h
           new(data)
         rescue ::Google::Apis::ClientError
           nil

data/lib/fog/storage/google_json/real.rb

@@ -156,12 +156,12 @@ DATA
         #   See https://cloud.google.com/storage/docs/access-control/signed-urls-v2
         # @return [String] Signature binary blob
         def iam_signer(string_to_sign)
-          request = {
-            "payload": string_to_sign
-          }
+          request = ::Google::Apis::IamcredentialsV1::SignBlobRequest.new(
+            payload: string_to_sign
+          )
 
           resource = "projects/-/serviceAccounts/#{google_access_id}"
-          response = @iam_service.sign_service_account_blob resource, request, {}
+          response = @iam_service.sign_service_account_blob(resource, request)
 
           return response.signed_blob
         end

data/lib/fog/storage/google_json/requests/copy_object.rb

@@ -15,9 +15,19 @@ module Fog
                         target_bucket, target_object, options = {})
           request_options = ::Google::Apis::RequestOptions.default.merge(options)
 
+          object = ::Google::Apis::StorageV1::Object.new(**options)
+
           @storage_json.copy_object(source_bucket, source_object,
                                     target_bucket, target_object,
-                                    request_options, **options)
+                                    object, options: request_options, **filter_keyword_args(options))
+        end
+
+        private
+
+        def filter_keyword_args(options)
+          method = @storage_json.method(:copy_object)
+          allowed = method.parameters.filter { |param| %i(key keyreq).include?(param[0]) }.map { |param| param[1] }.compact
+          options.filter { |key, _| allowed.include?(key) }
         end
       end
 

data/lib/fog/storage/google_json/requests/get_object.rb

@@ -39,6 +39,8 @@ module Fog
           raise ArgumentError.new("object_name is required") unless object_name
 
           buf = Tempfile.new("fog-google-storage-temp")
+          buf.binmode
+          buf.unlink
 
           # Two requests are necessary, first for metadata, then for content.
           # google-api-ruby-client doesn't allow fetching both metadata and content
@@ -53,18 +55,19 @@ module Fog
             :options => request_options
           }
 
-          object = @storage_json.get_object(bucket_name, object_name, all_opts).to_h
+          object = @storage_json.get_object(bucket_name, object_name, **all_opts).to_h
           @storage_json.get_object(
             bucket_name,
             object_name,
-            all_opts.merge(:download_dest => buf.path)
+            **all_opts.merge(:download_dest => buf)
           )
 
+          buf.seek(0)
+
           if block_given?
             yield buf.read, nil, nil
           else
             object[:body] = buf.read
-            buf.unlink
           end
 
           object

data/lib/fog/storage/google_json/requests/get_object_url.rb

@@ -6,14 +6,14 @@ module Fog
         # Deprecated, redirects to get_object_https_url.rb
         def get_object_url(bucket_name, object_name, expires, options = {})
           Fog::Logger.deprecation("Fog::Storage::Google => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(0..0)})")
-          get_object_https_url(bucket_name, object_name, expires, options)
+          get_object_https_url(bucket_name, object_name, expires, **options)
         end
       end
 
       class Mock # :nodoc:all
         def get_object_url(bucket_name, object_name, expires, options = {})
           Fog::Logger.deprecation("Fog::Storage::Google => #get_object_url is deprecated, use #get_object_https_url instead[/] [light_black](#{caller(0..0)})")
-          get_object_https_url(bucket_name, object_name, expires, options)
+          get_object_https_url(bucket_name, object_name, expires, **options)
         end
       end
     end

data/lib/fog/storage/google_json/requests/list_buckets.rb

@@ -11,10 +11,10 @@ module Fog
                          prefix: nil, projection: nil)
           @storage_json.list_buckets(
             @project,
-            :max_results => max_results,
-            :page_token => page_token,
-            :prefix => prefix,
-            :projection => projection
+            max_results: max_results,
+            page_token: page_token,
+            prefix: prefix,
+            projection: projection
           )
         end
       end

data/lib/fog/storage/google_json/requests/list_objects.rb

@@ -31,7 +31,7 @@ module Fog
 
           @storage_json.list_objects(
             bucket,
-            options.select { |k, _| allowed_opts.include? k }
+            **options.select { |k, _| allowed_opts.include? k }
           )
         end
       end

data/lib/fog/storage/google_json/requests/put_bucket.rb

@@ -19,7 +19,7 @@ module Fog
                        predefined_default_object_acl: nil,
                        **options)
           bucket = ::Google::Apis::StorageV1::Bucket.new(
-            options.merge(:name => bucket_name)
+            **options.merge(:name => bucket_name)
           )
 
           @storage_json.insert_bucket(

data/lib/fog/storage/google_json/requests/put_bucket_acl.rb

@@ -12,7 +12,7 @@ module Fog
           raise ArgumentError.new("bucket_name is required") unless bucket_name
           raise ArgumentError.new("acl is required") unless acl
 
-          acl_update = ::Google::Apis::StorageV1::BucketAccessControl.new(acl)
+          acl_update = ::Google::Apis::StorageV1::BucketAccessControl.new(**acl)
           @storage_json.insert_bucket_access_control(bucket_name, acl_update)
         end
       end

data/lib/fog/storage/google_json/requests/put_object.rb

@@ -51,7 +51,7 @@ module Fog
           data, options = normalize_data(data, options)
 
           object_config = ::Google::Apis::StorageV1::Object.new(
-            options.merge(:name => object_name)
+            **options.merge(:name => object_name)
           )
 
           @storage_json.insert_object(

data/lib/fog/storage/google_json/requests/put_object_acl.rb

@@ -15,7 +15,7 @@ module Fog
           raise ArgumentError.new("object_name is required") unless object_name
           raise ArgumentError.new("acl is required") unless acl
 
-          acl_object = ::Google::Apis::StorageV1::ObjectAccessControl.new(acl)
+          acl_object = ::Google::Apis::StorageV1::ObjectAccessControl.new(**acl)
 
           @storage_json.insert_object_access_control(
             bucket_name, object_name, acl_object

data/lib/fog/storage/google_json/utils.rb

@@ -19,7 +19,11 @@ module Fog
 
         def host_path_query(params, expires)
           params[:headers]["Date"] = expires.to_i
-          params[:path] = URI.encode(params[:path]).gsub("%2F", "/")
+          # implementation from CGI.escape, but without ' ' to  '+' conversion
+          params[:path] = params[:path].b.gsub(/([^a-zA-Z0-9_.\-~]+)/) { |m|
+            '%' + m.unpack('H2' * m.bytesize).join('%').upcase
+          }.gsub("%2F", "/")
+
           query = []
 
           if params[:query]

data/lib/fog/storage/google_xml/models/file.rb

@@ -109,7 +109,7 @@ module Fog
           options["Expires"] = expires if expires
           options.merge!(metadata)
 
-          data = service.put_object(directory.key, key, body, options)
+          data = service.put_object(directory.key, key, body, **options)
           merge_attributes(data.headers.reject { |key, _value| ["Content-Length", "Content-Type"].include?(key) })
           self.content_length = Fog::Storage.get_body_size(body)
           self.content_type ||= Fog::Storage.get_content_type(body)

data/test/helpers/integration_test_helper.rb

@@ -22,8 +22,8 @@ TEST_IMAGE_PROJECT = "debian-cloud".freeze
 TEST_IMAGE_FAMILY = "debian-9".freeze
 
 # XXX This depends on a public image in gs://fog-test-bucket; there may be a better way to do this
-# The image was created like so: https://cloud.google.com/compute/docs/images#export_an_image_to_google_cloud_storage
-TEST_RAW_DISK_SOURCE = "https://storage.googleapis.com/fog-testing-bucket/fog-test-raw-disk-source.image.tar.gz".freeze
+# The image was created like so: https://cloud.google.com/compute/docs/images/export-image
+TEST_RAW_DISK_SOURCE = "https://storage.googleapis.com/fog-test-assets-bucket/fog-test-raw-disk-source.image.tar.gz".freeze
 
 TEST_SQL_TIER = "db-n1-standard-1".freeze
 TEST_SQL_REGION = TEST_REGION

data/test/helpers/test_helper.rb

@@ -17,8 +17,12 @@ end
 # See https://github.com/seattlerb/minitest/#install
 gem "minitest"
 require "minitest/autorun"
-# Custom formatters
-require "minitest/reporters"
-Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
+
+# This is a workaround for RubyMine debugger that doesn't play nice with Minitest::Reporters
+unless ENV['RM_INFO']
+  # Custom formatters to make the tests more legible in CI
+  require "minitest/reporters"
+  Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
+end
 
 require File.join(File.dirname(__FILE__), "../../lib/fog/google")

data/test/integration/compute/core_compute/test_servers.rb

@@ -135,8 +135,8 @@ class TestServers < FogIntegrationTest
   def test_reset_windows_password
     win_disk = @disks.create(
       :name => "fog-test-1-testservers-test-reset-windows-password-2",
-      :source_image => "windows-server-1909-dc-core-v20200310",
-      :size_gb => 32
+      :source_image => "windows-server-2019-dc-v20210713",
+      :size_gb => 64
     )
     server = @factory.create(:disks => [win_disk])
     server.wait_for { ready? }

data/test/integration/compute/core_networking/test_networks.rb

@@ -17,17 +17,6 @@ class TestNetworks < FogIntegrationTest
     super
   end
 
-  def test_valid_range
-    network = @factory.create
-
-    octet = /\d{,2}|1\d{2}|2[0-4]\d|25[0-5]/
-    netmask = /(\d{1}|1[0-9]|2[0-9]|3[0-2])/
-    re = /\A#{octet}\.#{octet}\.#{octet}\.#{octet}\/#{netmask}\z/
-
-    assert_match(re, network.ipv4_range,
-                 "Network range should be valid")
-  end
-
   def test_run_instance
     network = @factory.create
     server = @servers.create(:network_interfaces => [network.get_as_interface_config])

data/test/integration/factories/networks_factory.rb

@@ -2,15 +2,13 @@ require "integration/factories/collection_factory"
 
 class NetworksFactory < CollectionFactory
   def initialize(example)
-    # We cannot have 2 networks with the same IP range so instantiating a
-    # class variable holding a generator, ensuring that the factory gives
-    # us a new network every time it's called
-    @octet_generator = (0..255).each
     super(Fog::Compute[:google].networks, example)
   end
 
   def params
-    { :name => resource_name,
-      :ipv4_range => "172.16.#{@octet_generator.next}.0/24" }
+    {
+      :name => resource_name,
+      :auto_create_subnetworks => true
+    }
   end
 end