diff --git a/lib/fog/openstack/models/network/subnet.rb b/lib/fog/openstack/models/network/subnet.rb index 5bf52db77..29dab7b54 100644 --- a/lib/fog/openstack/models/network/subnet.rb +++ b/lib/fog/openstack/models/network/subnet.rb @@ -27,7 +27,7 @@ module Fog end def update - requires :id, :network_id, :cidr, :ip_version + requires :id merge_attributes(service.update_subnet(self.id, self.attributes).body['subnet']) self diff --git a/lib/fog/openstack/requests/network/create_subnet.rb b/lib/fog/openstack/requests/network/create_subnet.rb index db52ae3fd..aad7cef07 100644 --- a/lib/fog/openstack/requests/network/create_subnet.rb +++ b/lib/fog/openstack/requests/network/create_subnet.rb @@ -14,7 +14,7 @@ module Fog vanilla_options = [:name, :gateway_ip, :allocation_pools, :dns_nameservers, :host_routes, :enable_dhcp, :tenant_id] - vanilla_options.reject{ |o| options[o].nil? unless o == :gateway_ip }.each do |key| + vanilla_options.select{ |o| options.key?(o) }.each do |key| data['subnet'][key] = options[key] end diff --git a/lib/fog/openstack/requests/network/update_subnet.rb b/lib/fog/openstack/requests/network/update_subnet.rb index 34a765188..d0e0a9c46 100644 --- a/lib/fog/openstack/requests/network/update_subnet.rb +++ b/lib/fog/openstack/requests/network/update_subnet.rb @@ -5,8 +5,8 @@ module Fog def update_subnet(subnet_id, options = {}) data = { 'subnet' => {} } - vanilla_options = [:name, :gateway_ip, :dns_nameservers, - :host_routes, :enable_dhcp] + vanilla_options = [:name, :gateway_ip, :allocation_pools, + :dns_nameservers, :host_routes, :enable_dhcp] vanilla_options.select{ |o| options.key?(o) }.each do |key| data['subnet'][key] = options[key] end @@ -24,11 +24,12 @@ module Fog def update_subnet(subnet_id, options = {}) response = Excon::Response.new if subnet = list_subnets.body['subnets'].find { |_| _['id'] == subnet_id } - subnet['name'] = options[:name] - subnet['gateway_ip'] = options[:gateway_ip] - subnet['dns_nameservers'] = options[:dns_nameservers] - subnet['host_routes'] = options[:host_routes] - subnet['enable_dhcp'] = options[:enable_dhcp] + subnet['name'] = options[:name] + subnet['gateway_ip'] = options[:gateway_ip] + subnet['dns_nameservers'] = options[:dns_nameservers] + subnet['host_routes'] = options[:host_routes] + subnet['allocation_pools'] = options[:allocation_pools] + subnet['enable_dhcp'] = options[:enable_dhcp] response.body = { 'subnet' => subnet } response.status = 200 response