Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Projets publics
Ravada-Mirror
Commits
97966d56
Commit
97966d56
authored
Jan 23, 2018
by
Francesc Guasch
Browse files
[#518] store domain info
parent
fd967a86
Changes
6
Hide whitespace changes
Inline
Side-by-side
lib/Ravada.pm
View file @
97966d56
...
...
@@ -776,6 +776,7 @@ sub _upgrade_tables {
$self
->
_upgrade_table
('
domains
','
status
','
varchar(32) DEFAULT "shutdown"
');
$self
->
_upgrade_table
('
domains
','
display
','
varchar(128) DEFAULT NULL
');
$self
->
_upgrade_table
('
domains
','
info
','
varchar(255) DEFAULT NULL
');
$self
->
_upgrade_table
('
domains_network
','
allowed
','
int not null default 1
');
...
...
lib/Ravada/Domain.pm
View file @
97966d56
...
...
@@ -169,6 +169,8 @@ after 'screenshot' => \&_post_screenshot;
after
'
_select_domain_db
'
=>
\
&_post_select_domain_db
;
around
'
get_info
'
=>
\
&_around_get_info
;
##################################################
#
...
...
@@ -440,6 +442,15 @@ sub _around_display($orig,$self,$user) {
$self
->
_data
(
display
=>
$display
);
return
$display
;
}
sub
_around_get_info
($orig, $self) {
my
$info
=
$self
->
$orig
();
if
(
ref
(
$self
)
=~
/^Ravada::Domain/
)
{
$self
->
_data
(
info
=>
encode_json
(
$info
));
}
return
$info
;
}
##################################################################################3
sub
_init_connector
{
...
...
@@ -1291,6 +1302,7 @@ sub _post_start {
);
}
$self
->
get_info
();
}
sub
_add_iptable
{
...
...
lib/Ravada/Front/Domain.pm
View file @
97966d56
...
...
@@ -10,6 +10,7 @@ Ravada::Front::Domain - Frontent domain information for Ravada
=cut
use
Carp
qw(cluck confess croak)
;
use
JSON::
XS
;
use
Moose
;
no
warnings
"
experimental::signatures
";
...
...
@@ -45,7 +46,12 @@ sub display($self, $user) {
}
sub
force_shutdown
{
confess
"
TODO
"
}
sub
get_info
{
confess
"
TODO
"
}
sub
get_info
($self) {
my
$info
=
$self
->
_data
('
info
');
return
{}
if
!
$info
;
return
decode_json
(
$info
);
}
sub
hybernate
{
confess
"
TODO
"
}
sub
is_active
($self) {
...
...
lib/Ravada/VM.pm
View file @
97966d56
...
...
@@ -149,6 +149,8 @@ sub _around_create_domain {
my
$user
=
Ravada::Auth::
SQL
->
search_by_id
(
$id_owner
);
$domain
->
is_volatile
(
1
)
if
$user
->
is_temporary
();
$domain
->
get_info
();
return
$domain
;
}
...
...
sql/mysql/domains.sql
View file @
97966d56
...
...
@@ -17,6 +17,7 @@ CREATE TABLE `domains` (
`start_time`
int
not
null
default
0
,
`status`
varchar
(
32
)
default
'shutdown'
,
`display`
varchar
(
128
)
default
NULL
,
`info`
varchar
(
255
)
default
NULL
,
PRIMARY
KEY
(
`id`
),
UNIQUE
KEY
`id_base`
(
`id_base`
,
`name`
),
UNIQUE
KEY
`name`
(
`name`
)
...
...
sql/sqlite/domains.sql
View file @
97966d56
...
...
@@ -17,6 +17,7 @@ CREATE TABLE `domains` (
,
`start_time`
integer
not
null
default
0
,
`status`
varchar
(
32
)
default
'shutdown'
,
`display`
varchar
(
128
)
default
NULL
,
`info`
varchar
(
255
)
default
NULL
,
UNIQUE
(
`id_base`
,
`name`
)
,
UNIQUE
(
`name`
)
);
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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