X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa.spec;h=b11c0e4f724f059b2313ddc3730e8afea5828dfd;hb=0c228ba1165cda76d90c9c8cc2218a240e10c028;hp=ffc8d7e0aaceb93a0d0a9f7e2a5152f13a7b5f5b;hpb=cfb7a25186abddc815cee3140a2b33bb8d71a9a8;p=sfa.git diff --git a/sfa.spec b/sfa.spec index ffc8d7e0..b11c0e4f 100644 --- a/sfa.spec +++ b/sfa.spec @@ -1,6 +1,6 @@ %define name sfa -%define version 2.0 -%define taglevel 8 +%define version 2.1 +%define taglevel 13 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) @@ -24,7 +24,9 @@ URL: %{SCMURL} Summary: the SFA python libraries Group: Applications/System BuildRequires: make + Requires: python >= 2.5 +Requires: pyOpenSSL >= 0.7 Requires: m2crypto Requires: xmlsec1-openssl-devel Requires: libxslt-python @@ -40,8 +42,10 @@ Requires: python-dateutil Requires: postgresql >= 8.2, postgresql-server >= 8.2 Requires: postgresql-python Requires: python-psycopg2 -Requires: pyOpenSSL >= 0.7 -Requires: myplc-config +# f8=0.4 - f12=0.5 f14=0.6 f16=0.7 +Requires: python-sqlalchemy +Requires: python-migrate +# the eucalyptus aggregate uses this module Requires: python-xmlbuilder # python 2.5 has uuid module added, for python 2.4 we still need it. @@ -57,11 +61,10 @@ Requires: python-xmlbuilder #Requires: python-uuid #%endif -%package plc -Summary: the SFA layer around MyPLC +%package flashpolicy +Summary: SFA support for flash clients Group: Applications/System Requires: sfa -Requires: python-psycopg2 %package client Summary: the SFA experimenter-side CLI @@ -69,8 +72,8 @@ Group: Applications/System Requires: sfa Requires: pyOpenSSL >= 0.7 -%package sfatables -Summary: sfatables policy tool for SFA +%package plc +Summary: the SFA layer around MyPLC Group: Applications/System Requires: sfa @@ -80,8 +83,13 @@ Group: Applications/System Requires: sfa Requires: pyOpenSSL >= 0.6 -%package flashpolicy -Summary: SFA support for flash clients +%package federica +Summary: the SFA layer around Federica +Group: Applications/System +Requires: sfa + +%package sfatables +Summary: sfatables policy tool for SFA Group: Applications/System Requires: sfa @@ -98,25 +106,28 @@ Requires: sfa %description This package provides the python libraries for the PlanetLab implementation of SFA -%description plc -This package implements the SFA interface which serves as a layer -between the existing PlanetLab interfaces and the SFA API. +%description flashpolicy +This package provides support for adobe flash client applications. %description client This package provides the client side of the SFA API, in particular sfi.py, together with other utilities. -%description sfatables -sfatables is a tool for defining access and admission control policies -in an SFA network, in much the same way as iptables is for ip -networks. This is the command line interface to manage sfatables +%description plc +This package implements the SFA interface which serves as a layer +between the existing PlanetLab interfaces and the SFA API. %description cm This package implements the SFA interface which serves as a layer between the existing PlanetLab NodeManager interfaces and the SFA API. -%description flashpolicy -This package provides support for adobe flash client applications. +%description federica +The SFA driver for FEDERICA. + +%description sfatables +sfatables is a tool for defining access and admission control policies +in an SFA network, in much the same way as iptables is for ip +networks. This is the command line interface to manage sfatables %description xmlbuilder This package contains the xmlbuilder python library, packaged for @@ -139,33 +150,33 @@ make VERSIONTAG="%{version}-%{taglevel}" SCMURL="%{SCMURL}" install DESTDIR="$RP rm -rf $RPM_BUILD_ROOT %files -# sfa and sfatables depend on each other. -%{python_sitelib}/sfa +%{python_sitelib}/sfa/__init__.py* +%{python_sitelib}/sfa/trust +%{python_sitelib}/sfa/storage +%{python_sitelib}/sfa/util +%{python_sitelib}/sfa/server +%{python_sitelib}/sfa/methods +%{python_sitelib}/sfa/generic +%{python_sitelib}/sfa/managers +%{python_sitelib}/sfa/importer +%{python_sitelib}/sfa/rspecs +%{python_sitelib}/sfa/client /etc/init.d/sfa %{_bindir}/sfa-start.py* +%{_bindir}/sfaadmin.py* +%{_bindir}/sfaadmin %{_bindir}/keyconvert.py* %{_bindir}/sfa-config-tty %config /etc/sfa/default_config.xml %config (noreplace) /etc/sfa/aggregates.xml %config (noreplace) /etc/sfa/registries.xml -/usr/share/sfa/sfa.sql +/usr/share/sfa/migrations /usr/share/sfa/examples /var/www/html/wsdl/*.wsdl -%files plc -%defattr(-,root,root) -/etc/sfa/pl.rng -/etc/sfa/credential.xsd -/etc/sfa/top.xsd -/etc/sfa/sig.xsd -/etc/sfa/xml.xsd -/etc/sfa/protogeni-rspec-common.xsd -/etc/sfa/topology -%{_bindir}/sfa-import-plc.py* -%{_bindir}/sfa-nuke-plc.py* -%{_bindir}/sfa-clean-peer-records.py* -%{_bindir}/gen-sfa-cm-config.py* -%{_bindir}/sfa-ca.py* +%files flashpolicy +%{_bindir}/sfa_flashpolicy.py* +/etc/sfa/sfa_flashpolicy_config.xml %files client %config (noreplace) /etc/sfa/sfi_config @@ -177,19 +188,31 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/sfascan %{_bindir}/sfadump.py* -%files sfatables -/etc/sfatables/* -%{_bindir}/sfatables -%{python_sitelib}/sfatables +%files plc +%defattr(-,root,root) +%{python_sitelib}/sfa/planetlab +%{python_sitelib}/sfa/openstack +/etc/sfa/pl.rng +/etc/sfa/credential.xsd +/etc/sfa/top.xsd +/etc/sfa/sig.xsd +/etc/sfa/xml.xsd +/etc/sfa/protogeni-rspec-common.xsd +/etc/sfa/topology +%{_bindir}/gen-sfa-cm-config.py* %files cm /etc/init.d/sfa-cm %{_bindir}/sfa_component_setup.py* # cron jobs here -%files flashpolicy -%{_bindir}/sfa_flashpolicy.py* -/etc/sfa/sfa_flashpolicy_config.xml +%files federica +%{python_sitelib}/sfa/federica + +%files sfatables +/etc/sfatables/* +%{_bindir}/sfatables +%{python_sitelib}/sfatables %files xmlbuilder %{python_sitelib}/xmlbuilder @@ -197,18 +220,18 @@ rm -rf $RPM_BUILD_ROOT %files tests %{_datadir}/sfa/tests -### sfa-plc installs the 'sfa' service -%post plc +### sfa installs the 'sfa' service +%post chkconfig --add sfa -%preun plc +%preun if [ "$1" = 0 ] ; then /sbin/service sfa stop || : /sbin/chkconfig --del sfa || : fi -%postun plc -[ "$1" -ge "1" ] && service sfa restart +%postun +[ "$1" -ge "1" ] && { service sfa dbdump ; service sfa restart ; } ### sfa-cm installs the 'sfa-cm' service %post cm @@ -224,6 +247,117 @@ fi [ "$1" -ge "1" ] && service sfa-cm restart || : %changelog +* Wed Jul 11 2012 Thierry Parmentelat - sfa-2.1-13 +- bugfix that prevented to call 'sfi create' - (was broken in sfa-2.1-12) +- sfi to remove expired credentials + +* Tue Jul 10 2012 Tony Mack - sfa-2.1-12 +- Update Openstack driver to support Essex release/ +- Fix authority xrn bug. + + +* Thu Jun 07 2012 Thierry Parmentelat - sfa-2.1-11 +- review packaging - site-packages/planetlab now come with sfa-plc +- new package sfa-federica +- clientbin moved one step upwards + +* Wed Jun 6 2012 Tony Mack - sfa-2.1-10 +- fix bug in sfi update() + +* Sun Jun 03 2012 Thierry Parmentelat - sfa-2.1-9 +- fix broken sfa.util.xrn class for lowercase + +* Sat Jun 02 2012 Thierry Parmentelat - sfa-2.1-8 +- new 'void' generic_flavour for running in registry-only mode +- first shot at refactoring importers - probably needs more work +- openstack: various enhancements +- sfi interface to registry not based on xml files anymore +- sfi show sorts result on record key +- bugfix in sfa update on users with a pl-backed registry + +* Mon May 14 2012 Thierry Parmentelat - sfa-2.1-7 +- renamed sfa/plc into sfa/planetlab +- plxrn moved in sfa/planetlab as well +- bugfix for sfaadmin reg update --pi <> + +* Sat May 12 2012 Thierry Parmentelat - sfa-2.1-6 +- native data model now has a authority x user (PI) relationship +- no call to 'augment_records_with_testbed_info' for GetCredential +- which means, registry can now be used without an underlying testbed +- reviewed code about relationships b/w objects and related in pl driver +- reviewed PL import wrt roles and pis +- removed mentions to is_enabled in driver +- small changes in update_relation* in driver interface +- sfaadmin: can create authorities and attach pi users to them +- sfaadmin: categories can be abbreviated +- sfi list and sfaadmin list have a new -r/--recursive option +- this means that List now supports an (optional) 'options' argument +- sfi config can display config vars +- sfaadmin code in sfa.client + /usr/bin/sfaadmin shortcut + +* Mon Apr 16 2012 Tony Mack - sfa-2.1-5 +- make sync now supports vserver or lxc. +- Added slice expiration and login info to SliverStatus response. +- Fixed CreateSliver bug that causes the method to fail if any node element is missing + the 'component_name' attribute. +- Fixed various bugs that caused SFA to generate invalid or incorrect sliver ids. + +* Tue Mar 20 2012 Tony Mack - sfa-2.1-4 +- Introduced new administrative command line script, sfaadmin.py. Removed various single + purpose scripts and migrated their functionality into sfaadmin.py. +- Refactored Registry import scripts. +- Removed SQLAlchemy dependency from sfi.py. +- Fixed bugs in sfi.py +- Registry, Aggregate and SliceManager now support the OpenStack framework. + +* Fri Feb 24 2012 Thierry Parmentelat - sfa-2.1-3 +- slice x researcher rel. in database, +- plimporter to maintain that, as well as user.email, and more robust +- ongoing draft for sfaadmin tool +- support for a federica driver +- support for a nova/euca driver +- no more sfa-clean-peer-records script + +* Wed Feb 08 2012 Thierry Parmentelat - sfa-2.1-2 +- registry database has user's keys and mail (known as v0 for migrate) +- pl importer properly maintains user's keys and mail +- pl driver now to handle 'role' when adding person record (exp.) +- first draft of federica driver with config section +- SFA_GENERIC_FLAVOUR in usual variables for sfa-config-tty +- plus, from master as of tag merged-in-sfa-2.1-2: +- disk_image revisited +- new nova_shell nova_driver & various tweaks for openstack + +* Fri Jan 27 2012 Thierry Parmentelat - sfa-2.1-1 +- uses sqlalchemy and related migrate +- thorough migration and upgrade scheme +- sfa-import.py and sfa-nuke.py (no more -plc), uses FLAVOUR +- trashed dbinfo stuff in auth hierarchy +- data model still has little more than plain records +- checkpoint tag, not yet intended for release + +* Wed Jan 25 2012 Tony Mack - sfa-2.0-10 +- client: added -R --raw sfi cmdline option that displays raw server response. +- client: request GENI RSpec by default. +- server: remove database dependencies from sfa.server.sfaapi. +- server: increased default credential lifetime to 31 days. +- bugfix: fixed bug in sfa.storage.record.SfaRecord.delete(). +- bugfix: fixed server key path in sfa.server.sfa-clean-peer-records. +- bugfix: fixed bug in sfa.server.sfa-start.install_peer_certs(). + +* Sat Jan 7 2012 Tony Mack - sfa-2.0-9 +- bugfix: 'geni_api' should be in the top level struct, not the code struct +- bugfix: Display the correct host and port in 'geni_api_versions' field of the GetVersion + output returned by the Aggregate Manager. +- bugfix: sfa.util.sfatime now handles numeric string inputs correctly. +- bugfix: sfa.util.sfatime.datetime_to_epoch() returns integers instead of doubles. +- bugfix: Fixed bug that prevented the rspec parser from identifying an rspec's schema when + there is extra whitespace in the schemaLocation field. +- bugfix: Fixed bug that caused PlanetLab initscripts from showing up in the PGv2 and GENIv3 + advertisement rspecs. +- bugfix: RSpec element should contain the 'username' attribute. +- bugfix: Use sfa.util.plxrn.PlXrn to parse the login_base (authority) out of a urn. + * Wed Jan 4 2012 Tony Mack - sfa-2.0-8 - bugfix: Fixed a bug in the sfa-import-plc.py script that caused the script to exit when it encountered a user with an invalid public key.