spacewalk-commits December 2011

spacewalk-commits@lists.fedorahosted.org

8 participants
290 discussions

Changes to 'refs/tags/spacewalk-koan-1.6.3-1'
by Miroslav Suchý 06 Dec '11

06 Dec '11

Tag 'spacewalk-koan-1.6.3-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-12-06 15:34 +0000 Tagging package [spacewalk-koan] version [1.6.3-1] in directory [client/tools/spacewalk-koan/]. Changes since spacewalk-backend-1.6.53-1: Miroslav Suchý (2): change build-missing-builds-in-koji.sh for tito 0.4 and upload tar.gz files only once and build only to those tags which are only missing the build Automatic commit of package [spacewalk-koan] release [1.6.3-1]. --- client/tools/spacewalk-koan/spacewalk-koan.spec | 9 ++++ rel-eng/build-missing-builds-in-koji.sh | 44 +++++++++++++----------- rel-eng/packages/spacewalk-koan | 2 - rel-eng/releasers.conf | 25 +++++++++++++ 4 files changed, 59 insertions(+), 21 deletions(-) ---

1 0

client/tools rel-eng/packages
by Miroslav Suchý 06 Dec '11

06 Dec '11

client/tools/spacewalk-koan/spacewalk-koan.spec | 9 ++++++++- rel-eng/packages/spacewalk-koan | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) New commits: commit 95ce2ccfe99799522163db575ae2b8433df0a694 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Tue Dec 6 16:34:07 2011 +0100 Automatic commit of package [spacewalk-koan] release [1.6.3-1]. diff --git a/client/tools/spacewalk-koan/spacewalk-koan.spec b/client/tools/spacewalk-koan/spacewalk-koan.spec index 4c6910f..f27bfd5 100644 --- a/client/tools/spacewalk-koan/spacewalk-koan.spec +++ b/client/tools/spacewalk-koan/spacewalk-koan.spec @@ -3,7 +3,7 @@ Name: spacewalk-koan Group: System Environment/Kernel License: GPLv2 Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz -Version: 1.6.2 +Version: 1.6.3 Release: 1%{?dist} BuildArch : noarch URL: https://fedorahosted.org/spacewalk @@ -47,6 +47,13 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/rhn/actions/ %changelog +* Tue Dec 06 2011 Miroslav Suchý 1.6.3-1 +- fix a rookie mistake (mzazrivec(a)redhat.com) +- IPv6: reprovisioning with static network interface (mzazrivec(a)redhat.com) +- fix TB during re-provisioning with static nic (mzazrivec(a)redhat.com) +- IPv6: routines to determine IPv6 address/netmask (mzazrivec(a)redhat.com) +- IPv6: don't include ::1 as a valid nameserver addr (mzazrivec(a)redhat.com) + * Wed Sep 07 2011 Martin Minar <mminar(a)redhat.com> 1.6.2-1 - 736066 - parse ifconfig output in POSIX locale only (mzazrivec(a)redhat.com) diff --git a/rel-eng/packages/spacewalk-koan b/rel-eng/packages/spacewalk-koan index 0c21c0e..97fd5e3 100644 --- a/rel-eng/packages/spacewalk-koan +++ b/rel-eng/packages/spacewalk-koan @@ -1 +1 @@ -1.6.2-1 client/tools/spacewalk-koan/ +1.6.3-1 client/tools/spacewalk-koan/

1 0

rel-eng/build-missing-builds-in-koji.sh rel-eng/releasers.conf
by Miroslav Suchý 06 Dec '11

06 Dec '11

rel-eng/build-missing-builds-in-koji.sh | 44 ++++++++++++++++++-------------- rel-eng/releasers.conf | 25 ++++++++++++++++++ 2 files changed, 50 insertions(+), 19 deletions(-) New commits: commit f78a2f5a672ee8023e59b0d7290782b03b128d10 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Tue Dec 6 16:07:26 2011 +0100 change build-missing-builds-in-koji.sh for tito 0.4 and upload tar.gz files only once and build only to those tags which are only missing the build diff --git a/rel-eng/build-missing-builds-in-koji.sh b/rel-eng/build-missing-builds-in-koji.sh index 32870a4..0c1cac3 100755 --- a/rel-eng/build-missing-builds-in-koji.sh +++ b/rel-eng/build-missing-builds-in-koji.sh @@ -1,15 +1,8 @@ #!/bin/bash -if [ "$(basename $0)" == "build-missing-builds-in-brew.sh" ] ; then - TAGS="satellite-5.4-rhel-5-candidate" - KOJI_MISSING_BUILD_BREW_ARG="--brew" - TITO_BUILD_ARG="--cvs-release" -else - TAGS="dist-5E-sw-1.6-candidate dist-6E-sw-1.6-candidate dist-f14-sw-1.6-candidate dist-f15-sw-1.6-candidate dist-f16-sw-1.6-candidate" - TITO_BUILD_ARG="--release" - FEDORA_UPLOAD=1 -fi +TAGS="dist-5E-sw-1.6-candidate dist-6E-sw-1.6-candidate dist-f14-sw-1.6-candidate dist-f15-sw-1.6-candidate dist-f16-sw-1.6-candidate" +FEDORA_UPLOAD=1 pushd . >/dev/null pushd `dirname $0`/.. >/dev/null @@ -17,21 +10,34 @@ pushd `dirname $0`/.. >/dev/null # say python to be nice to pipe export PYTHONUNBUFFERED=1 +declare -a PACKAGES + for tag in $TAGS; do rel-eng/koji-missing-builds.py $KOJI_MISSING_BUILD_BREW_ARG --no-extra $tag | \ perl -lne '/^\s+(.+)-.+-.+$/ and print $1' | \ - xargs -I replacestring awk '{print $2}' rel-eng/packages/replacestring -done | sort | uniq | \ -while read package ; do + xargs -I replacestring awk '{print $2}' rel-eng/packages/replacestring \ + | \ + while read package ; do ( - echo Building package in path $package + echo Building package in path $package for $tag cd $package && \ - echo y | ${TITO_PATH}tito build $TITO_BUILD_ARG | \ - awk '/Wrote:.*tar.gz/ {print $2}' | \ - if [ "0$FEDORA_UPLOAD" -eq 1 ] ; then - xargs -I packagepath scp packagepath fedorahosted.org:spacewalk - fi + ${TITO_PATH}tito release $tag && \ + PACKAGES[${#PACKAGES[@]}]=$package ) + done done +if [ "0$FEDORA_UPLOAD" -eq 1 ] ; then + for package in "${PACKAGES[@]}"; do + echo $package + done | sort | uniq |\ + while read package ; do + ( + echo Uploading tgz for path $package + cd $package && LC_ALL=C ${TITO_PATH}tito build --tgz | \ + awk '/Wrote:.*tar.gz/ {print $2}' | \ + xargs -I packagepath scp packagepath fedorahosted.org:spacewalk + ) + done +fi -popd +popd >/dev/null diff --git a/rel-eng/releasers.conf b/rel-eng/releasers.conf index a7f1601..5da56b9 100644 --- a/rel-eng/releasers.conf +++ b/rel-eng/releasers.conf @@ -2,3 +2,28 @@ releaser = tito.release.KojiGitReleaser autobuild_tags = dist-5E-sw-1.6-candidate dist-6E-sw-1.6-candidate dist-f14-sw-1.6-candidate dist-f15-sw-1.6-candidate dist-f16-sw-1.6-candidate git_url = git://git.fedorahosted.org/git/spacewalk.git + +[dist-5E-sw-1.6-candidate] +releaser = tito.release.KojiGitReleaser +autobuild_tags = dist-5E-sw-1.6-candidate +git_url = git://git.fedorahosted.org/git/spacewalk.git + +[dist-6E-sw-1.6-candidate] +releaser = tito.release.KojiGitReleaser +autobuild_tags = dist-6E-sw-1.6-candidate +git_url = git://git.fedorahosted.org/git/spacewalk.git + +[dist-f14-sw-1.6-candidate] +releaser = tito.release.KojiGitReleaser +autobuild_tags = dist-f14-sw-1.6-candidate +git_url = git://git.fedorahosted.org/git/spacewalk.git + +[dist-f15-sw-1.6-candidate] +releaser = tito.release.KojiGitReleaser +autobuild_tags = dist-f15-sw-1.6-candidate +git_url = git://git.fedorahosted.org/git/spacewalk.git + +[dist-f16-sw-1.6-candidate] +releaser = tito.release.KojiGitReleaser +autobuild_tags = dist-f16-sw-1.6-candidate +git_url = git://git.fedorahosted.org/git/spacewalk.git

1 0

Changes to 'refs/tags/spacewalk-backend-1.6.53-1'
by Michael Mraka 06 Dec '11

06 Dec '11

Tag 'spacewalk-backend-1.6.53-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-12-06 13:03 +0000 Tagging package [spacewalk-backend] version [1.6.53-1] in directory [backend/]. Changes since spacewalk-backend-1.6.52-1: Michael Mraka (5): 621166 - let's enable yum_src tuning (via config file) 621166 - notice config file in man page 621166 - reuse YumBase instance from __init__ 676369 - set pkgdir directly not via private API Automatic commit of package [spacewalk-backend] release [1.6.53-1]. --- backend/satellite_tools/repo_plugins/yum_src.py | 16 ++++++++++++---- backend/satellite_tools/spacewalk-repo-sync.sgml | 6 ++++++ backend/spacewalk-backend.spec | 6 +++++- rel-eng/packages/spacewalk-backend | 2 +- 4 files changed, 24 insertions(+), 6 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka 06 Dec '11

06 Dec '11

backend/spacewalk-backend.spec | 6 +++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) New commits: commit 830d92377586508d828b64f4411c0f0627e27b17 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 6 14:03:29 2011 +0100 Automatic commit of package [spacewalk-backend] release [1.6.53-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 103826b..98513ac 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -12,7 +12,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 and Python -Version: 1.6.52 +Version: 1.6.53 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -675,6 +675,10 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Tue Dec 06 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.53-1 +- 676369 - set pkgdir directly not via private API +- 621166 - let's enable yum_src tuning (via config file) + * Tue Dec 06 2011 Miroslav Suchý 1.6.52-1 - IPv6: order network interaces - IPv6: implement macro rhn.system.net_interface.ip6_netmask for config files diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 027a3b5..f41f552 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.6.52-1 backend/ +1.6.53-1 backend/

1 0

4 commits - backend/satellite_tools
by Michael Mraka 06 Dec '11

06 Dec '11

backend/satellite_tools/repo_plugins/yum_src.py | 16 ++++++++++++---- backend/satellite_tools/spacewalk-repo-sync.sgml | 6 ++++++ 2 files changed, 18 insertions(+), 4 deletions(-) New commits: commit d698c2e547dbb51b85c765b025d7331cf085e7a0 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 6 13:46:36 2011 +0100 676369 - set pkgdir directly not via private API diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py index d437565..2a153fd 100644 --- a/backend/satellite_tools/repo_plugins/yum_src.py +++ b/backend/satellite_tools/repo_plugins/yum_src.py @@ -109,7 +109,7 @@ class ContentSource: repo.mirrorlist = url repo.baseurl = [url] repo.basecachedir = self.cache_dir - repo._dirSetAttr('pkgdir', os.path.join(CFG.MOUNT_POINT, CFG.PREPENDED_DIR, '1')) + repo.pkgdir = os.path.join(CFG.MOUNT_POINT, CFG.PREPENDED_DIR, '1') if hasattr(repo, 'base_persistdir'): repo.base_persistdir = self.cache_dir if self.proxy_url is not None: commit 85799c76c24077c3466e965059174f04959e1507 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 6 13:55:53 2011 +0100 621166 - reuse YumBase instance from __init__ diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py index 74e0227..d437565 100644 --- a/backend/satellite_tools/repo_plugins/yum_src.py +++ b/backend/satellite_tools/repo_plugins/yum_src.py @@ -192,9 +192,8 @@ class ContentSource: return selected def _get_package_dependencies(self, sack, packages): - yumbase = yum.YumBase() - yumbase.pkgSack = sack - resolved_deps = yumbase.findDeps(packages) + self.yumbase.pkgSack = sack + resolved_deps = self.yumbase.findDeps(packages) for (pkg,deps) in resolved_deps.items(): for (dep,dep_packages) in deps.items(): packages.extend(dep_packages) commit 725b6b34ee153add2c7ed3db1871362d8342e91d Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 6 12:07:33 2011 +0100 621166 - notice config file in man page diff --git a/backend/satellite_tools/spacewalk-repo-sync.sgml b/backend/satellite_tools/spacewalk-repo-sync.sgml index b19b975..e30f263 100644 --- a/backend/satellite_tools/spacewalk-repo-sync.sgml +++ b/backend/satellite_tools/spacewalk-repo-sync.sgml @@ -59,6 +59,12 @@ Syncs the content from yum repos into Spacewalk or Satellite channels. If the url is not supplied, the tool will look to see what repositories are associated with the specified channel and use those. </para> +<para> + Additional configuration options for yum_src plugin can be placed in + <filename>/etc/rhn/spacewalk-repo-sync/yum.conf</filename>. Don't forget to put + [main] section there. +</para> + </refsect1> <refsect1><title>Options</title> commit 0292816165b447b718edcb7ad3632baffaba8ddb Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Tue Dec 6 11:52:24 2011 +0100 621166 - let's enable yum_src tuning (via config file) anyway yum options for spacewalk-repo-sync should not interfere with machine's yum i.e. /etc/yum.conf; thus separate config file diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py index 67b9189..74e0227 100644 --- a/backend/satellite_tools/repo_plugins/yum_src.py +++ b/backend/satellite_tools/repo_plugins/yum_src.py @@ -18,6 +18,7 @@ import shutil import sys import gzip import os.path +from yum.config import ConfigParser from yum.update_md import UpdateMetadata, UpdateNoticeException, UpdateNotice from yum.yumRepo import YumRepository try: @@ -31,6 +32,8 @@ except ImportError: from spacewalk.satellite_tools.reposync import ContentPackage from spacewalk.common.rhnConfig import CFG, initCFG +YUMSRC_CONF='/etc/rhn/spacewalk-repo-sync/yum.conf' + class YumWarnings: def write(self, s): pass @@ -79,6 +82,11 @@ class ContentSource: repo = None cache_dir = '/var/cache/rhn/reposync/' def __init__(self, url, name): + self.yumbase = yum.YumBase() + self.yumbase.preconf.fn=YUMSRC_CONF + if not os.path.exists(YUMSRC_CONF): + self.yumbase.preconf.fn='/dev/null' + self.configparser = ConfigParser() self._clean_cache(self.cache_dir + name) # read the proxy configuration in /etc/rhn/rhn.conf @@ -94,6 +102,7 @@ class ContentSource: else: self.proxy_url = None repo = yum.yumRepo.YumRepository(name) + repo.populate(self.configparser, name, self.yumbase.conf) self.repo = repo repo.cache = 0 repo.metadata_expire = 0

1 0

Changes to 'refs/tags/spacewalk-backend-1.6.52-1'
by Miroslav Suchý 06 Dec '11

06 Dec '11

Tag 'spacewalk-backend-1.6.52-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-12-06 11:05 +0000 Tagging package [spacewalk-backend] version [1.6.52-1] in directory [backend/]. Changes since spacewalk-web-1.6.32-1: Miroslav Suchý (4): IPv6: implement macro rhn.system.net_interface.ip6_address for config files templates IPv6: implement macro rhn.system.net_interface.ip6_netmask for config files templates IPv6: order network interaces Automatic commit of package [spacewalk-backend] release [1.6.52-1]. --- backend/server/config_common/templated_document.py | 44 +++++++++++++++++++++ backend/server/rhnServer/server_hardware.py | 1 backend/spacewalk-backend.spec | 9 +++- rel-eng/packages/spacewalk-backend | 2 4 files changed, 54 insertions(+), 2 deletions(-) ---

1 0

backend/spacewalk-backend.spec rel-eng/packages
by Miroslav Suchý 06 Dec '11

06 Dec '11

backend/spacewalk-backend.spec | 9 ++++++++- rel-eng/packages/spacewalk-backend | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) New commits: commit c0819e32e5f18713294d2be8bff279873b57b37c Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Tue Dec 6 12:05:01 2011 +0100 Automatic commit of package [spacewalk-backend] release [1.6.52-1]. diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec index 48e2653..103826b 100644 --- a/backend/spacewalk-backend.spec +++ b/backend/spacewalk-backend.spec @@ -12,7 +12,7 @@ Name: spacewalk-backend Summary: Common programs needed to be installed on the Spacewalk servers/proxies Group: Applications/Internet License: GPLv2 and Python -Version: 1.6.51 +Version: 1.6.52 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -675,6 +675,13 @@ rm -f %{rhnconf}/rhnSecret.py* # $Id$ %changelog +* Tue Dec 06 2011 Miroslav Suchý 1.6.52-1 +- IPv6: order network interaces +- IPv6: implement macro rhn.system.net_interface.ip6_netmask for config files + templates +- IPv6: implement macro rhn.system.net_interface.ip6_address for config files + templates + * Mon Dec 05 2011 Miroslav Suchý 1.6.51-1 - IPv6: fix current macros for IPv4 diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend index 3ad7449..027a3b5 100644 --- a/rel-eng/packages/spacewalk-backend +++ b/rel-eng/packages/spacewalk-backend @@ -1 +1 @@ -1.6.51-1 backend/ +1.6.52-1 backend/

1 0

3 commits - backend/server
by Miroslav Suchý 06 Dec '11

06 Dec '11

backend/server/config_common/templated_document.py | 44 +++++++++++++++++++++ backend/server/rhnServer/server_hardware.py | 1 2 files changed, 45 insertions(+) New commits: commit dd080eae98dde6ae7c09f2df63a004331e760100 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Tue Dec 6 11:51:17 2011 +0100 IPv6: order network interaces This is due IPv6, sice we can have more address for one interface name and scope and in configuration files we enumerate the addresses (commits 8234607 and 62a86f3) diff --git a/backend/server/rhnServer/server_hardware.py b/backend/server/rhnServer/server_hardware.py index 85779fb..c9dbc4c 100644 --- a/backend/server/rhnServer/server_hardware.py +++ b/backend/server/rhnServer/server_hardware.py @@ -699,6 +699,7 @@ class NetIfaceAddress(Device): select * from %s where interface_id = :interface_id + order by interface_id """ % self.table) h.execute(interface_id=interface_id) self.db_ifaces = [] commit 62a86f35a42a3c6960bbac777d16dbc59a1c8652 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Tue Dec 6 11:44:57 2011 +0100 IPv6: implement macro rhn.system.net_interface.ip6_netmask for config files templates this macro will return IPv6 netmask diff --git a/backend/server/config_common/templated_document.py b/backend/server/config_common/templated_document.py index 4c18779..f64d25c 100644 --- a/backend/server/config_common/templated_document.py +++ b/backend/server/config_common/templated_document.py @@ -59,6 +59,7 @@ class ServerTemplatedDocument(TemplatedDocument): RHN_PREFIX + 'net_interface.hardware_address' : self.net_intf_hwaddr, RHN_PREFIX + 'net_interface.driver_module' : self.net_intf_module, RHN_PREFIX + 'net_interface.ip6_address' : self.net_intf_ip6addr, + RHN_PREFIX + 'net_interface.ip6_netmask' : self.net_intf_ip6netmask, }) ####################### @@ -141,6 +142,17 @@ class ServerTemplatedDocument(TemplatedDocument): ipv6 = self._get_interface_info_attr(interface_name, 'ipv6') return self._get_interface_address6_attr(ipv6, scope, order, 'address') + def net_intf_ip6netmask(self, interface_name, scope='universe', order=0): + """ get IPv6 netmask + + interface_name is name of interface, e.g. 'eth0' + scope is either 'link', 'universe' or 'host' + order is zero based index as there can be more than one IP address + for given scope and interface + """ + ipv6 = self._get_interface_info_attr(interface_name, 'ipv6') + return self._get_interface_address6_attr(ipv6, scope, order, 'netmask') + def net_intf_hwaddr(self, interface_name): return self._get_interface_info_attr(interface_name, 'hw_addr') commit 82346077ef43a263e8723fa296830f37e8eeb72c Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Tue Dec 6 11:40:26 2011 +0100 IPv6: implement macro rhn.system.net_interface.ip6_address for config files templates this macro will return IPv6 address diff --git a/backend/server/config_common/templated_document.py b/backend/server/config_common/templated_document.py index 58c5b47..4c18779 100644 --- a/backend/server/config_common/templated_document.py +++ b/backend/server/config_common/templated_document.py @@ -58,6 +58,7 @@ class ServerTemplatedDocument(TemplatedDocument): RHN_PREFIX + 'net_interface.broadcast' : self.net_intf_broadcast, RHN_PREFIX + 'net_interface.hardware_address' : self.net_intf_hwaddr, RHN_PREFIX + 'net_interface.driver_module' : self.net_intf_module, + RHN_PREFIX + 'net_interface.ip6_address' : self.net_intf_ip6addr, }) ####################### @@ -129,6 +130,17 @@ class ServerTemplatedDocument(TemplatedDocument): ipv4 = self._get_interface_info_attr(interface_name, 'ipv4') return self._get_interface_address_attr(ipv4, 'broadcast') + def net_intf_ip6addr(self, interface_name, scope='universe', order=0): + """ get IPv6 address + + interface_name is name of interface, e.g. 'eth0' + scope is either 'link', 'universe' or 'host' + order is zero based index as there can be more than one IP address + for given scope and interface + """ + ipv6 = self._get_interface_info_attr(interface_name, 'ipv6') + return self._get_interface_address6_attr(ipv6, scope, order, 'address') + def net_intf_hwaddr(self, interface_name): return self._get_interface_info_attr(interface_name, 'hw_addr') @@ -148,3 +160,23 @@ class ServerTemplatedDocument(TemplatedDocument): return None else: return address.db_ifaces[0][attr] + + def _get_interface_address6_attr(self, address, scope, order, attr): + """ return attribute of given address + + address is list of interfaces + e.g.: [{'scope': 'universe', 'netmask': '64', 'address': '2620:52:0:2223:20c:29ff:fecb:d06e', + 'interface_id': 127}, {'scope': 'link', 'netmask': '64', 'address': + 'fe80::20c:29ff:fecb:d06e', 'interface_id': 127}] + scope is either 'link', 'universe' or 'host' + order is zero based index as there can be more than one IP address + for given scope and interface + attr is attribute, e.g "netmask" + """ + if (address is None): + return None + ifaces = [i for i in address.db_ifaces if (i['scope'] == scope)] + if (order >= len(ifaces)) or (attr not in ifaces[order]): + return None + else: + return ifaces[order][attr]

1 0

Changes to 'refs/tags/spacewalk-web-1.6.32-1'
by Jan Pazdziora 06 Dec '11

06 Dec '11

Tag 'spacewalk-web-1.6.32-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-12-06 10:48 +0000 Tagging package [spacewalk-web] version [1.6.32-1] in directory [web/]. Changes since spacewalk-schema-1.6.38-1: Jan Pazdziora (1): Automatic commit of package [spacewalk-web] release [1.6.32-1]. --- rel-eng/packages/spacewalk-web | 2 +- web/spacewalk-web.spec | 21 ++++++++++++++++++++- 2 files changed, 21 insertions(+), 2 deletions(-) ---

1 0

← Newer
1
...
21
22
23
24
25
26
27
28
29
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits December 2011