From: Dietmar Maurer <dietmar@proxmox.com>
Date: Tue, 6 May 2014 10:52:11 +0000 (+0200)
Subject: Enable firewall GUI
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=906ba60cbd9f05f93c5e3a10ba51fc09d04604e9;p=pve-manager-legacy.git

Enable firewall GUI
---

diff --git a/www/manager/dc/Config.js b/www/manager/dc/Config.js
index 04b41106..cb833bdb 100644
--- a/www/manager/dc/Config.js
+++ b/www/manager/dc/Config.js
@@ -82,6 +82,14 @@ Ext.define('PVE.dc.Config', {
 		    xtype: 'pveDcHAConfig',
 		    title: 'HA',
 		    itemId: 'ha'
+		},
+		{
+		    xtype: 'pveFirewallPanel',
+		    title: gettext('Firewall'),
+		    base_url: '/cluster/firewall',
+		    fwtype: 'dc',
+		    phstateid: me.hstateid,
+		    itemId: 'firewall'
 		}
 	    ]);
 
diff --git a/www/manager/node/Config.js b/www/manager/node/Config.js
index cc7f3188..c351ffd9 100644
--- a/www/manager/node/Config.js
+++ b/www/manager/node/Config.js
@@ -141,12 +141,22 @@ Ext.define('PVE.node.Config', {
 	]);
 
 	if (caps.nodes['Sys.Console']) {
-	    me.items.push([{
-		title: gettext('Updates'),
-		itemId: 'apt',
-		xtype: 'pveNodeAPT',
-		nodename: nodename
-	    }]);
+	    me.items.push([
+		{
+		    xtype: 'pveFirewallPanel',
+		    title: gettext('Firewall'),
+		    base_url: '/nodes/' + nodename + '/firewall',
+		    fwtype: 'node',
+		    phstateid: me.hstateid,
+		    itemId: 'firewall'
+		},
+		{
+		    title: gettext('Updates'),
+		    itemId: 'apt',
+		    xtype: 'pveNodeAPT',
+		    nodename: nodename
+		}
+	    ]);
 	    me.items.push([{
 		title: 'Ceph',
 		itemId: 'ceph',
diff --git a/www/manager/openvz/Config.js b/www/manager/openvz/Config.js
index 576dd77c..8589f220 100644
--- a/www/manager/openvz/Config.js
+++ b/www/manager/openvz/Config.js
@@ -17,15 +17,17 @@ Ext.define('PVE.openvz.Config', {
 
 	var caps = Ext.state.Manager.get('GuiCap');
 
+	var base_url = '/nodes/' + nodename + '/openvz/' + vmid;
+ 
 	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
 	});
 
 	var vm_command = function(cmd, params) {
 	    PVE.Utils.API2Request({
 		params: params,
-		url: '/nodes/' + nodename + '/openvz/' + vmid + "/status/" + cmd,
+		url: base_url + "/status/" + cmd,
 		waitMsgTarget: me,
 		method: 'POST',
 		failure: function(response, opts) {
@@ -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),
 	    handler: function() {
 		PVE.Utils.API2Request({
-		    url: '/nodes/' + nodename + '/openvz/' + vmid,
+		    url: base_url,
 		    method: 'DELETE',
 		    waitMsgTarget: me,
 		    failure: function(response, opts) {
@@ -153,7 +155,7 @@ Ext.define('PVE.openvz.Config', {
 		    title: 'UBC',
 		    itemId: 'ubc',
 		    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', {
 	    });
 	}
 
+	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']) {
 	    me.items.push({
 		xtype: 'pveACLView',
diff --git a/www/manager/qemu/Config.js b/www/manager/qemu/Config.js
index 91db06ac..1d1c8a20 100644
--- a/www/manager/qemu/Config.js
+++ b/www/manager/qemu/Config.js
@@ -17,15 +17,17 @@ Ext.define('PVE.qemu.Config', {
 
 	var caps = Ext.state.Manager.get('GuiCap');
 
+	var base_url = '/nodes/' + nodename + "/qemu/" + vmid;
+ 
 	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
 	});
 
 	var vm_command = function(cmd, params) {
 	    PVE.Utils.API2Request({
 		params: params,
-		url: '/nodes/' + nodename + '/qemu/' + vmid + "/status/" + cmd,
+		url: base_url + '/status/' + cmd,
 		waitMsgTarget: me,
 		method: 'POST',
 		failure: function(response, opts) {
@@ -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),
 	    handler: function() {
 		PVE.Utils.API2Request({
-		    url: '/nodes/' + nodename + '/qemu/' + vmid,
+		    url: base_url,
 		    method: 'DELETE',
 		    waitMsgTarget: me,
 		    failure: function(response, opts) {
@@ -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']) {
 	    me.items.push({
 		xtype: 'pveACLView',