Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions lib/OpenStack/MetaAPI.pm
Original file line number Diff line number Diff line change
Expand Up @@ -144,12 +144,12 @@ sub create_vm {
my $server_uid = $server->{id};
die "Failed to create server" unless _looks_valid_id($server_uid);

# we are going to wait for 5 minutes fpr the server
# we are going to wait for 5 minutes for the server
my $wait_time_limit = $opts{wait_time_limit} // $self->create_max_timeout;

my $now = time();
my $max_time = $now + $wait_time_limit;
my $server_is_ready;
my $server_is_ready = 0;

my $server_status;

Expand Down
2 changes: 2 additions & 0 deletions lib/OpenStack/MetaAPI/API/Specs/Compute/v2_0.pm
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ get:
perl_api:
method: server_from_uid
type: getfromid
uid: '{server_id}'
request:
path:
server_id:
Expand Down Expand Up @@ -67,6 +68,7 @@ delete:
perl_api:
method: delete_server_from_uid
type: getfromid
uid: '{server_id}'
request:
path:
server_id:
Expand Down
1 change: 0 additions & 1 deletion lib/OpenStack/MetaAPI/Routes.pm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ use warnings;
use Moo;

use OpenStack::MetaAPI::API ();
use YAML::XS;

use OpenStack::MetaAPI::Helpers::DataAsYaml;

Expand Down
59 changes: 59 additions & 0 deletions t/specs-integrity.t
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
#!/usr/bin/env perl

use strict;
use warnings;

use Test::More;

use OpenStack::MetaAPI::Helpers::DataAsYaml;

# Verify all spec classes load and have valid data for their declared types.
# A getfromid type MUST have a uid field; a listable type MUST have a listable_key.
# This catches regressions like missing uid in Compute v2_0 specs.

my @spec_classes = qw(
OpenStack::MetaAPI::API::Specs::Compute::v2_0
OpenStack::MetaAPI::API::Specs::Compute::v2_1
OpenStack::MetaAPI::API::Specs::Network::v2
);

for my $class (@spec_classes) {
subtest "specs integrity: $class" => sub {
(my $file = $class) =~ s{::}{/}g;
$file .= '.pm';
eval { require $file; 1 } or do {
fail "Failed to load $class: $@";
return;
};

my $obj = $class->new;
ok $obj, "instantiated $class";

my $specs = $obj->specs;
ok ref $specs eq 'HASH', "specs returns a hashref";

for my $method (sort keys %$specs) {
next unless ref $specs->{$method} eq 'HASH';
for my $route (sort keys %{$specs->{$method}}) {
my $rule = $specs->{$method}->{$route};
next unless ref $rule && ref $rule->{perl_api};

my $api = $rule->{perl_api};
my $label = "$method $route ($api->{method})";

ok defined $api->{method}, "$label has method";
ok defined $api->{type}, "$label has type";

if ($api->{type} eq 'getfromid') {
ok defined $api->{uid},
"$label: getfromid type has uid field";
} elsif ($api->{type} eq 'listable') {
ok defined $api->{listable_key},
"$label: listable type has listable_key field";
}
}
}
};
}

done_testing;