Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Projets publics
Ravada-Mirror
Commits
6ad7bf4e
Commit
6ad7bf4e
authored
Sep 14, 2016
by
Francesc Guasch
Browse files
get domain display from frontend
parent
8a336af5
Changes
3
Show whitespace changes
Inline
Side-by-side
lib/Ravada.pm
View file @
6ad7bf4e
...
...
@@ -435,7 +435,7 @@ sub process_requests {
my
$req
=
Ravada::
Request
->
open
(
$id
);
warn
"
executing request
"
.
$req
.
"
"
.
Dumper
(
$req
)
if
$DEBUG
||
$debug
;
$self
->
_execute
(
$req
);
warn
$req
->
status
()
if
$DEBUG
;
warn
"
status:
"
.
$req
->
status
()
if
$DEBUG
||
$debug
;
}
$sth
->
finish
;
}
...
...
@@ -480,7 +480,12 @@ sub _cmd_domdisplay {
my
$name
=
$request
->
args
('
name
');
confess
"
Unknown name for request
"
.
Dumper
(
$request
)
if
!
$name
;
my
$domain
=
$self
->
search_domain
(
$request
->
args
->
{
name
});
return
$domain
->
display
;
my
$display
=
$domain
->
display
;
$request
->
result
({
display
=>
$display
});
$request
->
status
('
done
');
}
sub
_cmd_create
{
...
...
lib/Ravada/Front.pm
View file @
6ad7bf4e
...
...
@@ -217,10 +217,19 @@ sub domdisplay {
my
$name
=
shift
;
my
$req
=
Ravada::
Request
->
domdisplay
(
$name
);
$self
->
wait_request
(
$req
,
2
);
$self
->
wait_request
(
$req
,
10
);
return
$req
->
result
();
return
if
$req
->
status
()
ne
'
done
';
my
$result
=
$req
->
result
();
return
$result
->
{
display
};
}
sub
start_domain
{
my
$self
=
shift
;
my
$name
=
shift
;
return
Ravada::
Request
->
start_domain
(
$name
);
}
1
;
t/front/20_create_domain.t
View file @
6ad7bf4e
...
...
@@ -127,5 +127,13 @@ for my $vm_name ('kvm','lxc') {
ok
(
$domain
&&
$domain
->
{
name
}
&&
$domain
->
{
name
}
eq
$name
,"
Expecting domain name
$name
, got
"
.
(
$domain
->
{
name
}
or
'
<UNDEF>
'));
$RVD_FRONT
->
start_domain
(
$name
);
$RVD_FRONT
->
wait_request
(
$req
,
10
);
ok
(
$req
->
status
('
done
'),"
Request
"
.
$req
->
status
);
my
$display
=
$RVD_FRONT
->
domdisplay
(
$name
);
ok
(
$display
,"
No display for domain
$name
found. Is it active ?
");
ok
(
$display
=~
m{\w+://.*?:\d+}
,"
Expecting display a URL, it is '
$display
'
");
}
done_testing
();
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment