GUI: use lxc instead of openvz

diff --git a/www/manager/Makefile b/www/manager/Makefile
index 4c7668467ba8a0f42ce5c2ff791627d0180df715..043dd112840dd0904ca1c5e6533ba810dc09e21c 100644 (file)
--- a/www/manager/Makefile
+++ b/www/manager/Makefile
@@ -10,7 +10,7 @@ JSSRC=                                                        \
        qemu/SendKeyMenu.js                             \
        qemu/CmdMenu.js                                 \
        qemu/TemplateMenu.js                            \
-       openvz/CmdMenu.js                               \
+       lxc/CmdMenu.js                                  \
        VNCConsole.js                                   \
        data/TimezoneStore.js                           \
        data/reader/JsonObject.js                       \
@@ -139,16 +139,10 @@ JSSRC=                                                    \
        qemu/SnapshotTree.js                            \
        qemu/Config.js                                  \
        qemu/CreateWizard.js                            \
-       openvz/StatusView.js                            \
-       openvz/Summary.js                               \
-       openvz/RessourceEdit.js                         \
-       openvz/RessourceView.js                         \
-       openvz/Options.js                               \
-       openvz/Network.js                               \
-       openvz/DNS.js                                   \
-       openvz/BeanCounterGrid.js                       \
-       openvz/Config.js                                \
-       openvz/CreateWizard.js                          \
+       lxc/StatusView.js                               \
+       lxc/Summary.js                                  \
+       lxc/Config.js                                   \
+       lxc/CreateWizard.js                             \
        pool/StatusView.js                              \
        pool/Summary.js                                 \
        pool/Config.js                                  \

diff --git a/www/manager/Utils.js b/www/manager/Utils.js
index c293b0613eac0d5e0e72e501db3b6010cb648a30..f7cad2471fcdf75a5435e1e41040729f97395072 100644 (file)
--- a/www/manager/Utils.js
+++ b/www/manager/Utils.js
@@ -924,9 +924,9 @@ Ext.define('PVE.Utils', { statics: {
     },
 
     openConsoleWindow: function(viewer, vmtype, vmid, nodename, vmname) {
-       // kvm, openvz, shell, upgrade
+       // kvm, lxc, shell, upgrade
 
-       if (vmid == undefined && (vmtype === 'kvm' || vmtype === 'openvz')) {
+       if (vmid == undefined && (vmtype === 'kvm' || vmtype === 'lxc')) {
            throw "missing vmid";
        }
 
@@ -942,8 +942,8 @@ Ext.define('PVE.Utils', { statics: {
            if (vmtype === 'kvm') {
                url = '/nodes/' + nodename + '/qemu/' + vmid.toString() + '/spiceproxy';
                PVE.Utils.openSpiceViewer(url, params);
-           } else if (vmtype === 'openvz') {
-               url = '/nodes/' + nodename + '/openvz/' + vmid.toString() + '/spiceproxy';
+           } else if (vmtype === 'lxc') {
+               url = '/nodes/' + nodename + '/lxc/' + vmid.toString() + '/spiceproxy';
                PVE.Utils.openSpiceViewer(url, params);
            } else if (vmtype === 'shell') {
                url = '/nodes/' + nodename + '/spiceshell';
@@ -970,7 +970,7 @@ Ext.define('PVE.Utils', { statics: {
 
     openVNCViewer: function(vmtype, vmid, nodename, vmname, novnc) {
        var url = Ext.urlEncode({
-           console: vmtype, // kvm, openvz, upgrade or shell
+           console: vmtype, // kvm, lxc, upgrade or shell
            novnc: novnc ? 1 : 0,
            vmid: vmid,
            vmname: vmname,

diff --git a/www/manager/VNCConsole.js b/www/manager/VNCConsole.js
index fcd7c2cfa28a2616dddf93db93755d12f5ce72cf..b4806079deb1f9d785a00b284152b169bd878ca2 100644 (file)
--- a/www/manager/VNCConsole.js
+++ b/www/manager/VNCConsole.js
@@ -393,9 +393,9 @@ Ext.define('PVE.KVMConsole', {
     }
 });
 
-Ext.define('PVE.OpenVZConsole', {
+Ext.define('PVE.LxcConsole', {
     extend: 'PVE.VNCConsole',
-    alias: ['widget.pveOpenVZConsole'],
+    alias: ['widget.pveLxcConsole'],
 
     initComponent : function() {
        var me = this;
@@ -408,7 +408,7 @@ Ext.define('PVE.OpenVZConsole', {
            throw "no VM ID specified";
        }
 
-       var baseUrl = "/nodes/" + me.nodename + "/openvz/" + me.vmid;
+       var baseUrl = "/nodes/" + me.nodename + "/lxc/" + me.vmid;
  
        var vm_command = function(cmd, params, reload_applet) {
            PVE.Utils.API2Request({

diff --git a/www/manager/Workspace.js b/www/manager/Workspace.js
index f6df3a1636b65518cdce70d83451a75205419874..2606fb934f7ed1e1c6fbea8c72d5ab1133686991 100644 (file)
--- a/www/manager/Workspace.js
+++ b/www/manager/Workspace.js
@@ -132,13 +132,13 @@ Ext.define('PVE.ConsoleWorkspace', {
                vmname: param.vmname,
                toplevel: true
            };
-       } else if (consoleType === 'openvz') {
+       } else if (consoleType === 'lxc') {
            me.title = "CT " + param.vmid;
            if (param.vmname) {
                me.title += " ('" + param.vmname + "')";
            }
            content = {
-               xtype: 'pveOpenVZConsole',
+               xtype: 'pveLxcConsole',
                novnc: param.novnc,
                vmid: param.vmid,
                nodename: param.node,
@@ -288,14 +288,14 @@ Ext.define('PVE.StdWorkspace', {
                            root: 'PVE.dc.Config',
                            node: 'PVE.node.Config',
                            qemu: 'PVE.qemu.Config',
-                           openvz: 'PVE.openvz.Config',
+                           lxc: 'PVE.lxc.Config',
                            storage: 'PVE.storage.Browser',
                            pool: 'pvePoolConfig'
                        };
                        
                        if (selected.length > 0) {
                            var n = selected[0];
-                           comp = { 
+                           comp = {
                                xtype: tlckup[n.data.type || 'root'] || 
                                    'pvePanelConfig',
                                layout: { type: 'fit' },
@@ -342,7 +342,7 @@ Ext.define('PVE.StdWorkspace', {
            text: gettext("Create CT"),
            disabled: !caps.vms['VM.Allocate'],
            handler: function() {
-               var wiz = Ext.create('PVE.openvz.CreateWizard', {});
+               var wiz = Ext.create('PVE.lxc.CreateWizard', {});
                wiz.show();
            } 
        });

diff --git a/www/manager/button/ConsoleButton.js b/www/manager/button/ConsoleButton.js
index 58da3c221216eb4dd84a82e2bf23879e0e32c694..d39e9c293e28e3d577b554259b6f0e650ab74071 100644 (file)
--- a/www/manager/button/ConsoleButton.js
+++ b/www/manager/button/ConsoleButton.js
@@ -2,7 +2,7 @@ Ext.define('PVE.button.ConsoleButton', {
     extend: 'Ext.button.Split',
     alias: 'widget.pveConsoleButton',
 
-    consoleType: 'shell', // one of 'shell', 'kvm', 'openvz', 'upgrade'
+    consoleType: 'shell', // one of 'shell', 'kvm', 'lxc', 'upgrade'
 
     consoleName: undefined,
 

diff --git a/www/manager/data/ResourceStore.js b/www/manager/data/ResourceStore.js
index 51d01129c7899940c3985b31f38df12c5f027651..eec490a5967181b69d9929277995b98468b5e0ff 100644 (file)
--- a/www/manager/data/ResourceStore.js
+++ b/www/manager/data/ResourceStore.js
@@ -39,7 +39,7 @@ Ext.define('PVE.data.ResourceStore', {
                hidden: true,
                convert: function(value, record) {
                    var info = record.data;
-                   if (info.type === 'qemu' || info.type === 'openvz' || info.type === 'node') {
+                   if (info.type === 'qemu' || info.type === 'lxc' || info.type === 'node') {
                        return (Ext.isNumeric(info.uptime) && (info.uptime > 0));
                    } else {
                        return false;
@@ -65,7 +65,7 @@ Ext.define('PVE.data.ResourceStore', {
                        text = info.pool;
                    } else if (info.type === 'storage') {
                        text = info.storage + ' (' + info.node + ')';
-                   } else if (info.type === 'qemu' || info.type === 'openvz') {
+                   } else if (info.type === 'qemu' || info.type === 'lxc') {
                        text = String(info.vmid);
                        if (info.name) {
                            text += " (" + info.name + ')';

diff --git a/www/manager/grid/BackupView.js b/www/manager/grid/BackupView.js
index ceef5321ae65db8160bf62ff742e5c58546831a2..aba6d2d878ded210a683a80221d9133cf8cf6283 100644 (file)
--- a/www/manager/grid/BackupView.js
+++ b/www/manager/grid/BackupView.js
@@ -27,6 +27,10 @@ Ext.define('PVE.grid.BackupView', {
            filterFn = function(item) {
                return item.data.volid.match(':backup/vzdump-openvz-');
            };
+       } else if (vmtype === 'lxc') {
+           filterFn = function(item) {
+               return item.data.volid.match(':backup/vzdump-lxc-');
+           };
        } else if (vmtype === 'qemu') {
            filterFn = function(item) {
                return item.data.volid.match(':backup/vzdump-qemu-');

diff --git a/www/manager/grid/ResourceGrid.js b/www/manager/grid/ResourceGrid.js
index 6212fe7d9a9c84afc46fa7a224eed1b362706058..7a9baa5f7012b7be81e8b17b409bce401000d15a 100644 (file)
--- a/www/manager/grid/ResourceGrid.js
+++ b/www/manager/grid/ResourceGrid.js
@@ -203,8 +203,8 @@ Ext.define('PVE.grid.ResourceGrid', {
                        menu = Ext.create('PVE.qemu.TemplateMenu', {
                            pveSelNode: record
                        });
-                   } else if (record.data.type === 'openvz') {
-                       menu = Ext.create('PVE.openvz.CmdMenu', {
+                   } else if (record.data.type === 'lxc') {
+                       menu = Ext.create('PVE.lxc.CmdMenu', {
                            pveSelNode: record
                        });
                    } else {

diff --git a/www/manager/panel/NotesView.js b/www/manager/panel/NotesView.js
index 077a50e520d6fba436f2d46f44b0d5e56404a31a..add9e5e30786ae65cf7326f81f1f70dd8e8a6ea9 100644 (file)
--- a/www/manager/panel/NotesView.js
+++ b/www/manager/panel/NotesView.js
@@ -35,8 +35,8 @@ Ext.define('PVE.panel.NotesView', {
 
        if (vmtype === 'qemu') {
            me.url = '/api2/extjs/nodes/' + nodename + '/qemu/' + vmid + '/config';
-       } else if (vmtype === 'openvz') {
-           me.url = '/api2/extjs/nodes/' + nodename + '/openvz/' + vmid + '/config';
+       } else if (vmtype === 'lxc') {
+           me.url = '/api2/extjs/nodes/' + nodename + '/lxc/' + vmid + '/config';
        } else {
            throw "unknown vm type '" + vmtype + "'";
        }

diff --git a/www/manager/tree/ResourceTree.js b/www/manager/tree/ResourceTree.js
index ee8991f8a65ca123bca74852225590e3075b6163..377e01c4faad33877d71dcd50b1261f901dc228e 100644 (file)
--- a/www/manager/tree/ResourceTree.js
+++ b/www/manager/tree/ResourceTree.js
@@ -20,9 +20,9 @@ Ext.define('PVE.tree.ResourceTree', {
                iconCls: 'x-tree-node-computer',
                text: gettext('Virtual Machine')
            },
-           openvz: {
+           lxc: {
                iconCls: 'x-tree-node-openvz',
-               text: gettext('OpenVZ Container')
+               text: gettext('LXC Container')
            } 
        }
     },
@@ -46,7 +46,7 @@ Ext.define('PVE.tree.ResourceTree', {
 
            // numeric compare for VM IDs
            // sort templates after regular VMs
-           if (v1 === 'qemu' || v1 === 'openvz') {
+           if (v1 === 'qemu' || v1 === 'lxc') {
                if (n1.template && !n2.template) {
                    return 1;
                } else if (n2.template && !n1.template) {
@@ -340,8 +340,8 @@ Ext.define('PVE.tree.ResourceTree', {
                        menu = Ext.create('PVE.qemu.TemplateMenu', {
                            pveSelNode: record
                        });
-                   } else if (record.data.type === 'openvz') {
-                       menu = Ext.create('PVE.openvz.CmdMenu', {
+                   } else if (record.data.type === 'lxc') {
+                       menu = Ext.create('PVE.lxc.CmdMenu', {
                            pveSelNode: record
                        });
                    } else {
@@ -393,7 +393,7 @@ Ext.define('PVE.tree.ResourceTree', {
                }
            },
            checkVmMigration: function(record) {
-               if (!(record.data.type === 'qemu' || record.data.type === 'openvz')) {
+               if (!(record.data.type === 'qemu' || record.data.type === 'lxc')) {
                    throw "not a vm type";
                }
 

diff --git a/www/manager5/Utils.js b/www/manager5/Utils.js
index c293b0613eac0d5e0e72e501db3b6010cb648a30..f7cad2471fcdf75a5435e1e41040729f97395072 100644 (file)
--- a/www/manager5/Utils.js
+++ b/www/manager5/Utils.js
@@ -924,9 +924,9 @@ Ext.define('PVE.Utils', { statics: {
     },
 
     openConsoleWindow: function(viewer, vmtype, vmid, nodename, vmname) {
-       // kvm, openvz, shell, upgrade
+       // kvm, lxc, shell, upgrade
 
-       if (vmid == undefined && (vmtype === 'kvm' || vmtype === 'openvz')) {
+       if (vmid == undefined && (vmtype === 'kvm' || vmtype === 'lxc')) {
            throw "missing vmid";
        }
 
@@ -942,8 +942,8 @@ Ext.define('PVE.Utils', { statics: {
            if (vmtype === 'kvm') {
                url = '/nodes/' + nodename + '/qemu/' + vmid.toString() + '/spiceproxy';
                PVE.Utils.openSpiceViewer(url, params);
-           } else if (vmtype === 'openvz') {
-               url = '/nodes/' + nodename + '/openvz/' + vmid.toString() + '/spiceproxy';
+           } else if (vmtype === 'lxc') {
+               url = '/nodes/' + nodename + '/lxc/' + vmid.toString() + '/spiceproxy';
                PVE.Utils.openSpiceViewer(url, params);
            } else if (vmtype === 'shell') {
                url = '/nodes/' + nodename + '/spiceshell';
@@ -970,7 +970,7 @@ Ext.define('PVE.Utils', { statics: {
 
     openVNCViewer: function(vmtype, vmid, nodename, vmname, novnc) {
        var url = Ext.urlEncode({
-           console: vmtype, // kvm, openvz, upgrade or shell
+           console: vmtype, // kvm, lxc, upgrade or shell
            novnc: novnc ? 1 : 0,
            vmid: vmid,
            vmname: vmname,