Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
P
pve-manager
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
pve-manager
Commits
72a74d5d
Commit
72a74d5d
authored
Oct 10, 2011
by
Dietmar Maurer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
use new asynchronous API for qemu
parent
634b38d0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
11 additions
and
20 deletions
+11
-20
OpenVZ.pm
PVE/API2/OpenVZ.pm
+0
-2
Makefile
www/manager/Makefile
+1
-0
VNCConsole.js
www/manager/VNCConsole.js
+5
-13
StatusView.js
www/manager/qemu/StatusView.js
+1
-1
Summary.js
www/manager/qemu/Summary.js
+4
-4
No files found.
PVE/API2/OpenVZ.pm
View file @
72a74d5d
...
@@ -120,8 +120,6 @@ __PACKAGE__->register_method({
...
@@ -120,8 +120,6 @@ __PACKAGE__->register_method({
my
$node
=
extract_param
(
$param
,
'
node
');
my
$node
=
extract_param
(
$param
,
'
node
');
# fixme: fork worker?
my
$vmid
=
extract_param
(
$param
,
'
vmid
');
my
$vmid
=
extract_param
(
$param
,
'
vmid
');
my
$password
=
extract_param
(
$param
,
'
password
');
my
$password
=
extract_param
(
$param
,
'
password
');
...
...
www/manager/Makefile
View file @
72a74d5d
...
@@ -4,6 +4,7 @@ JSSRC= \
...
@@ -4,6 +4,7 @@ JSSRC= \
Utils.js
\
Utils.js
\
Parser.js
\
Parser.js
\
StateProvider.js
\
StateProvider.js
\
qemu/SendKeyMenu.js
\
VNCConsole.js
\
VNCConsole.js
\
data/TimezoneStore.js
\
data/TimezoneStore.js
\
data/reader/JsonObject.js
\
data/reader/JsonObject.js
\
...
...
www/manager/VNCConsole.js
View file @
72a74d5d
...
@@ -211,9 +211,8 @@ Ext.define('PVE.KVMConsole', {
...
@@ -211,9 +211,8 @@ Ext.define('PVE.KVMConsole', {
var
vm_command
=
function
(
cmd
,
reload_applet
)
{
var
vm_command
=
function
(
cmd
,
reload_applet
)
{
PVE
.
Utils
.
API2Request
({
PVE
.
Utils
.
API2Request
({
params
:
{
command
:
cmd
},
url
:
'
/nodes/
'
+
me
.
nodename
+
'
/qemu/
'
+
me
.
vmid
+
"
/status/
"
+
cmd
,
url
:
'
/nodes/
'
+
me
.
nodename
+
'
/qemu/
'
+
me
.
vmid
+
"
/status
"
,
method
:
'
POST
'
,
method
:
'
PUT
'
,
waitMsgTarget
:
me
,
waitMsgTarget
:
me
,
failure
:
function
(
response
,
opts
)
{
failure
:
function
(
response
,
opts
)
{
Ext
.
Msg
.
alert
(
'
Error
'
,
response
.
htmlStatus
);
Ext
.
Msg
.
alert
(
'
Error
'
,
response
.
htmlStatus
);
...
@@ -246,16 +245,9 @@ Ext.define('PVE.KVMConsole', {
...
@@ -246,16 +245,9 @@ Ext.define('PVE.KVMConsole', {
}
}
},
},
{
{
text
:
'
CAD
'
,
xtype
:
'
pveQemuSendKeyMenu
'
,
handler
:
function
()
{
nodename
:
me
.
nodename
,
var
msg
=
"
Send CAD (Ctrl-Alt-Delete) to the VM?
"
;
vmid
:
me
.
vmid
Ext
.
Msg
.
confirm
(
'
Confirm
'
,
msg
,
function
(
btn
)
{
if
(
btn
!==
'
yes
'
)
{
return
;
}
vm_command
(
"
cad
"
);
});
}
},
},
{
{
text
:
'
Reset
'
,
text
:
'
Reset
'
,
...
...
www/manager/qemu/StatusView.js
View file @
72a74d5d
...
@@ -50,7 +50,7 @@ Ext.define('PVE.qemu.StatusView', {
...
@@ -50,7 +50,7 @@ Ext.define('PVE.qemu.StatusView', {
};
};
Ext
.
applyIf
(
me
,
{
Ext
.
applyIf
(
me
,
{
url
:
"
/api2/json/nodes/
"
+
nodename
+
"
/qemu/
"
+
vmid
+
"
/status
"
,
url
:
"
/api2/json/nodes/
"
+
nodename
+
"
/qemu/
"
+
vmid
+
"
/status
/current
"
,
cwidth1
:
150
,
cwidth1
:
150
,
height
:
145
,
height
:
145
,
interval
:
1000
,
interval
:
1000
,
...
...
www/manager/qemu/Summary.js
View file @
72a74d5d
...
@@ -29,12 +29,12 @@ Ext.define('PVE.qemu.Summary', {
...
@@ -29,12 +29,12 @@ Ext.define('PVE.qemu.Summary', {
var
rrdurl
=
"
/api2/png/nodes/
"
+
nodename
+
"
/qemu/
"
+
vmid
+
"
/rrd
"
;
var
rrdurl
=
"
/api2/png/nodes/
"
+
nodename
+
"
/qemu/
"
+
vmid
+
"
/rrd
"
;
var
vm_command
=
function
(
cmd
)
{
var
vm_command
=
function
(
cmd
,
params
)
{
PVE
.
Utils
.
API2Request
({
PVE
.
Utils
.
API2Request
({
params
:
{
command
:
cmd
}
,
params
:
params
,
url
:
'
/nodes/
'
+
nodename
+
'
/qemu/
'
+
vmid
+
"
/status
"
,
url
:
'
/nodes/
'
+
nodename
+
'
/qemu/
'
+
vmid
+
"
/status
/
"
+
cmd
,
waitMsgTarget
:
me
,
waitMsgTarget
:
me
,
method
:
'
P
U
T
'
,
method
:
'
P
OS
T
'
,
failure
:
function
(
response
,
opts
)
{
failure
:
function
(
response
,
opts
)
{
Ext
.
Msg
.
alert
(
'
Error
'
,
response
.
htmlStatus
);
Ext
.
Msg
.
alert
(
'
Error
'
,
response
.
htmlStatus
);
}
}
...
...
Write
Preview
Markdown
is supported
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