Re: [Kimchi-devel] [project-kimchi] [PATCH V2] Add confirm box to create logical pool, and modify device path number
by Aline Manera
Reviewed-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
On 12/18/2013 12:34 AM, zhoumeina wrote:
> Add a confirm box to create logical pool, because it is a quite
> dangerous action.
>
> Make device path number to "3"
> Signed-off-by: zhoumeina <zhoumein(a)linux.vnet.ibm.com>
> ---
> ui/js/src/kimchi.storagepool_add_main.js | 30 ++++++++++++++++++++++++------
> ui/pages/i18n.html.tmpl | 4 +++-
> ui/pages/storagepool-add.html.tmpl | 2 +-
> 3 files changed, 28 insertions(+), 8 deletions(-)
>
> diff --git a/ui/js/src/kimchi.storagepool_add_main.js b/ui/js/src/kimchi.storagepool_add_main.js
> index 7efbfa0..66500f3 100644
> --- a/ui/js/src/kimchi.storagepool_add_main.js
> +++ b/ui/js/src/kimchi.storagepool_add_main.js
> @@ -157,11 +157,29 @@ kimchi.addPool = function(event) {
> formData.nfspath = $('#nfspathId').val();
> formData.nfsserver = $('#nfsserverId').val();
> }
> - kimchi.createStoragePool(formData, function() {
> - kimchi.doListStoragePools();
> - kimchi.window.close();
> - }, function(err) {
> - kimchi.message.error(err.responseJSON.reason);
> - });
> + if (poolType === 'logical') {
> + var settings = {
> + title : i18n['msg.confirm.delete.title'],
> + content : i18n['msg.logicalpool.confirm.delete'],
> + confirm : i18n['msg.confirm.delete.confirm'],
> + cancel : i18n['msg.confirm.delete.cancel']
> + };
> + kimchi.confirm(settings, function() {
> + kimchi.createStoragePool(formData, function() {
> + kimchi.doListStoragePools();
> + kimchi.window.close();
> + }, function(err) {
> + kimchi.message.error(err.responseJSON.reason);
> + });
> + }, function() {
> + });
> + } else {
> + kimchi.createStoragePool(formData, function() {
> + kimchi.doListStoragePools();
> + kimchi.window.close();
> + }, function(err) {
> + kimchi.message.error(err.responseJSON.reason);
> + });
> + }
> }
> };
> diff --git a/ui/pages/i18n.html.tmpl b/ui/pages/i18n.html.tmpl
> index 3d0dfff..54bfada 100644
> --- a/ui/pages/i18n.html.tmpl
> +++ b/ui/pages/i18n.html.tmpl
> @@ -119,7 +119,9 @@ var i18n = {
> 'network_dialog_ok': "$_("OK")",
> 'network_dialog_cancel': "$_("Cancel")",
> 'action_create': "$_("Create")",
> - 'msg_warning': "$_("Warning")"
> + 'msg_warning': "$_("Warning")",
> + 'msg.logicalpool.confirm.delete': "$_("It will format your disk and you will loose any data in"
> + "there, are you sure to continue? ")"
> };
> </script>
> </body>
> diff --git a/ui/pages/storagepool-add.html.tmpl b/ui/pages/storagepool-add.html.tmpl
> index 55cb6e8..d7b046d 100644
> --- a/ui/pages/storagepool-add.html.tmpl
> +++ b/ui/pages/storagepool-add.html.tmpl
> @@ -92,7 +92,7 @@
> </div>
> <div class="logical-section tmpl-html">
> <section class="form-section storageType">
> - <h2>4. $_("Device Path")</h2>
> + <h2>3. $_("Device Path")</h2>
> <div class="host-partition"></div>
> </section>
> </div>
--
project-kimchi mailing list <project-kimchi(a)googlegroups.com>
https://groups.google.com/forum/#!forum/project-kimchi
---
You received this message because you are subscribed to the Google Groups "project-kimchi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
10 years, 4 months
Re: [Kimchi-devel] [project-kimchi] [PATCH] spec: Open 8000 and 8001 port by default in spec.in post section. kimchi server use 8000 and 8001 port. Open 8000 and 8001 port by default in spec.in post section.
by Sheldon
subject is too long. it should be like this.
subject:
spec: Open 8000 and 8001 port by default in spec.in post section.
commit message:
kimchi server use 8000 and 8001 port. Open 8000 and 8001 port by default
in spec.in post section.
On 12/17/2013 02:36 PM, taget(a)linux.vnet.ibm.com wrote:
> From: Eli Qiao <taget(a)linux.vnet.ibm.com>
>
> Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com>
> ---
> contrib/kimchi.spec.fedora.in | 5 +++++
> contrib/kimchi.spec.suse.in | 5 +++++
> 2 files changed, 10 insertions(+), 0 deletions(-)
>
> diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in
> index 14ec359..f21ae49 100644
> --- a/contrib/kimchi.spec.fedora.in
> +++ b/contrib/kimchi.spec.fedora.in
> @@ -81,6 +81,11 @@ if [ $1 -eq 1 ] ; then
> /bin/systemctl daemon-reload >/dev/null 2>&1 || :
> fi
>
> +# open 8000 and 8001 port for firewall
> +
> +iptables -I INPUT -p tcp --dport 8000 -j ACCEPT
> +iptables -I INPUT -p tcp --dport 8001 -j ACCEPT
> +
> %if 0%{?rhel} == 6
> start kimchid
> %else
> diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in
> index 9051284..5209e03 100644
> --- a/contrib/kimchi.spec.suse.in
> +++ b/contrib/kimchi.spec.suse.in
> @@ -47,6 +47,11 @@ install -Dm 0755 contrib/kimchid.sysvinit %{buildroot}%{_initrddir}/kimchid
> service kimchid start
> chkconfig kimchid on
>
> +# open 8000 and 8001 port for firewall
> +
> +iptables -I INPUT -p tcp --dport 8000 -j ACCEPT
> +iptables -I INPUT -p tcp --dport 8001 -j ACCEPT
> +
> %preun
> service kimchid stop
>
in src/kimchi.conf.in
[server]
# Hostname or IP address to listen on
#host = 0.0.0.0
# Port to listen on
#port = 8000
# If present, start an SSL-enabled server on the given port
#ssl_port = 8001
we can change port.
Such the port is 9000 and the ssl_port is 9001
we have already file a wiki about this:
https://github.com/kimchi-project/kimchi/wiki/Firewall-configure
It is possible that the Kimchi is started at different ports other than
the default ports 8000, 8001, that requires the firewall configuration
scripts to know the Kimchi's port configuration.
Sheldon Feng(???)
IBM Linux Technology Center
--
project-kimchi mailing list <project-kimchi(a)googlegroups.com>
https://groups.google.com/forum/#!forum/project-kimchi
---
You received this message because you are subscribed to the Google Groups "project-kimchi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
10 years, 4 months
Re: [Kimchi-devel] [project-kimchi] [PATCH] spec: Open 8000 and 8001 port by default in spec.in post section. kimchi server use 8000 and 8001 port. Open 8000 and 8001 port by default in spec.in post section.
by Royce Lv
Hi Eli,
Pls add debian iptables rules as well.
On 2013年12月17日 14:36, taget(a)linux.vnet.ibm.com wrote:
> From: Eli Qiao <taget(a)linux.vnet.ibm.com>
>
> Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com>
> ---
> contrib/kimchi.spec.fedora.in | 5 +++++
> contrib/kimchi.spec.suse.in | 5 +++++
> 2 files changed, 10 insertions(+), 0 deletions(-)
>
> diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in
> index 14ec359..f21ae49 100644
> --- a/contrib/kimchi.spec.fedora.in
> +++ b/contrib/kimchi.spec.fedora.in
> @@ -81,6 +81,11 @@ if [ $1 -eq 1 ] ; then
> /bin/systemctl daemon-reload >/dev/null 2>&1 || :
> fi
>
> +# open 8000 and 8001 port for firewall
> +
> +iptables -I INPUT -p tcp --dport 8000 -j ACCEPT
> +iptables -I INPUT -p tcp --dport 8001 -j ACCEPT
> +
> %if 0%{?rhel} == 6
> start kimchid
> %else
> diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in
> index 9051284..5209e03 100644
> --- a/contrib/kimchi.spec.suse.in
> +++ b/contrib/kimchi.spec.suse.in
> @@ -47,6 +47,11 @@ install -Dm 0755 contrib/kimchid.sysvinit %{buildroot}%{_initrddir}/kimchid
> service kimchid start
> chkconfig kimchid on
>
> +# open 8000 and 8001 port for firewall
> +
> +iptables -I INPUT -p tcp --dport 8000 -j ACCEPT
> +iptables -I INPUT -p tcp --dport 8001 -j ACCEPT
> +
> %preun
> service kimchid stop
>
--
project-kimchi mailing list <project-kimchi(a)googlegroups.com>
https://groups.google.com/forum/#!forum/project-kimchi
---
You received this message because you are subscribed to the Google Groups "project-kimchi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
10 years, 4 months
[project-kimchi] Fwd: [PATCH] spec: Open 8000 and 8001 port by default in spec.in post section. kimchi server use 8000 and 8001 port. Open 8000 and 8001 port by default in spec.in post section.
by Eli Qiao
hi Mark, Sheldon, Royce
please help to review my patch.
thanks Eli.
-------- 原始消息 --------
主题: [PATCH] spec: Open 8000 and 8001 port by default in spec.in post
section. kimchi server use 8000 and 8001 port. Open 8000 and 8001 port
by default in spec.in post section.
日期: Tue, 17 Dec 2013 14:36:34 +0800
发件人: taget(a)linux.vnet.ibm.com
收件人: project-kimchi(a)googlegroups.com
抄送: Eli Qiao <taget(a)linux.vnet.ibm.com>
From: Eli Qiao <taget(a)linux.vnet.ibm.com>
Signed-off-by: Eli Qiao <taget(a)linux.vnet.ibm.com>
---
contrib/kimchi.spec.fedora.in | 5 +++++
contrib/kimchi.spec.suse.in | 5 +++++
2 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in
index 14ec359..f21ae49 100644
--- a/contrib/kimchi.spec.fedora.in
+++ b/contrib/kimchi.spec.fedora.in
@@ -81,6 +81,11 @@ if [ $1 -eq 1 ] ; then
/bin/systemctl daemon-reload >/dev/null 2>&1 || :
fi
+# open 8000 and 8001 port for firewall
+
+iptables -I INPUT -p tcp --dport 8000 -j ACCEPT
+iptables -I INPUT -p tcp --dport 8001 -j ACCEPT
+
%if 0%{?rhel} == 6
start kimchid
%else
diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in
index 9051284..5209e03 100644
--- a/contrib/kimchi.spec.suse.in
+++ b/contrib/kimchi.spec.suse.in
@@ -47,6 +47,11 @@ install -Dm 0755 contrib/kimchid.sysvinit %{buildroot}%{_initrddir}/kimchid
service kimchid start
chkconfig kimchid on
+# open 8000 and 8001 port for firewall
+
+iptables -I INPUT -p tcp --dport 8000 -j ACCEPT
+iptables -I INPUT -p tcp --dport 8001 -j ACCEPT
+
%preun
service kimchid stop
--
1.7.1
--
project-kimchi mailing list <project-kimchi(a)googlegroups.com>
https://groups.google.com/forum/#!forum/project-kimchi
---
You received this message because you are subscribed to the Google Groups "project-kimchi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
10 years, 4 months
[project-kimchi] [PATCH] [Issue #242] Edit Template: deleted storage pool shows blank
by Xin Ding
Fix issue #242.
If the storage pool of a template has been deleted, when editing
this template, the storage pool field will show blank.
Signed-off-by: Xin Ding <xinding(a)linux.vnet.ibm.com>
---
ui/css/theme-default/template-edit.css | 4 ++++
ui/js/src/kimchi.template_edit_main.js | 8 ++++++++
2 files changed, 12 insertions(+)
diff --git a/ui/css/theme-default/template-edit.css b/ui/css/theme-default/template-edit.css
index 1a049c0..2f8a61a 100644
--- a/ui/css/theme-default/template-edit.css
+++ b/ui/css/theme-default/template-edit.css
@@ -73,3 +73,7 @@
.hidden-area {
display: none;
}
+
+.template-edit-fieldset .error {
+ color: red;
+}
diff --git a/ui/js/src/kimchi.template_edit_main.js b/ui/js/src/kimchi.template_edit_main.js
index efe4a6f..d48b6ba 100644
--- a/ui/js/src/kimchi.template_edit_main.js
+++ b/ui/js/src/kimchi.template_edit_main.js
@@ -31,6 +31,8 @@ kimchi.template_edit_main = function() {
$('input[name="disks"]').val(disks[0].size);
kimchi.listStoragePools(function(result) {
var options = [];
+ var storagepoolLabel = template.storagepool.replace(/^\/storagepools\//, '');
+ var storagepoolValid = false;
if (result && result.length) {
$.each(result, function(index, storagePool) {
if(storagePool.type !== 'kimchi-iso') {
@@ -38,9 +40,15 @@ kimchi.template_edit_main = function() {
label: storagePool.name,
value: '/storagepools/' + storagePool.name
});
+ if(storagepoolLabel === storagePool.name) {
+ storagepoolValid = true;
+ }
}
});
}
+ if(!storagepoolValid) {
+ $('#template-edit-storage-label').html('<span class="error">' + storagepoolLabel + '</span>');
+ }
kimchi.select('template-edit-storagePool-list', options);
});
});
--
1.8.3.2
--
project-kimchi mailing list <project-kimchi(a)googlegroups.com>
https://groups.google.com/forum/#!forum/project-kimchi
---
You received this message because you are subscribed to the Google Groups "project-kimchi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
10 years, 4 months
Re: [Kimchi-devel] [project-kimchi][PATCH 2/3] NFS prevalidation: try nfs path mount in feature test
by Royce Lv
On 2013年12月18日 09:41, Aline Manera wrote:
> On 12/17/2013 10:10 AM, lvroyce0210(a)gmail.com wrote:
>> From: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
>>
>> To prevent future mount of nfs path will hang,
>> we will try nfs path with a quick mount,
>> if this test fails, report warning to user.
>>
>> Signed-off-by: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
>> ---
>> src/kimchi/featuretests.py | 32 ++++++++++++++++++++++++++++++++
>> 1 file changed, 32 insertions(+)
>>
>> diff --git a/src/kimchi/featuretests.py b/src/kimchi/featuretests.py
>> index 4cabdc9..36036e5 100644
>> --- a/src/kimchi/featuretests.py
>> +++ b/src/kimchi/featuretests.py
>> @@ -23,10 +23,12 @@
>> import libvirt
>> import os
>> import subprocess
>> +import tempfile
>> import threading
>>
>>
>> from kimchi import config
>> +from kimchi.utils import parse_cmd_output
>>
>>
>> ISO_STREAM_XML = """
>> @@ -111,3 +113,33 @@ class FeatureTests(object):
>> return False
>>
>> return True
>
> You should put it in utils.py as it isn't a feature test
> Independent of the result of this function the NFS pool feature will
> continue enable to user.
ACK
>
>> +
>> + @staticmethod
>> + def check_nfs_export(export_path):
>> + res = False
>> + outputs = None
>> + mnt_point = tempfile.mkdtemp(dir='/tmp')
>> + cmd = ["mount", "-o", 'soft,timeo=30,retrans=3,retry=0',
>> + export_path, mnt_point]
>> + proc = subprocess.Popen(cmd, stdout=subprocess.PIPE,
>> + stderr=subprocess.PIPE)
>> + thread = threading.Thread(target = proc.communicate)
>> + thread.start()
>> + thread.join(9)
>> +
>> + if thread.is_alive():
>> + proc.kill()
>> + thread.join()
>> +
>> + with open("/proc/mounts" , "rb") as f:
>> + outputs = f.read()
>
> Here you could use f.readlines() as Ramon suggested
I wrote parse function for Popen.communicate result parse and file read
result. Popen.communicate result cannot apply readlines as I explained
in feed back to Ramon.
As http://docs.python.org/3.3/library/io.html suggests, The line
terminator is always b'\n' for binary files; literally it is same as my
implementation.
>
>> + output_items = ['dev_path', 'mnt_point', 'type']
>> + mounts = parse_cmd_output(outputs, output_items)
>> + for item in mounts:
>> + if 'dev_path' in item and item['dev_path'] == export_path:
>> + res = True
>> + cmd = ["umount", "-f", export_path]
>> + subprocess.Popen(cmd, stdout=subprocess.PIPE,
>> + stderr=subprocess.PIPE)
>> +
>> + return res
>
--
project-kimchi mailing list <project-kimchi(a)googlegroups.com>
https://groups.google.com/forum/#!forum/project-kimchi
---
You received this message because you are subscribed to the Google Groups "project-kimchi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
10 years, 4 months
Re: [Kimchi-devel] [project-kimchi][PATCH 0/3] NFS prevalidation
by Royce Lv
On 2013年12月18日 10:26, Shu Ming wrote:
> 于 2013/12/17 20:10, lvroyce0210(a)gmail.com 写道:
>> From: Royce Lv <lvroyce(a)linux.vnet.ibm.com>
>>
>> This patchset solves following problem:
>> 1. libvirt uses local directory when nfs target path is not accessible,
>> this patch denies this unaccessible path instead.
>> 2. libvirt storage subsystem hang for a long period, with a quick
>> checking,
>> storage pool operation will not hang if pre-checked.
>> 3. Future access control check will do in prevalidation,
>> this prevents qemu manipulate storage pool of no read access to
>> make early warning.
>> Royce Lv (3):
>> utils: Add a helper function to parse cmd result
>> NFS prevalidation: try nfs path mount in feature test
>> Integrate nfs path check before create nfs pool
>>
>> src/kimchi/featuretests.py | 32 ++++++++++++++++++++++++++++++++
>> src/kimchi/model.py | 5 +++++
>> src/kimchi/utils.py | 7 +++++++
>> 3 files changed, 44 insertions(+)
>>
> Thanks for addressing this issue and I get a few questions about this
> patch:
> I) nfs server can be be reachable can be caused by different problems,
> ie. network, server &etc. For network proI blems, it may come back to
> life after down for a few seconds. So it is hard to predict when the
> nfs server will be down.
I realized that put in featuretests.py will cause some confusion that
this is tested when kimchi started. In fact this will be validated just
before storage pool created so the lease will be very small between
create pool and validation. Will fix in next release.
> II) I think feature test is a bit broken now and we get many junk
> messages in the screen when the Kimchi server is started. Really, We
> don't want more junk message in the screen.
--
project-kimchi mailing list <project-kimchi(a)googlegroups.com>
https://groups.google.com/forum/#!forum/project-kimchi
---
You received this message because you are subscribed to the Google Groups "project-kimchi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
10 years, 4 months
Re: [Kimchi-devel] [project-kimchi] [PATCH] [Issue #287] Confirm box will be hidden by the window dialog
by Hongliang Wang
On 12/18/2013 11:20 AM, Xin Ding wrote:
> Signed-off-by: Xin Ding <xinding(a)linux.vnet.ibm.com>
Reviewed-by: Hongliang Wang <hlwang(a)linux.vnet.ibm.com>
Passed use cases on Chrome:
1. Create Guest
1.1. Remove all templates
1.2. Open Guest Tab
1.3. Click Add Button (+)
1.4. Click Add Template Button
1.5. Select local iso
1.6. Click Search more iso Button
1.7. Confirm box is right there on top of all windows
2. Consider Situation when User not Logged in
2.1. Open Host Tab
2.2. Click Shutdown Button and see a confirm box pop up
2.3. Log out by entering kimchi.logout(); in developer's tool console
2.4. Log-in window is right there on top of the confirm box
> ---
> ui/js/src/kimchi.window.js | 12 ------------
> 1 file changed, 12 deletions(-)
>
> diff --git a/ui/js/src/kimchi.window.js b/ui/js/src/kimchi.window.js
> index 2212b5b..5cf8054 100644
> --- a/ui/js/src/kimchi.window.js
> +++ b/ui/js/src/kimchi.window.js
> @@ -26,18 +26,6 @@ kimchi.window = (function() {
> url: settings
> };
>
> - if (_windows.length) {
> - var lastZIndex = parseInt($('#' + _windows[_windows.length - 1]).css('zIndex'));
> - if (settings['style']) {
> - settings['style']['zIndex'] = lastZIndex + 1;
> - }
> - else {
> - settings['style'] = {
> - zIndex: lastZIndex + 1
> - };
> - }
> - }
> -
> var windowID = settings['id'] || 'window-' + _windows.length;
>
> if ($('#' + windowID).length) {
--
project-kimchi mailing list <project-kimchi(a)googlegroups.com>
https://groups.google.com/forum/#!forum/project-kimchi
---
You received this message because you are subscribed to the Google Groups "project-kimchi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
10 years, 4 months
[project-kimchi] [PATCH 1/2] Dynamically generate template parameters for different distros
by Mark Wu
We define hard coded template for different distros. It's not
flexible to generate templates for other platforms or new distros.
This patch changes to dynamically generate vm template. With
this change, it can support new distro, like Fedora20, without any
modifications.
Signed-off-by: Mark Wu <wudxw(a)linux.vnet.ibm.com>
---
src/kimchi/osinfo.py | 174 ++++++++++-------------------------------------
src/kimchi/vmtemplate.py | 2 +-
tests/test_osinfo.py | 28 ++++++--
3 files changed, 60 insertions(+), 144 deletions(-)
diff --git a/src/kimchi/osinfo.py b/src/kimchi/osinfo.py
index 20a93a6..b141d9e 100644
--- a/src/kimchi/osinfo.py
+++ b/src/kimchi/osinfo.py
@@ -22,136 +22,23 @@
import copy
import os
+from distutils.version import LooseVersion
+
+
+common_spec = {'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1, 'memory': 1024,
+ 'disks': [{'index': 0, 'size': 10}], 'cdrom_bus': 'ide',
+ 'cdrom_index': 2}
+
+
+modern_spec = dict(common_spec, disk_bus='virtio', nic_model='virtio')
+
+
+old_spec = dict(common_spec, disk_bus='ide', nic_model='e1000')
+
+
+modern_version_bases = {'debian': '6.0', 'ubuntu': '7.10', 'opensuse': '10.3',
+ 'centos': '5.3', 'rhel': '6.0', 'fedora': '16'}
-osinfo = [
- # Entries are searched in order and the first match will be returned
- ('debian', {
- 'version': lambda d,v: bool(d == 'debian' and v in ('6.0', '7.0')),
- 'icon': 'images/icon-debian.png',
- 'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1,
- 'memory': 1024,
- 'disks': [{'index': 0, 'size': 10}],
- 'disk_bus': 'virtio', 'nic_model': 'virtio',
- 'cdrom_bus': 'ide', 'cdrom_index': 2,
- }),
- ('debian-old', {
- 'version': lambda d,v: bool(d == 'debian'),
- 'icon': 'images/icon-debian.png',
- 'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1,
- 'memory': 1024,
- 'disks': [{'index': 0, 'size': 10}],
- 'disk_bus': 'ide', 'nic_model': 'e1000',
- 'cdrom_bus': 'ide', 'cdrom_index': 2,
- }),
- ('ubuntu', {
- 'version': lambda d,v: bool(d == 'ubuntu' and v in
- ('7.10', '8.04', '8.10', '9.04', '9.10', '10.04', '10.10',
- '11.04', '11.10', '12.04', '12.10', '13.04', '13.10')),
- 'icon': 'images/icon-ubuntu.png',
- 'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1,
- 'memory': 1024,
- 'disks': [{'index': 0, 'size': 10}],
- 'disk_bus': 'virtio', 'nic_model': 'virtio',
- 'cdrom_bus': 'ide', 'cdrom_index': 2,
- }),
- ('ubuntu-old', {
- 'version': lambda d,v: bool(d == 'ubuntu'),
- 'icon': 'images/icon-ubuntu.png',
- 'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1,
- 'memory': 1024,
- 'disks': [{'index': 0, 'size': 10}],
- 'disk_bus': 'ide', 'nic_model': 'e1000',
- 'cdrom_bus': 'ide', 'cdrom_index': 2,
- }),
- ('opensuse', {
- 'version': lambda d,v: bool(d == 'opensuse' and v in
- ('10.3', '11.0', '11.1', '11.2', '11.3', '11.4', '12.1', '12.2',
- '12.3',)),
- 'icon': 'images/icon-opensuse.png',
- 'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1,
- 'memory': 1024,
- 'disks': [{'index': 0, 'size': 10}],
- 'disk_bus': 'virtio', 'nic_model': 'virtio',
- 'cdrom_bus': 'ide', 'cdrom_index': 2,
- }),
- ('opensuse-old', {
- 'version': lambda d,v: bool(d == 'opensuse'),
- 'icon': 'images/icon-opensuse.png',
- 'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1,
- 'memory': 1024,
- 'disks': [{'index': 0, 'size': 10}],
- 'disk_bus': 'ide', 'nic_model': 'e1000',
- 'cdrom_bus': 'ide', 'cdrom_index': 2,
- }),
- ('fedora', {
- 'version': lambda d,v: bool(d == 'fedora' and v in
- ('16', '17', '18', '19')),
- 'icon': 'images/icon-fedora.png',
- 'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1,
- 'memory': 1024,
- 'disks': [{'index': 0, 'size': 10}],
- 'disk_bus': 'virtio', 'nic_model': 'virtio',
- 'cdrom_bus': 'ide', 'cdrom_index': 2,
- }),
- ('fedora-old', {
- 'version': lambda d,v: bool(d == 'fedora'),
- 'icon': 'images/icon-fedora.png',
- 'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1,
- 'memory': 1024,
- 'disks': [{'index': 0, 'size': 10}],
- 'disk_bus': 'ide', 'nic_model': 'e1000',
- 'cdrom_bus': 'ide', 'cdrom_index': 2,
- }),
- ('rhel', {
- 'version': lambda d,v: bool(d == 'rhel' and
- v.startswith('6.')),
- 'icon': 'images/icon-vm.png',
- 'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1,
- 'memory': 1024,
- 'disks': [{'index': 0, 'size': 10}],
- 'disk_bus': 'virtio', 'nic_model': 'virtio',
- 'cdrom_bus': 'ide', 'cdrom_index': 2,
- }),
- ('rhel-old', {
- 'version': lambda d,v: bool(d == 'rhel'),
- 'icon': 'images/icon-vm.png',
- 'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1,
- 'memory': 1024,
- 'disks': [{'index': 0, 'size': 10}],
- 'disk_bus': 'ide', 'nic_model': 'e1000',
- 'cdrom_bus': 'ide', 'cdrom_index': 2,
- }),
- ('centos', {
- 'version': lambda d,v: bool(d == 'centos' and
- (v in ('5.3', '5.4', '5.5') or v.startswith('6.'))),
- 'icon': 'images/icon-centos.png',
- 'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1,
- 'memory': 1024,
- 'disks': [{'index': 0, 'size': 10}],
- 'disk_bus': 'virtio', 'nic_model': 'virtio',
- 'cdrom_bus': 'ide', 'cdrom_index': 2,
- }),
- ('centos-old', {
- 'version': lambda d,v: bool(d == 'centos'),
- 'icon': 'images/icon-centos.png',
- 'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1,
- 'memory': 1024,
- 'disks': [{'index': 0, 'size': 10}],
- 'disk_bus': 'ide', 'nic_model': 'e1000',
- 'cdrom_bus': 'ide', 'cdrom_index': 2,
- }),
- ('unknown', {
- 'version': lambda d,v: True,
- 'icon': 'images/icon-vm.png',
- 'os_distro': 'unknown', 'os_version': 'unknown',
- 'cpus': 1, 'cpu_cores': 1, 'cpu_threads': 1,
- 'memory': 1024,
- 'cdrom': '',
- 'disks': [{'index': 0, 'size': 10}],
- 'disk_bus': 'ide', 'nic_model': 'e1000',
- 'cdrom_bus': 'ide', 'cdrom_index': 2,
- }),
-]
isolinks = {
'debian': {
@@ -181,13 +68,22 @@ def lookup(distro, version):
'defaults' and merging the parameters given for the identified OS. If
known, a link to a remote install CD is added.
"""
- for name, entry in osinfo:
- # Test if this entry is a valid match
- if entry['version'](distro, version):
- params = copy.copy(defaults)
- params['os_distro'] = distro
- params['os_version'] = version
- params.update(entry)
- params['cdrom'] = isolinks.get(distro, {}).get(version, '')
- del params['version'] # Don't pass around the version function
- return (name, params)
+ params = copy.copy(defaults)
+ params['os_distro'] = distro
+ params['os_version'] = version
+ params['cdrom'] = isolinks.get(distro, {}).get(version, '')
+
+ for name, base_version in modern_version_bases.iteritems():
+ if name == distro:
+ params['icon'] = 'images/icon-%s.png' % distro
+ if LooseVersion(version) >= LooseVersion(base_version):
+ params.update(modern_spec)
+ else:
+ params.update(old_spec)
+ break
+ else:
+ params['icon'] = 'images/icon-vm.png'
+ params['os_distro'] = params['os_version'] = "unknown"
+ params.update(old_spec)
+
+ return params
diff --git a/src/kimchi/vmtemplate.py b/src/kimchi/vmtemplate.py
index dd43faa..f92af49 100644
--- a/src/kimchi/vmtemplate.py
+++ b/src/kimchi/vmtemplate.py
@@ -70,7 +70,7 @@ class VMTemplate(object):
# Fetch defaults based on the os distro and version
os_distro = args.get('os_distro', iso_distro)
os_version = args.get('os_version', iso_version)
- name, entry = osinfo.lookup(os_distro, os_version)
+ entry = osinfo.lookup(os_distro, os_version)
self.info.update(entry)
# Override with the passed in parameters
diff --git a/tests/test_osinfo.py b/tests/test_osinfo.py
index f92567d..da3e1d2 100644
--- a/tests/test_osinfo.py
+++ b/tests/test_osinfo.py
@@ -25,16 +25,36 @@ from kimchi.osinfo import *
class OSInfoTests(unittest.TestCase):
def test_default_lookup(self):
- name, entry = lookup(None, None)
- self.assertEquals(name, 'unknown')
+ entry = lookup(None, None)
self.assertEquals('unknown', entry['os_distro'])
self.assertEquals('unknown', entry['os_version'])
self.assertEquals('default', entry['network'])
def test_fedora_lookup(self):
cd = 'http://fedora.mirrors.tds.net/pub/fedora/releases/17/Live/x86_64/Fedora-1...'
- name, entry = lookup('fedora', '17')
- self.assertEquals(name, 'fedora')
+ entry = lookup('fedora', '17')
self.assertEquals(10, entry['disks'][0]['size'])
self.assertEquals(cd, entry['cdrom'])
self.assertEquals('/storagepools/default', entry['storagepool'])
+
+ def test_old_distros(self):
+ old_versions = {'debian': '5.0', 'ubuntu': '7.04', 'opensuse': '10.1',
+ 'centos': '5.1', 'rhel': '5.1', 'fedora': '15'}
+ for distro, version in old_versions.iteritems():
+ entry = lookup(distro, version)
+ self.assertEquals(entry['disk_bus'], 'ide')
+ self.assertEquals(entry['nic_model'], 'e1000')
+
+ def test_modern_bases(self):
+ for distro, version in modern_version_bases.iteritems():
+ entry = lookup(distro, version)
+ self.assertEquals(entry['disk_bus'], 'virtio')
+ self.assertEquals(entry['nic_model'], 'virtio')
+
+ def test_modern_distros(self):
+ old_versions = {'debian': '7.0', 'ubuntu': '12.04', 'opensuse': '12.3',
+ 'centos': '6.4', 'rhel': '6.3', 'fedora': '18'}
+ for distro, version in old_versions.iteritems():
+ entry = lookup(distro, version)
+ self.assertEquals(entry['disk_bus'], 'virtio')
+ self.assertEquals(entry['nic_model'], 'virtio')
--
1.8.3.1
--
project-kimchi mailing list <project-kimchi(a)googlegroups.com>
https://groups.google.com/forum/#!forum/project-kimchi
---
You received this message because you are subscribed to the Google Groups "project-kimchi" group.
To unsubscribe from this group and stop receiving emails from it, send an email to project-kimchi+unsubscribe(a)googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.
10 years, 4 months
