Commit 906ba60c authored by Dietmar Maurer's avatar Dietmar Maurer

Enable firewall GUI

parent 270067a0
...@@ -82,6 +82,14 @@ Ext.define('PVE.dc.Config', { ...@@ -82,6 +82,14 @@ Ext.define('PVE.dc.Config', {
xtype: 'pveDcHAConfig', xtype: 'pveDcHAConfig',
title: 'HA', title: 'HA',
itemId: 'ha' itemId: 'ha'
},
{
xtype: 'pveFirewallPanel',
title: gettext('Firewall'),
base_url: '/cluster/firewall',
fwtype: 'dc',
phstateid: me.hstateid,
itemId: 'firewall'
} }
]); ]);
......
...@@ -141,12 +141,22 @@ Ext.define('PVE.node.Config', { ...@@ -141,12 +141,22 @@ Ext.define('PVE.node.Config', {
]); ]);
if (caps.nodes['Sys.Console']) { if (caps.nodes['Sys.Console']) {
me.items.push([{ me.items.push([
title: gettext('Updates'), {
itemId: 'apt', xtype: 'pveFirewallPanel',
xtype: 'pveNodeAPT', title: gettext('Firewall'),
nodename: nodename base_url: '/nodes/' + nodename + '/firewall',
}]); fwtype: 'node',
phstateid: me.hstateid,
itemId: 'firewall'
},
{
title: gettext('Updates'),
itemId: 'apt',
xtype: 'pveNodeAPT',
nodename: nodename
}
]);
me.items.push([{ me.items.push([{
title: 'Ceph', title: 'Ceph',
itemId: 'ceph', itemId: 'ceph',
......
...@@ -17,15 +17,17 @@ Ext.define('PVE.openvz.Config', { ...@@ -17,15 +17,17 @@ Ext.define('PVE.openvz.Config', {
var caps = Ext.state.Manager.get('GuiCap'); var caps = Ext.state.Manager.get('GuiCap');
var base_url = '/nodes/' + nodename + '/openvz/' + vmid;
me.statusStore = Ext.create('PVE.data.ObjectStore', { me.statusStore = Ext.create('PVE.data.ObjectStore', {
url: "/api2/json/nodes/" + nodename + "/openvz/" + vmid + "/status/current", url: '/api2/json' + base_url + '/status/current',
interval: 1000 interval: 1000
}); });
var vm_command = function(cmd, params) { var vm_command = function(cmd, params) {
PVE.Utils.API2Request({ PVE.Utils.API2Request({
params: params, params: params,
url: '/nodes/' + nodename + '/openvz/' + vmid + "/status/" + cmd, url: base_url + "/status/" + cmd,
waitMsgTarget: me, waitMsgTarget: me,
method: 'POST', method: 'POST',
failure: function(response, opts) { failure: function(response, opts) {
...@@ -89,7 +91,7 @@ Ext.define('PVE.openvz.Config', { ...@@ -89,7 +91,7 @@ Ext.define('PVE.openvz.Config', {
confirmMsg: Ext.String.format(gettext('Are you sure you want to remove VM {0}? This will permanently erase all VM data.'), vmid), confirmMsg: Ext.String.format(gettext('Are you sure you want to remove VM {0}? This will permanently erase all VM data.'), vmid),
handler: function() { handler: function() {
PVE.Utils.API2Request({ PVE.Utils.API2Request({
url: '/nodes/' + nodename + '/openvz/' + vmid, url: base_url,
method: 'DELETE', method: 'DELETE',
waitMsgTarget: me, waitMsgTarget: me,
failure: function(response, opts) { failure: function(response, opts) {
...@@ -153,7 +155,7 @@ Ext.define('PVE.openvz.Config', { ...@@ -153,7 +155,7 @@ Ext.define('PVE.openvz.Config', {
title: 'UBC', title: 'UBC',
itemId: 'ubc', itemId: 'ubc',
xtype: 'pveBeanCounterGrid', xtype: 'pveBeanCounterGrid',
url: '/api2/json/nodes/' + nodename + '/openvz/' + vmid + '/status/ubc' url: '/api2/json' + base_url + '/status/ubc'
} }
] ]
}); });
...@@ -166,6 +168,19 @@ Ext.define('PVE.openvz.Config', { ...@@ -166,6 +168,19 @@ Ext.define('PVE.openvz.Config', {
}); });
} }
if (caps.vms['VM.Console']) {
me.items.push([
{
xtype: 'pveFirewallPanel',
title: gettext('Firewall'),
base_url: base_url + '/firewall',
fwtype: 'vm',
phstateid: me.hstateid,
itemId: 'firewall'
}
]);
}
if (caps.vms['Permissions.Modify']) { if (caps.vms['Permissions.Modify']) {
me.items.push({ me.items.push({
xtype: 'pveACLView', xtype: 'pveACLView',
......
...@@ -17,15 +17,17 @@ Ext.define('PVE.qemu.Config', { ...@@ -17,15 +17,17 @@ Ext.define('PVE.qemu.Config', {
var caps = Ext.state.Manager.get('GuiCap'); var caps = Ext.state.Manager.get('GuiCap');
var base_url = '/nodes/' + nodename + "/qemu/" + vmid;
me.statusStore = Ext.create('PVE.data.ObjectStore', { me.statusStore = Ext.create('PVE.data.ObjectStore', {
url: "/api2/json/nodes/" + nodename + "/qemu/" + vmid + "/status/current", url: '/api2/json' + base_url + '/status/current',
interval: 1000 interval: 1000
}); });
var vm_command = function(cmd, params) { var vm_command = function(cmd, params) {
PVE.Utils.API2Request({ PVE.Utils.API2Request({
params: params, params: params,
url: '/nodes/' + nodename + '/qemu/' + vmid + "/status/" + cmd, url: base_url + '/status/' + cmd,
waitMsgTarget: me, waitMsgTarget: me,
method: 'POST', method: 'POST',
failure: function(response, opts) { failure: function(response, opts) {
...@@ -98,7 +100,7 @@ Ext.define('PVE.qemu.Config', { ...@@ -98,7 +100,7 @@ Ext.define('PVE.qemu.Config', {
confirmMsg: Ext.String.format(gettext('Are you sure you want to remove VM {0}? This will permanently erase all VM data.'), vmid), confirmMsg: Ext.String.format(gettext('Are you sure you want to remove VM {0}? This will permanently erase all VM data.'), vmid),
handler: function() { handler: function() {
PVE.Utils.API2Request({ PVE.Utils.API2Request({
url: '/nodes/' + nodename + '/qemu/' + vmid, url: base_url,
method: 'DELETE', method: 'DELETE',
waitMsgTarget: me, waitMsgTarget: me,
failure: function(response, opts) { failure: function(response, opts) {
...@@ -175,6 +177,19 @@ Ext.define('PVE.qemu.Config', { ...@@ -175,6 +177,19 @@ Ext.define('PVE.qemu.Config', {
}); });
} }
if (caps.vms['VM.Console']) {
me.items.push([
{
xtype: 'pveFirewallPanel',
title: gettext('Firewall'),
base_url: base_url + '/firewall',
fwtype: 'vm',
phstateid: me.hstateid,
itemId: 'firewall'
}
]);
}
if (caps.vms['Permissions.Modify']) { if (caps.vms['Permissions.Modify']) {
me.items.push({ me.items.push({
xtype: 'pveACLView', xtype: 'pveACLView',
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment