Skip to content

Commit

Permalink
[UPC#441] pass the request and check args
Browse files Browse the repository at this point in the history
  • Loading branch information
frankiejol committed Nov 27, 2017
1 parent a177a1d commit 3d4b111
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 3 deletions.
2 changes: 1 addition & 1 deletion lib/Ravada.pm
Original file line number Diff line number Diff line change
Expand Up @@ -1716,7 +1716,7 @@ sub _cmd_open_iptables {
sub _cmd_clone($self, $request) {
my $domain = Ravada::Domain->open($request->args('id_domain'));

my @args = ();
my @args = ( request => $request);
push @args, ( memory => $request->args('memory'))
if $request->defined_arg('memory');

Expand Down
13 changes: 11 additions & 2 deletions lib/Ravada/Domain.pm
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,8 @@ Returns: Domain object read only
=cut

sub open($class, $id) {
confess "Missing id" if !defined $id;

my $self = {};

if (ref($class)) {
Expand Down Expand Up @@ -1007,6 +1009,7 @@ sub clone {

my @args_copy = ();
push @args_copy, ( memory => $args{memory} ) if $args{memory};
push @args_copy, ( request => $args{request} ) if $args{request};

my $clone = $self->_vm->create_domain(
name => $name
Expand All @@ -1023,13 +1026,18 @@ sub _copy_clone($self, %args) {
my $name = delete $args{name} or confess "ERROR: Missing name";
my $user = delete $args{user} or confess "ERROR: Missing user";
my $memory = delete $args{memory};
my $request = delete $args{request};

confess "ERROR: Unknown arguments ".join(",",sort keys %args)
if keys %args;

my $base = Ravada::Domain->open($self->id_base);

my @copy_arg = ( memory => $memory ) if $memory;
my @copy_arg;
push @copy_arg, ( memory => $memory ) if $memory;

$request->status("working","Copying domain ".$self->name
." to $name");
my $copy = $self->_vm->create_domain(
name => $name
,id_base => $base->id
Expand Down Expand Up @@ -1690,9 +1698,10 @@ sub _pre_clone($self,%args) {
my $name = delete $args{name};
my $user = delete $args{user};
my $memory = delete $args{memory};
delete $args{request};

confess "ERROR: Missing clone name " if !$name;
confess "ERROR: Invalid name '$name'" if $name !~ /^[a-z][a-z0-9_-]+$/;
confess "ERROR: Invalid name '$name'" if $name !~ /^[a-z0-9_-]+$/i;

confess "ERROR: Missing user owner of new domain" if !$user;

Expand Down

0 comments on commit 3d4b111

Please sign in to comment.