- Kimchi-devel - oVirt List Archives

[PATCH 1/3][Kimchi] Issue #753: Remove max memory settings from osinfo.py
by Rodrigo Trujillo 16 Dec '15

16 Dec '15

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

2 3

[PATCH] [Kimchi] Use always flag as a fallback
by Lucio Correia 16 Dec '15

16 Dec '15

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

2 2

[PATCH] [Wok] Use always flag as a fallback
by Lucio Correia 16 Dec '15

16 Dec '15

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

3 4

[PATCH V2] [Kimchi] Use always flag as a fallback
by Lucio Correia 16 Dec '15

16 Dec '15

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

1 0

[PATCH V2] [Wok] Use always flag as a fallback
by Lucio Correia 16 Dec '15

16 Dec '15

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

1 0

[PATCH] Issue #9: Making wok.message closeable even if container/node for message is given.
by archus＠linux.vnet.ibm.com 16 Dec '15

16 Dec '15

From: Archana Singh <archus(a)linux.vnet.ibm.com> Modified code to have one more paramter as closeable, if passed with value as true then it add the close button to message node. Otherwise if not passed or passed with value false then there is no change in previous behaviour. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- ui/js/src/wok.message.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ui/js/src/wok.message.js b/ui/js/src/wok.message.js index c74101e..5f5759e 100644 --- a/ui/js/src/wok.message.js +++ b/ui/js/src/wok.message.js @@ -18,14 +18,14 @@ * limitations under the License. */ -wok.message = function(msg, level, node) { +wok.message = function(msg, level, node, closeable) { "use strict"; var container = node || $('#alert-fields'); if ($(container).size() < 1) { container = $('<div id="alert-fields"/>').appendTo($('#alert-container')); } var message = '<div role="alert" class="alert ' + (level || '') + ' alert-dismissible fade in" style="display: none;">'; - if(!node) { + if(!node || closeable) { message += '<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true"><i class="fa fa-times-circle"></i></span></button>'; } message += msg; @@ -47,20 +47,20 @@ wok.message = function(msg, level, node) { }, 10000); }; -wok.message.warn = function(msg, node) { +wok.message.warn = function(msg, node, closeable) { "use strict"; - wok.message(msg, 'alert-warning', node); + wok.message(msg, 'alert-warning', node, closeable); }; -wok.message.error = function(msg, node) { +wok.message.error = function(msg, node, closeable) { "use strict"; - wok.message(msg, 'alert-danger', node); + wok.message(msg, 'alert-danger', node, closeable); }; wok.message.error.code = function(code) { "use strict"; var msg = code + ": " + i18n[code]; wok.message(msg, 'alert-danger'); }; -wok.message.success = function(msg, node) { +wok.message.success = function(msg, node, closeable) { "use strict"; - wok.message(msg, 'alert-success', node); + wok.message(msg, 'alert-success', node, closeable); }; -- 2.1.0

2 2

[PATCH] [Wok] Issue #9: Making wok.message closeable even if container/node for message is given.
by archus＠linux.vnet.ibm.com 16 Dec '15

16 Dec '15

From: Archana Singh <archus(a)linux.vnet.ibm.com> Modified code to have one more paramter as closeable, if passed with value as true then it add the close button to message node. Otherwise if not passed or passed with value false then there is no change in previous behaviour. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- ui/js/src/wok.message.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ui/js/src/wok.message.js b/ui/js/src/wok.message.js index c74101e..5f5759e 100644 --- a/ui/js/src/wok.message.js +++ b/ui/js/src/wok.message.js @@ -18,14 +18,14 @@ * limitations under the License. */ -wok.message = function(msg, level, node) { +wok.message = function(msg, level, node, closeable) { "use strict"; var container = node || $('#alert-fields'); if ($(container).size() < 1) { container = $('<div id="alert-fields"/>').appendTo($('#alert-container')); } var message = '<div role="alert" class="alert ' + (level || '') + ' alert-dismissible fade in" style="display: none;">'; - if(!node) { + if(!node || closeable) { message += '<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true"><i class="fa fa-times-circle"></i></span></button>'; } message += msg; @@ -47,20 +47,20 @@ wok.message = function(msg, level, node) { }, 10000); }; -wok.message.warn = function(msg, node) { +wok.message.warn = function(msg, node, closeable) { "use strict"; - wok.message(msg, 'alert-warning', node); + wok.message(msg, 'alert-warning', node, closeable); }; -wok.message.error = function(msg, node) { +wok.message.error = function(msg, node, closeable) { "use strict"; - wok.message(msg, 'alert-danger', node); + wok.message(msg, 'alert-danger', node, closeable); }; wok.message.error.code = function(code) { "use strict"; var msg = code + ": " + i18n[code]; wok.message(msg, 'alert-danger'); }; -wok.message.success = function(msg, node) { +wok.message.success = function(msg, node, closeable) { "use strict"; - wok.message(msg, 'alert-success', node); + wok.message(msg, 'alert-success', node, closeable); }; -- 2.1.0

2 1

[PATCH] [Wok] Issue #9: Making wok.message closeable even if container/node for message is given.
by archus＠linux.vnet.ibm.com 16 Dec '15

16 Dec '15

From: Archana Singh <archus(a)linux.vnet.ibm.com> Modified code to have one more paramter as closeable, if passed with value as true then it add the close button to message node. Otherwise if not passed or passed with value false then there is no change in previous behaviour. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- ui/js/src/wok.message.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ui/js/src/wok.message.js b/ui/js/src/wok.message.js index c74101e..5f5759e 100644 --- a/ui/js/src/wok.message.js +++ b/ui/js/src/wok.message.js @@ -18,14 +18,14 @@ * limitations under the License. */ -wok.message = function(msg, level, node) { +wok.message = function(msg, level, node, closeable) { "use strict"; var container = node || $('#alert-fields'); if ($(container).size() < 1) { container = $('<div id="alert-fields"/>').appendTo($('#alert-container')); } var message = '<div role="alert" class="alert ' + (level || '') + ' alert-dismissible fade in" style="display: none;">'; - if(!node) { + if(!node || closeable) { message += '<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true"><i class="fa fa-times-circle"></i></span></button>'; } message += msg; @@ -47,20 +47,20 @@ wok.message = function(msg, level, node) { }, 10000); }; -wok.message.warn = function(msg, node) { +wok.message.warn = function(msg, node, closeable) { "use strict"; - wok.message(msg, 'alert-warning', node); + wok.message(msg, 'alert-warning', node, closeable); }; -wok.message.error = function(msg, node) { +wok.message.error = function(msg, node, closeable) { "use strict"; - wok.message(msg, 'alert-danger', node); + wok.message(msg, 'alert-danger', node, closeable); }; wok.message.error.code = function(code) { "use strict"; var msg = code + ": " + i18n[code]; wok.message(msg, 'alert-danger'); }; -wok.message.success = function(msg, node) { +wok.message.success = function(msg, node, closeable) { "use strict"; - wok.message(msg, 'alert-success', node); + wok.message(msg, 'alert-success', node, closeable); }; -- 2.1.0

2 1

[PATCH] [Wok] Issue #9: Making wok.message closeable even if container/node for message is given.
by archus＠linux.vnet.ibm.com 16 Dec '15

16 Dec '15

From: Archana Singh <archus(a)linux.vnet.ibm.com> Modified code to have one more paramter as closeable, if passed with value as true then it add the close button to message node. Otherwise if not passed or passed with value false then there is no change in previous behaviour. Signed-off-by: Archana Singh <archus(a)linux.vnet.ibm.com> --- ui/js/src/wok.message.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/ui/js/src/wok.message.js b/ui/js/src/wok.message.js index c74101e..5f5759e 100644 --- a/ui/js/src/wok.message.js +++ b/ui/js/src/wok.message.js @@ -18,14 +18,14 @@ * limitations under the License. */ -wok.message = function(msg, level, node) { +wok.message = function(msg, level, node, closeable) { "use strict"; var container = node || $('#alert-fields'); if ($(container).size() < 1) { container = $('<div id="alert-fields"/>').appendTo($('#alert-container')); } var message = '<div role="alert" class="alert ' + (level || '') + ' alert-dismissible fade in" style="display: none;">'; - if(!node) { + if(!node || closeable) { message += '<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true"><i class="fa fa-times-circle"></i></span></button>'; } message += msg; @@ -47,20 +47,20 @@ wok.message = function(msg, level, node) { }, 10000); }; -wok.message.warn = function(msg, node) { +wok.message.warn = function(msg, node, closeable) { "use strict"; - wok.message(msg, 'alert-warning', node); + wok.message(msg, 'alert-warning', node, closeable); }; -wok.message.error = function(msg, node) { +wok.message.error = function(msg, node, closeable) { "use strict"; - wok.message(msg, 'alert-danger', node); + wok.message(msg, 'alert-danger', node, closeable); }; wok.message.error.code = function(code) { "use strict"; var msg = code + ": " + i18n[code]; wok.message(msg, 'alert-danger'); }; -wok.message.success = function(msg, node) { +wok.message.success = function(msg, node, closeable) { "use strict"; - wok.message(msg, 'alert-success', node); + wok.message(msg, 'alert-success', node, closeable); }; -- 2.1.0

2 1

[PATCH] [Wok] Use correct gettext package for building
by Lucio Correia 16 Dec '15

16 Dec '15

The correct gettext package needs to be installed in each distro in order autogen does not show the following error messages: warning: macro 'AM_GNU_GETTEXT' not found in library warning: macro 'AM_GNU_GETTEXT_VERSION' not found in library Signed-off-by: Lucio Correia <luciojhc(a)linux.vnet.ibm.com> --- docs/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/README.md b/docs/README.md index 1965960..5a2e7c5 100644 --- a/docs/README.md +++ b/docs/README.md @@ -49,7 +49,7 @@ Install Dependencies **For Fedora and RHEL:** - $ sudo yum install gcc make autoconf automake gettext git \ + $ sudo yum install gcc make autoconf automake gettext-devel git \ python-cherrypy python-cheetah python-imaging\ PyPAM m2crypto python-jsonschema rpm-build \ python-psutil python-ldap python-lxml \ -- 1.9.1

3 2