Skip to content

Instance attr fix #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
toritori0318 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Instance attr fix #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
476c01b
add instance attr
toritori0318 Jun 19, 2011
7be076a
newversion test fix
toritori0318 Jun 19, 2011
b8a50e1
bugfix: When a Tag Name is not defined
toritori0318 Jul 20, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 21 additions & 4 deletions lib/Net/Amazon/EC2.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1714,7 +1714,8 @@ sub describe_instances {
my $group_sets;
foreach my $group_arr (@{$reservation_set->{groupSet}{item}}) {
my $group = Net::Amazon::EC2::GroupSet->new(
group_id => $group_arr->{groupId},
group_id => $group_arr->{groupId},
group_name => $group_arr->{groupName},
);
push @$group_sets, $group;
}
Expand Down Expand Up @@ -1781,12 +1782,22 @@ sub describe_instances {

my $tag_sets;
foreach my $tag_arr (@{$instance_elem->{tagSet}{item}}) {
my $key = $tag_arr->{key};
my $value = (ref $tag_arr->{value} eq '') ? $tag_arr->{value} : '';
my $tag = Net::Amazon::EC2::TagSet->new(
key => $tag_arr->{key},
value => $tag_arr->{value},
key => $key,
value => $value,
);
push @$tag_sets, $tag;
}
my $group_sets_instance;
foreach my $group_arr (@{$instance_elem->{groupSet}{item}}) {
my $group = Net::Amazon::EC2::GroupSet->new(
group_id => $group_arr->{groupId},
group_name => $group_arr->{groupName},
);
push @$group_sets_instance, $group;
}

my $running_instance = Net::Amazon::EC2::RunningInstances->new(
ami_launch_index => $instance_elem->{amiLaunchIndex},
Expand Down Expand Up @@ -1814,6 +1825,11 @@ sub describe_instances {
block_device_mapping => $block_device_mappings,
state_reason => $state_reason,
tag_set => $tag_sets,
group_set => $group_sets_instance,
instance_lifecycle => $instance_elem->{instanceLifecycle},
spot_instance_request_id => $instance_elem->{spotInstanceRequestId},
virtualization_type => $instance_elem->{virtualizationType},
hypervisor => $instance_elem->{hypervisor},
);

if ($product_codes) {
Expand Down Expand Up @@ -3694,7 +3710,8 @@ sub run_instances {
my $group_sets;
foreach my $group_arr (@{$xml->{groupSet}{item}}) {
my $group = Net::Amazon::EC2::GroupSet->new(
group_id => $group_arr->{groupId},
group_id => $group_arr->{groupId},
group_name => $group_arr->{groupName},
);
push @$group_sets, $group;
}
Expand Down
9 changes: 7 additions & 2 deletions lib/Net/Amazon/EC2/GroupSet.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,14 @@ A class containing information about a group.

The ID of the group.

=item group_name

The Name of the group.

=cut

has 'group_id' => ( is => 'ro', isa => 'Str', required => 1 );
has 'group_id' => ( is => 'ro', isa => 'Str', required => 1 );
has 'group_name' => ( is => 'ro', isa => 'Str', required => 0 );

__PACKAGE__->meta->make_immutable();

Expand All @@ -35,4 +40,4 @@ under the same terms as Perl itself.
=cut

no Moose;
1;
1;
31 changes: 30 additions & 1 deletion lib/Net/Amazon/EC2/RunningInstances.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,6 +130,26 @@ An array ref of Net::Amazon::EC2::TagSet objects.

The instance name from tags.

=item group_set (optional)

An array ref of Net::Amazon::EC2::GroupSet objects.

=item instance_lifecycle (optional)

Whether this is a Spot Instance.

=item spot_instance_request_id (optional)

ID of the Spot Instance request.

=item virtualization_type (optional)

Virtualization type of the instance.

=item hypervisor (optional)

Hypervisor type of the instance.

=cut

has 'ami_launch_index' => ( is => 'ro', isa => 'Str', required => 0 );
Expand Down Expand Up @@ -177,7 +197,16 @@ has 'name' => (
return $name->{value} || '';
},
);

has 'group_set' => (
is => 'ro',
isa => 'ArrayRef[Net::Amazon::EC2::GroupSet]',
required => 0,
auto_deref => 1,
);
has 'instance_lifecycle' => ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
has 'spot_instance_request_id' => ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
has 'virtualization_type' => ( is => 'ro', isa => 'Maybe[Str]', required => 0 );
has 'hypervisor' => ( is => 'ro', isa => 'Maybe[Str]', required => 0 );

__PACKAGE__->meta->make_immutable();

Expand Down
2 changes: 1 addition & 1 deletion t/02_live.t
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ my $run_result = $ec2->run_instances(
InstanceType => 'm1.small'
);
isa_ok($run_result, 'Net::Amazon::EC2::ReservationInfo');
ok($run_result->group_set->[0]->group_id eq "test_group", "Checking for running instance");
ok($run_result->group_set->[0]->group_name eq "test_group", "Checking for running instance");
my $instance_id = $run_result->instances_set->[0]->instance_id;

# describe_instances
Expand Down