[PATCH] [Wok 0/3] Multiple fixes
by Aline Manera
Aline Manera (3):
Bug fix: Make /tabs URI generic to be used by any plugin
Bug fix: Respect user request while building the UI
Fix bug #6: Proper load help page
src/wok/root.py | 15 ++--
ui/js/src/wok.main.js | 177 +++++++++++++++++++++++-----------------------
ui/pages/wok-ui.html.tmpl | 6 +-
3 files changed, 101 insertions(+), 97 deletions(-)
--
2.5.0
8 years, 11 months
[PATCH] [Wok V2] Update README to use --remote to update submodules
by Aline Manera
Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
---
docs/README.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/docs/README.md b/docs/README.md
index aa982f5..1965960 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -168,19 +168,19 @@ new plugins. Also, by default, Wok is linked to Kimchi (Virtualization
To clone Kimchi source code, execute:
$ cd src/wok/plugins/kimchi
- $ git submodule init
- $ git submodule update
+ $ git submodule update --init --remote
To clone Ginger source code, execute:
$ cd src/wok/plugins/ginger
- $ git submodule init
- $ git submodule update
+ $ git submodule update --init --remote
To automatically clone all plugins linked with Wok, use the following git
command when cloning Wok project:
$ git clone --recursive https://github.com/kimchi-project/wok.git
+ $ cd wok
+ $ git submodule update --remote
Participating
--
2.5.0
8 years, 11 months
[PATCH] [Kimchi 0/2] Docs update
by Aline Manera
Aline Manera (2):
Remove wok dependency from README
Update openSUSE version in the README file
docs/README.md | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
--
2.5.0
8 years, 11 months
[PATCH][Kimchi] Fix disk creation when pool is netfs
by Ramon Medeiros
Instead of add io=native for all disks, add only if disk is in a netfs
pool.
Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com>
---
vmtemplate.py | 2 +-
xmlutils/disk.py | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/vmtemplate.py b/vmtemplate.py
index b90f221..1162cf2 100644
--- a/vmtemplate.py
+++ b/vmtemplate.py
@@ -213,7 +213,7 @@ class VMTemplate(object):
img = "%s-%s.img" % (vm_uuid, params['index'])
storage_path = self._get_storage_path(disk['pool']['name'])
params['path'] = os.path.join(storage_path, img)
-
+ params['pool'] = disk['pool']
disks_xml += get_disk_xml(params)[1]
return unicode(disks_xml, 'utf-8')
diff --git a/xmlutils/disk.py b/xmlutils/disk.py
index 2ed2ef4..7fed9cf 100644
--- a/xmlutils/disk.py
+++ b/xmlutils/disk.py
@@ -53,7 +53,9 @@ def get_disk_xml(params):
driver = E.driver(name='qemu', type=params['format'])
if params['type'] != 'cdrom':
driver.set('cache', 'none')
- driver.set("io", "native")
+
+ if params['pool']['type'] == "netfs":
+ driver.set("io", "native")
disk.append(driver)
--
2.1.0
8 years, 11 months
[PATCH] [Kimchi] Add ginger-base as Kimchi dependency
by Aline Manera
Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
---
contrib/DEBIAN/control.in | 1 +
contrib/kimchi.spec.fedora.in | 1 +
contrib/kimchi.spec.suse.in | 1 +
3 files changed, 3 insertions(+)
diff --git a/contrib/DEBIAN/control.in b/contrib/DEBIAN/control.in
index ba528a1..40e7727 100644
--- a/contrib/DEBIAN/control.in
+++ b/contrib/DEBIAN/control.in
@@ -4,6 +4,7 @@ Section: base
Priority: optional
Architecture: all
Depends: wok,
+ ginger-base,
python-imaging,
python-configobj,
websockify,
diff --git a/contrib/kimchi.spec.fedora.in b/contrib/kimchi.spec.fedora.in
index d1e0046..ebf102c 100644
--- a/contrib/kimchi.spec.fedora.in
+++ b/contrib/kimchi.spec.fedora.in
@@ -8,6 +8,7 @@ Group: System Environment/Base
License: LGPL/ASL2
Source0: %{name}-%{version}.tar.gz
Requires: wok
+Requires: ginger-base
Requires: qemu-kvm
Requires: gettext
Requires: libvirt
diff --git a/contrib/kimchi.spec.suse.in b/contrib/kimchi.spec.suse.in
index 640ade9..3cec7f4 100644
--- a/contrib/kimchi.spec.suse.in
+++ b/contrib/kimchi.spec.suse.in
@@ -8,6 +8,7 @@ Group: System Environment/Base
License: LGPL/ASL2
Source0: %{name}-%{version}.tar.gz
Requires: wok
+Requires: ginger-base
Requires: kvm
Requires: gettext-tools
Requires: libvirt
--
2.5.0
8 years, 11 months
[PATCH] [Kimchi 0/5] Kimchi testcases fixes
by pvital＠linux.vnet.ibm.com
From: Paulo Vital <pvital(a)linux.vnet.ibm.com>
This patchset fixes some Kimchi testcases were failling or finishing
with errors in Fedora 23 host. There're 3 tests failling at this moment:
2 tests in test_edit_vm() and test_vlan_tag_bridge().
The solution for "Fix test_async_tasks testcase." depends on the WOK patch
"Create utils method get_task_id()" to be applied before.
Paulo Vital (5):
Fix range for network of NAT and isolated types.
Fix test_image_based_template testcase.
Fix test_async_tasks testcase.
Fix test_vm_lifecycle testcase.
fix 2 test_vm_lifecycle testcase
model/networks.py | 2 +-
tests/test_model.py | 79 +++++++++++++++++++++++++++++++++++++----------------
2 files changed, 56 insertions(+), 25 deletions(-)
--
2.5.0
8 years, 11 months
[Kimchi v3] Fix disk creation when pool is netfs
by Ramon Medeiros
Instead of add io=native for all disks, add only if disk is in a netfs
pool.
Changes:
v2:
Instead of passing the complete pool information, pass just pool type.
v3:
Use .get to retrieve pool_type (this will avoid breaking when pool_type is not available)
Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com>
---
vmtemplate.py | 2 +-
xmlutils/disk.py | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/vmtemplate.py b/vmtemplate.py
index b6e9431..5c6a8d8 100644
--- a/vmtemplate.py
+++ b/vmtemplate.py
@@ -213,7 +213,7 @@ class VMTemplate(object):
img = "%s-%s.img" % (vm_uuid, params['index'])
storage_path = self._get_storage_path(disk['pool']['name'])
params['path'] = os.path.join(storage_path, img)
-
+ params['pool_type'] = disk['pool']['type']
disks_xml += get_disk_xml(params)[1]
return unicode(disks_xml, 'utf-8')
diff --git a/xmlutils/disk.py b/xmlutils/disk.py
index 2ed2ef4..9e6d8fb 100644
--- a/xmlutils/disk.py
+++ b/xmlutils/disk.py
@@ -53,7 +53,9 @@ def get_disk_xml(params):
driver = E.driver(name='qemu', type=params['format'])
if params['type'] != 'cdrom':
driver.set('cache', 'none')
- driver.set("io", "native")
+
+ if params.get('pool_type') == "netfs":
+ driver.set("io", "native")
disk.append(driver)
--
2.1.0
8 years, 11 months
[PATCH v2][Kimchi] Fix disk creation when pool is netfs
by Ramon Medeiros
Instead of add io=native for all disks, add only if disk is in a netfs
pool.
Signed-off-by: Ramon Medeiros <ramonn(a)linux.vnet.ibm.com>
Changes:
v2:
Instead of passing the complete pool information, pass just pool type.
---
vmtemplate.py | 2 +-
xmlutils/disk.py | 4 +++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/vmtemplate.py b/vmtemplate.py
index b90f221..6299a0a 100644
--- a/vmtemplate.py
+++ b/vmtemplate.py
@@ -213,7 +213,7 @@ class VMTemplate(object):
img = "%s-%s.img" % (vm_uuid, params['index'])
storage_path = self._get_storage_path(disk['pool']['name'])
params['path'] = os.path.join(storage_path, img)
-
+ params['pool_type'] = disk['pool']['type']
disks_xml += get_disk_xml(params)[1]
return unicode(disks_xml, 'utf-8')
diff --git a/xmlutils/disk.py b/xmlutils/disk.py
index 2ed2ef4..a2035cb 100644
--- a/xmlutils/disk.py
+++ b/xmlutils/disk.py
@@ -53,7 +53,9 @@ def get_disk_xml(params):
driver = E.driver(name='qemu', type=params['format'])
if params['type'] != 'cdrom':
driver.set('cache', 'none')
- driver.set("io", "native")
+
+ if params['pool_type'] == "netfs":
+ driver.set("io", "native")
disk.append(driver)
--
2.1.0
8 years, 11 months
[PATCH][Kimchi] Fix issue #774 - Invert keys and values in storage volumes boxes
by Rodrigo Trujillo
Move fields to the right position.
Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com>
---
ui/pages/storage.html.tmpl | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/ui/pages/storage.html.tmpl b/ui/pages/storage.html.tmpl
index 9f2a978..d11f10c 100644
--- a/ui/pages/storage.html.tmpl
+++ b/ui/pages/storage.html.tmpl
@@ -161,20 +161,20 @@
</div>
<ul class="volume-data">
<li>
- <span class="value" title="{format}">{format}</span>
<span class="key">$_("Format")</span>
+ <span class="value" title="{format}">{format}</span>
</li>
<li>
- <span class="value" title="{type}">{type}</span>
<span class="key">$_("Type")</span>
+ <span class="value" title="{type}">{type}</span>
</li>
<li>
- <span class="value" title="{allocation}">{allocation}</span>
<span class="key">$_("Allocation")</span>
+ <span class="value" title="{allocation}">{allocation}</span>
</li>
<li>
- <span class="value" title="{capacity}">{capacity}</span>
<span class="key">$_("Capacity")</span>
+ <span class="value" title="{capacity}">{capacity}</span>
</li>
</ul>
</div>
@@ -195,4 +195,4 @@
</script>
<div id="modalWindow" class="modal fade storage-modal" tabindex="-1" role="dialog" aria-labelledby="storageModalLabel" aria-hidden="true"> </div>
</body>
-</html>
\ No newline at end of file
+</html>
--
2.1.0
8 years, 11 months
[PATCH] [Wok] Update README to use --remote to update submodules
by Aline Manera
Signed-off-by: Aline Manera <alinefm(a)linux.vnet.ibm.com>
---
docs/README.md | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/docs/README.md b/docs/README.md
index aa982f5..952e7c5 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -168,19 +168,18 @@ new plugins. Also, by default, Wok is linked to Kimchi (Virtualization
To clone Kimchi source code, execute:
$ cd src/wok/plugins/kimchi
- $ git submodule init
- $ git submodule update
+ $ git submodule update --init --remote
To clone Ginger source code, execute:
$ cd src/wok/plugins/ginger
- $ git submodule init
- $ git submodule update
+ $ git submodule update --init --remote
To automatically clone all plugins linked with Wok, use the following git
command when cloning Wok project:
$ git clone --recursive https://github.com/kimchi-project/wok.git
+ $ git submodule update --remote
Participating
--
2.5.0
8 years, 11 months
