next branch merged into master
by Aline Manera
Hi all,
The next branch were merged into master branch for Wok and Kimchi projects.
The next branch does not exist anymore!
Please, use the master branch for Wok and Kimchi development.
Regards,
Aline Manera
9 years
Wok 2.0 is released!
by Aline Manera
On behalf of everyone who has worked hard on this release, I am pleased
to announce the availability of *Wok 2.0*!
This is the first official release of Wok which was originated from Kimchi.
Wok provides a cherrypy-based web framework with HTML5 support that is extended by
plugins which expose functionality through REST APIs.
The most known Wok plugins are Ginger, Ginger Base and Kimchi.
Among many features, Wok 2.0 includes:
✔ New UI widgets based on Bootstrap
✔ Provide access to Font Awesome and Open Sans fonts
✔ Navigation bar in two levels
✔ Initial support for responsive web design
We have worked hard to ensure that Wok runs well on the most popular
Linux distributions including: Fedora 23, Ubuntu 15.10, openSUSE 13.2,
and RHEL 7.2. Wok uses standard Linux interfaces so it should run well
on many other distributions too.
You can easily grab this release in tarball format or via git:
✔https://github.com/kimchi-project/wok/archive/2.0.0.tar.gz
✔ git clone --recursivehttps://github.com/kimchi-project/wok.git
There are also some packages available at:
✔http://kimchi-project.github.io/wok/downloads/
Go ahead! Give it a try and let us know what you think!
Regards,
Aline Manera
9 years
[PATCH V2] [Kimchi 0/3] 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().
Paulo Vital (3):
Fix test_image_based_template testcase.
Fix test_vm_lifecycle testcase.
fix 2 test_vm_lifecycle testcase
tests/test_model.py | 66 +++++++++++++++++++++++++++++++++++------------------
1 file changed, 44 insertions(+), 22 deletions(-)
--
2.5.0
9 years
[PATCH] [Wok] Minor CSS issues
by sguimaraes943＠gmail.com
From: samhenri <samuel.guimaraes(a)eldorado.org.br>
Fixed even and odd styles with wok-datagrid widget.
Added color variable for Ginger texts (design spec).
Changed label font-size to 1.143em instead of 16px, added correct font-weight.
samhenri (1):
Minor CSS issues
ui/css/src/modules/_datagrid.scss | 21 +++++++++++++++++++--
ui/css/src/modules/_validation.scss | 6 ++++++
ui/css/src/modules/_wok-forms.scss | 12 ++++++++++++
ui/css/src/modules/_wok-variables.scss | 1 +
ui/css/src/wok.scss | 6 ------
5 files changed, 38 insertions(+), 8 deletions(-)
--
1.9.3
9 years
[PATCH][Wok] Change plugins get_list to return only loaded plugins
by Rodrigo Trujillo
When using multiple plugins, it is possible that some plugin has a
problem and is not loaded (like when there is a missing module).
In this cases, Wok is not going to load the plugin in cherrypy
configuration, but plugins API return the missing plugin name.
When this occours, UI becomes broken and it is not possible to use any
other plugin, because Wok UI is blank.
This patch fix this problem, returning only plugins names that were
loaded by Wok.
Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com>
---
src/wok/model/plugins.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/wok/model/plugins.py b/src/wok/model/plugins.py
index 3a5a89e..5072563 100644
--- a/src/wok/model/plugins.py
+++ b/src/wok/model/plugins.py
@@ -19,6 +19,8 @@
# License along with this library; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+import cherrypy
+
from wok.utils import get_enabled_plugins
@@ -27,4 +29,5 @@ class PluginsModel(object):
pass
def get_list(self):
- return [plugin for (plugin, config) in get_enabled_plugins()]
+ return [plugin for (plugin, config) in get_enabled_plugins()
+ if '/plugins/' + plugin in cherrypy.tree.apps.keys()]
--
2.1.0
9 years
[PATCH 1/3][Kimchi] Issue #753: Remove max memory settings from osinfo.py
by Rodrigo Trujillo
VmTemplates 'self.info' is not going to have the parameter
'max_memory', after remove max memory settings from osinfo.
This way, max_memory will not be recorded in objectstore.
Signed-off-by: Rodrigo Trujillo <rodrigo.trujillo(a)linux.vnet.ibm.com>
---
osinfo.py | 21 ---------------------
1 file changed, 21 deletions(-)
diff --git a/osinfo.py b/osinfo.py
index 33757a3..e6553a0 100644
--- a/osinfo.py
+++ b/osinfo.py
@@ -27,9 +27,6 @@ from distutils.version import LooseVersion
from wok.config import PluginPaths
-# In PowerPC, memories must be aligned to 256 MiB
-PPC_MEM_ALIGN = 256
-
SUPPORTED_ARCHS = {'x86': ('i386', 'i686', 'x86_64'),
'power': ('ppc', 'ppc64'),
@@ -88,9 +85,6 @@ modern_version_bases = {'x86': {'debian': '6.0', 'ubuntu': '7.10',
icon_available_distros = [icon[5:-4] for icon in glob.glob1('%s/images/'
% PluginPaths('kimchi').ui_dir, 'icon-*.png')]
-# Max memory 1TB, in KiB
-MAX_MEM_LIM = 1073741824
-
def _get_arch():
for arch, sub_archs in SUPPORTED_ARCHS.iteritems():
@@ -202,24 +196,9 @@ def lookup(distro, version):
params['os_version'] = version
arch = _get_arch()
- # Setting maxMemory of the VM, which will be lesser value between:
- # [ 1TB, (Template Memory * 4), Host Physical Memory.
- # Here, we return 1TB or aligned Host Physical Memory
- if hasattr(psutil, 'virtual_memory'):
- params['max_memory'] = psutil.virtual_memory().total >> 10
- else:
- params['max_memory'] = psutil.TOTAL_PHYMEM >> 10
# set up arch to ppc64 instead of ppc64le due to libvirt compatibility
if params["arch"] == "ppc64le":
params["arch"] = "ppc64"
- # in Power, memory must be aligned in 256MiB
- if (params['max_memory'] >> 10) % PPC_MEM_ALIGN != 0:
- alignment = params['max_memory'] % (PPC_MEM_ALIGN << 10)
- params['max_memory'] -= alignment
-
- # Setting limit to 1TB
- if params['max_memory'] > MAX_MEM_LIM:
- params['max_memory'] = MAX_MEM_LIM
if distro in modern_version_bases[arch]:
if LooseVersion(version) >= LooseVersion(
--
2.1.0
9 years
[PATCH] [Kimchi] Use always flag as a fallback
by Lucio Correia
Since new repositories don't have tags in their git
history yet, git-describe was failing. This fix uses
always flag to return the hash of latest commit as a
fallback to version number.
Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 250dc83..1c5af68 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -157,7 +157,7 @@ uninstall-local:
VERSION:
@if test -d .git; then \
- git describe --abbrev=0 > $@; \
+ git describe --abbrev=0 --always > $@; \
fi
.PHONY: deb install-deb rpm fedora-rpm suse-rpm ChangeLog VERSION
--
1.9.1
9 years
[PATCH] [Wok] Use always flag as a fallback
by Lucio Correia
Since new repositories don't have tags in their git
history yet, git-describe was failing. This fix uses
always flag to return the hash of latest commit as a
fallback to version number.
Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
index 106a577..278bda1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,7 +158,7 @@ uninstall-local:
VERSION:
@if test -d .git; then \
- git describe --abbrev=0 > $@; \
+ git describe --abbrev=0 --always > $@; \
fi
.PHONY: deb install-deb rpm fedora-rpm suse-rpm ChangeLog VERSION
--
1.9.1
9 years
[PATCH V2] [Kimchi] Use always flag as a fallback
by Lucio Correia
Since new repositories don't have tags in their git
history yet, git-describe was failing. This fix uses
always flag to return the hash of latest commit as a
fallback to version number.
Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
---
Makefile.am | 2 +-
build-aux/pkg-version | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 250dc83..1c5af68 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -157,7 +157,7 @@ uninstall-local:
VERSION:
@if test -d .git; then \
- git describe --abbrev=0 > $@; \
+ git describe --abbrev=0 --always > $@; \
fi
.PHONY: deb install-deb rpm fedora-rpm suse-rpm ChangeLog VERSION
diff --git a/build-aux/pkg-version b/build-aux/pkg-version
index 749cf6c..b8b473e 100755
--- a/build-aux/pkg-version
+++ b/build-aux/pkg-version
@@ -44,7 +44,7 @@ AWK_RELEASE='
if [ ! -d .git ]; then
PKG_VERSION=`cat VERSION`
else
- PKG_VERSION=`git describe --tags --match "[0-9]*" || cat VERSION`
+ PKG_VERSION=`git describe --tags --match "[0-9]*" --always || cat VERSION`
fi
if test "x$1" = "x--full"; then
--
1.9.1
9 years
[PATCH V2] [Wok] Use always flag as a fallback
by Lucio Correia
Since new repositories don't have tags in their git
history yet, git-describe was failing. This fix uses
always flag to return the hash of latest commit as a
fallback to version number.
Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com>
---
Makefile.am | 2 +-
build-aux/pkg-version | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index 106a577..278bda1 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -158,7 +158,7 @@ uninstall-local:
VERSION:
@if test -d .git; then \
- git describe --abbrev=0 > $@; \
+ git describe --abbrev=0 --always > $@; \
fi
.PHONY: deb install-deb rpm fedora-rpm suse-rpm ChangeLog VERSION
diff --git a/build-aux/pkg-version b/build-aux/pkg-version
index 749cf6c..b8b473e 100755
--- a/build-aux/pkg-version
+++ b/build-aux/pkg-version
@@ -44,7 +44,7 @@ AWK_RELEASE='
if [ ! -d .git ]; then
PKG_VERSION=`cat VERSION`
else
- PKG_VERSION=`git describe --tags --match "[0-9]*" || cat VERSION`
+ PKG_VERSION=`git describe --tags --match "[0-9]*" --always || cat VERSION`
fi
if test "x$1" = "x--full"; then
--
1.9.1
9 years
