kotovalexarian-likes-github/fog--fog-aws
1
0
Fork 0
mirror of https://github.com/fog/fog-aws.git synced 2022-11-09 13:50:52 -05:00
Code Releases Activity

modify mount target security groups

Browse source
This commit is contained in:
Eugene Howe 2016-10-07 09:19:28 -04:00
parent 95284ad4b8
commit f620c87bef
11 changed files with 118 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/fog/aws/efs.rb
View file

@ -26,6 +26,7 @@ module Fog
request :describe_file_systems
request :describe_mount_target_security_groups
request :describe_mount_targets
request :modify_mount_target_security_groups
class Mock
def self.data

9
lib/fog/aws/models/efs/file_system.rb
View file

@ -25,19 +25,16 @@ module Fog
def destroy
requires :identity
service.delete_file_system(:id => self.identity)
service.delete_file_system(self.identity)
true
end
def save
params = {
:creation_token => self.creation_token || Fog::Mock.random_hex(32)
}
params = {}
params.merge!(:performance_mode => self.performance_mode) if self.performance_mode
merge_attributes(service.create_file_system(:creation_token => self.creation_token).body)
merge_attributes(service.create_file_system(self.creation_token || Fog::Mock.random_hex(32), params).body)
end
end
end

26
lib/fog/aws/models/efs/mount_target.rb
View file

@ -2,8 +2,6 @@ module Fog
module AWS
class EFS
class MountTarget < Fog::Model
attr_accessor :security_groups
identity :id, :aliases => "MountTargetId"
attribute :file_system_id, :aliases => "FileSystemId"
@ -19,7 +17,7 @@ module Fog
def destroy
requires :identity
service.delete_mount_target(:id => self.identity)
service.delete_mount_target(self.identity)
true
end
@ -29,21 +27,31 @@ module Fog
end
def security_groups
if persisted?
requires :identity
service.describe_mount_target_security_groups(self.identity).body["SecurityGroups"]
else
@security_groups || []
end
end
def security_groups=(security_groups)
if persisted?
requires :identity
service.modify_mount_target_security_groups(self.identity, security_groups)
else
@security_groups = security_groups
end
security_groups
end
def save
requires :file_system_id, :subnet_id
params = {
:file_system_id => self.file_system_id,
:subnet_id => self.subnet_id
}
params = {}
params.merge!('IpAddress' => self.ip_address) if self.ip_address
params.merge!('SecurityGroups' => @security_groups) if @security_groups
merge_attributes(service.create_mount_target(params).body)
merge_attributes(service.create_mount_target(self.file_system_id, self.subnet_id, params).body)
end
end
end

10
lib/fog/aws/requests/efs/create_file_system.rb
View file

@ -10,25 +10,25 @@ module Fog
# ==== Returns
# * response<~Excon::Response>
# * body<~Hash>
def create_file_system(options={})
def create_file_system(creation_token, options={})
request({
:path => "file-systems",
:method => 'POST',
:expects => 201,
'CreationToken' => options[:creation_token],
'PerformanceMode' => options[:performance_mode] || 'generalPurpose'
'CreationToken' => creation_token,
'PerformanceMode' => options[:peformance_mode] || 'generalPurpose'
})
end
end
class Mock
def create_file_system(options={})
def create_file_system(creation_token, options={})
response = Excon::Response.new
id = "fs-#{Fog::Mock.random_letters(8)}"
file_system = {
"OwnerId" => Fog::AWS::Mock.owner_id,
"CreationToken" => options[:creation_token],
"CreationToken" => creation_token,
"PerformanceMode" => options[:performance_mode] || "generalPurpose",
"FileSystemId" => id,
"CreationTime" => Time.now.to_i.to_f,

13
lib/fog/aws/requests/efs/create_mount_target.rb
View file

@ -12,22 +12,21 @@ module Fog
# ==== Returns
# * response<~Excon::Response>
# * body<~Hash>
def create_mount_target(options={})
def create_mount_target(file_system_id, subnet_id, options={})
request({
:path => "mount-targets",
:method => "POST",
'FileSystemId' => options[:file_system_id],
'SubnetId' => options[:subnet_id]
'FileSystemId' => file_system_id,
'SubnetId' => subnet_id
}.merge(options))
end
end
class Mock
def create_mount_target(options={})
def create_mount_target(file_system_id, subnet_id, options={})
response = Excon::Response.new
file_system_id = options[:file_system_id]
subnet_id = options[:subnet_id]
security_groups = options["SecurityGroups"] || []
default_security_group = Fog::Compute[:aws].security_groups.detect { |sg| sg.description == "default group" }
security_groups = options["SecurityGroups"] || [default_security_group.group_id]
unless file_system = self.data[:file_systems][file_system_id]
raise Fog::AWS::EFS::NotFound.new("invalid file system ID: #{file_system_id}")

9
lib/fog/aws/requests/efs/delete_file_system.rb
View file

@ -10,22 +10,17 @@ module Fog
# * response<~Excon::Response>
# * body - Empty
# * status - 204
def delete_file_system(options={})
id = options.delete(:id)
def delete_file_system(id)
request({
:path => "file-systems/#{id}",
:method => 'DELETE',
:expects => 204,
'CreationToken' => options[:creation_token],
'PerformanceMode' => options[:performance_mode] || 'generalPurpose'
})
end
end
class Mock
def delete_file_system(options={})
id = options.delete(:id)
def delete_file_system(id)
unless file_system = self.data[:file_systems][id]
raise Fog::AWS::EFS::NotFound.new("invalid file system ID: #{id}")
end

6
lib/fog/aws/requests/efs/delete_mount_target.rb
View file

@ -10,8 +10,7 @@ module Fog
# * response<~Excon::Response>
# * body - Empty
# * status - 204
def delete_mount_target(options={})
id = options.delete(:id)
def delete_mount_target(id)
request(
:path => "mount-targets/#{id}",
:method => "DELETE",
@ -21,8 +20,7 @@ module Fog
end
class Mock
def delete_mount_target(options={})
id = options.delete(:id)
def delete_mount_target(id)
response = Excon::Response.new
unless self.data[:mount_targets][id]

35
lib/fog/aws/requests/efs/modify_mount_target_security_groups.rb Normal file
View file

@ -0,0 +1,35 @@
module Fog
module AWS
class EFS
class Real
def modify_mount_target_security_groups(id, security_groups)
request({
:path => "mount-targets/#{id}/security-groups",
:method => "PUT",
:expects => 204,
'SecurityGroups' => security_groups
})
end
end
class Mock
def modify_mount_target_security_groups(id, security_groups)
response = Excon::Response.new
unless self.data[:mount_targets][id]
raise Fog::AWS::EFS::NotFound.new("invalid mount target ID: #{id}")
end
security_groups.each do |sg|
raise Fog::AWS::EFS::NotFound.new("invalid security group ID: #{sg}") unless Fog::Compute[:aws].data[:security_groups].values.detect { |sgd| sgd["groupId"] == sg }
end
self.data[:security_groups][id] = security_groups
response.status = 204
response
end
end
end
end
end

5
tests/models/efs/mount_target_tests.rb
View file

@ -28,6 +28,11 @@ Shindo.tests("AWS::EFS | mount target", ["aws", "efs"]) do
tests("#security_groups") do
returns([security_group.group_id]) { @instance.security_groups }
end
tests("#security_groups=") do
@instance.security_groups = []
returns([]) { @instance.security_groups }
end
end
@file_system.wait_for { number_of_mount_targets == 0 }

59
tests/requests/efs/file_system_tests.rb
View file

@ -4,8 +4,8 @@ Shindo.tests('AWS::EFS | file systems', ['aws', 'efs']) do
@creation_token = "fogtest#{suffix}"
tests('success') do
tests("#create_file_system").formats(AWS::EFS::Formats::FILE_SYSTEM_FORMAT) do
result = Fog::AWS[:efs].create_file_system(:creation_token => @creation_token).body
tests("#create_file_system('#{@creation_token}')").formats(AWS::EFS::Formats::FILE_SYSTEM_FORMAT) do
result = Fog::AWS[:efs].create_file_system(@creation_token).body
returns('creating') { result['LifeCycleState'] }
result
end
@ -29,12 +29,15 @@ Shindo.tests('AWS::EFS | file systems', ['aws', 'efs']) do
if Fog.mocking?
vpc = Fog::Compute[:aws].vpcs.create(:cidr_block => "10.0.0.0/16")
Fog::Compute[:aws].subnets.create(
subnet = Fog::Compute[:aws].subnets.create(
:vpc_id => vpc.id,
:cidr_block => "10.0.1.0/24"
)
default_security_group = Fog::Compute[:aws].security_groups.detect { |sg| sg.description == 'default group' }
else
vpc = Fog::Compute[:aws].vpcs.first
subnet = vpc.subnets.first
default_security_group = Fog::Compute[:aws].security_groups.detect { |sg| sg.description == 'default VPC security group' }
end
security_group = Fog::Compute[:aws].security_groups.create(
@ -43,21 +46,19 @@ Shindo.tests('AWS::EFS | file systems', ['aws', 'efs']) do
:description => "fog#{suffix}"
)
subnet_id = vpc.subnets.first.identity
raises(Fog::AWS::EFS::InvalidSubnet, "invalid subnet ID: foobar#{suffix}") do
Fog::AWS[:efs].create_mount_target(:file_system_id => file_system_id, :subnet_id => "foobar#{suffix}")
Fog::AWS[:efs].create_mount_target(file_system_id, "foobar#{suffix}")
end
raises(Fog::AWS::EFS::NotFound, "invalid file system ID: foobar#{suffix}") do
Fog::AWS[:efs].create_mount_target(:file_system_id => "foobar#{suffix}", :subnet_id => subnet_id)
Fog::AWS[:efs].create_mount_target("foobar#{suffix}", subnet.identity)
end
if Fog.mocking?
tests("#create_mount_target") do
Fog::AWS[:efs].data[:file_systems][file_system_id]["LifeCycleState"] = 'creating'
raises(Fog::AWS::EFS::IncorrectFileSystemLifeCycleState) do
Fog::AWS[:efs].create_mount_target(:file_system_id => file_system_id, :subnet_id => subnet_id)
Fog::AWS[:efs].create_mount_target(file_system_id, subnet.identity)
end
Fog::AWS[:efs].data[:file_systems][file_system_id]["LifeCycleState"] = 'available'
@ -65,19 +66,11 @@ Shindo.tests('AWS::EFS | file systems', ['aws', 'efs']) do
end
raises(Fog::AWS::EFS::NotFound, "invalid security group ID: foobar#{suffix}") do
Fog::AWS[:efs].create_mount_target(
:file_system_id => file_system_id,
:subnet_id => subnet_id,
'SecurityGroups' => ["foobar#{suffix}"]
)
Fog::AWS[:efs].create_mount_target(file_system_id, subnet.identity, 'SecurityGroups' => ["foobar#{suffix}"])
end
tests("#create_mount_target(file_system_id: #{file_system_id}, subnet_id: #{subnet_id})").formats(AWS::EFS::Formats::MOUNT_TARGET_FORMAT) do
Fog::AWS[:efs].create_mount_target(
:file_system_id => file_system_id,
:subnet_id => subnet_id,
'SecurityGroups' => [security_group.group_id]
).body
tests("#create_mount_target(#{file_system_id}, #{subnet.identity})").formats(AWS::EFS::Formats::MOUNT_TARGET_FORMAT) do
Fog::AWS[:efs].create_mount_target(file_system_id, subnet.identity).body
end
tests("#describe_mount_targets(file_system_id: #{file_system_id})").formats(AWS::EFS::Formats::DESCRIBE_MOUNT_TARGETS_RESULT) do
@ -86,6 +79,24 @@ Shindo.tests('AWS::EFS | file systems', ['aws', 'efs']) do
mount_target_id = Fog::AWS[:efs].describe_mount_targets(:file_system_id => file_system_id).body["MountTargets"].first["MountTargetId"]
tests("#describe_mount_target_security_groups(#{mount_target_id})").formats(AWS::EFS::Formats::DESCRIBE_MOUNT_TARGET_SECURITY_GROUPS_FORMAT) do
result = Fog::AWS[:efs].describe_mount_target_security_groups(mount_target_id).body
returns([default_security_group.group_id]) { result["SecurityGroups"] }
result
end
tests("#modify_mount_target_security_groups(#{mount_target_id}, [#{security_group.group_id}])") do
returns(204) do
Fog::AWS[:efs].modify_mount_target_security_groups(mount_target_id, [security_group.group_id]).status
end
end
tests("#describe_mount_target_security_groups(#{mount_target_id})").formats(AWS::EFS::Formats::DESCRIBE_MOUNT_TARGET_SECURITY_GROUPS_FORMAT) do
result = Fog::AWS[:efs].describe_mount_target_security_groups(mount_target_id).body
returns([security_group.group_id]) { result["SecurityGroups"] }
result
end
tests("#describe_mount_targets(id: #{mount_target_id})").formats(AWS::EFS::Formats::DESCRIBE_MOUNT_TARGETS_RESULT) do
Fog::AWS[:efs].describe_mount_targets(:id => mount_target_id).body
end
@ -95,12 +106,12 @@ Shindo.tests('AWS::EFS | file systems', ['aws', 'efs']) do
end
raises(Fog::AWS::EFS::NotFound, "invalid mount target id: foobar#{suffix}") do
Fog::AWS[:efs].delete_mount_target(:id => "foobar#{suffix}")
Fog::AWS[:efs].delete_mount_target("foobar#{suffix}")
end
tests("#delete_mount_target(id: #{mount_target_id})") do
returns(true) do
result = Fog::AWS[:efs].delete_mount_target(:id => mount_target_id)
result = Fog::AWS[:efs].delete_mount_target(mount_target_id)
result.body.empty?
end
end
@ -110,18 +121,18 @@ Shindo.tests('AWS::EFS | file systems', ['aws', 'efs']) do
if Fog.mocking?
Fog::AWS[:efs].data[:file_systems][file_system_id]["NumberOfMountTargets"] = 1
raises(Fog::AWS::EFS::FileSystemInUse) do
Fog::AWS[:efs].delete_file_system(:id => file_system_id)
Fog::AWS[:efs].delete_file_system(file_system_id)
end
Fog::AWS[:efs].data[:file_systems][file_system_id]["NumberOfMountTargets"] = 0
end
raises(Fog::AWS::EFS::NotFound, "invalid file system ID: foobar#{suffix}") do
Fog::AWS[:efs].delete_file_system(:id => "foobar#{suffix}")
Fog::AWS[:efs].delete_file_system("foobar#{suffix}")
end
tests("#delete_file_system") do
returns(true) do
result = Fog::AWS[:efs].delete_file_system(:id => file_system_id)
result = Fog::AWS[:efs].delete_file_system(file_system_id)
result.body.empty?
end
end

4
tests/requests/efs/helper.rb
View file

@ -33,6 +33,10 @@ class AWS
DESCRIBE_MOUNT_TARGETS_RESULT = {
"MountTargets" => [MOUNT_TARGET_FORMAT]
}
DESCRIBE_MOUNT_TARGET_SECURITY_GROUPS_FORMAT = {
"SecurityGroups" => Array
}
end
end
end