X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa.spec;h=963abef04d8f411e8834abd0cc6d9ab1aac58ed6;hb=862dfa7f7b8cce8c17e80c42aedd8d500ea86cb6;hp=9ef697df11ca5f9f5bbda85d0163f2392494936f;hpb=9b9ffbbb64ae96d969005cffd1d65aa993731f56;p=sfa.git diff --git a/sfa.spec b/sfa.spec index 9ef697df..963abef0 100644 --- a/sfa.spec +++ b/sfa.spec @@ -1,5 +1,5 @@ %define name sfa -%define version 2.0 +%define version 2.1 %define taglevel 0 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} @@ -24,7 +24,10 @@ URL: %{SCMURL} Summary: the SFA python libraries Group: Applications/System BuildRequires: make + +Requires: myplc-config Requires: python >= 2.5 +Requires: pyOpenSSL >= 0.7 Requires: m2crypto Requires: xmlsec1-openssl-devel Requires: libxslt-python @@ -32,7 +35,7 @@ Requires: python-ZSI # for uuidgen - used in db password generation # on f8 this actually comes with e2fsprogs, go figure Requires: util-linux-ng -# xmlbuilder depends on lxml +# xmlbuilder depends on lxml Requires: python-lxml Requires: python-setuptools Requires: python-dateutil @@ -40,8 +43,11 @@ 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. # we can't really check for if we can load uuid as a python module, @@ -84,6 +90,11 @@ Summary: SFA support for flash clients Group: Applications/System Requires: sfa +%package xmlbuilder +Summary: third-party xmlbuilder tool +Group: Applications/System +Provides: python-xmlbuilder + %package tests Summary: unit tests suite for SFA Group: Applications/System @@ -108,10 +119,14 @@ networks. This is the command line interface to manage sfatables %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 xmlbuilder +This package contains the xmlbuilder python library, packaged for +convenience as it is not supported by fedora + %description tests Provides some binary unit tests in /usr/share/sfa/tests @@ -124,9 +139,6 @@ make VERSIONTAG="%{version}-%{taglevel}" SCMURL="%{SCMURL}" %install rm -rf $RPM_BUILD_ROOT make VERSIONTAG="%{version}-%{taglevel}" SCMURL="%{SCMURL}" install DESTDIR="$RPM_BUILD_ROOT" -rm -rf $RPM_BUILD_ROOT/%{python_sitelib}/*egg-info -# this gets duplicated -rm -rf $RPM_BUILD_ROOT/%{python_sitelib}/sfa/storage/sfa.sql %clean rm -rf $RPM_BUILD_ROOT @@ -134,7 +146,6 @@ rm -rf $RPM_BUILD_ROOT %files # sfa and sfatables depend on each other. %{python_sitelib}/sfa -%{python_sitelib}/xmlbuilder /etc/init.d/sfa %{_bindir}/sfa-start.py* %{_bindir}/keyconvert.py* @@ -142,7 +153,8 @@ rm -rf $RPM_BUILD_ROOT %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 @@ -162,10 +174,12 @@ rm -rf $RPM_BUILD_ROOT %files client %config (noreplace) /etc/sfa/sfi_config -%{_bindir}/sfi* -%{_bindir}/getNodes.py* -%{_bindir}/getRecord.py* +%{_bindir}/sfi*.py* +%{_bindir}/sfi +%{_bindir}/get*.py* %{_bindir}/setRecord.py* +%{_bindir}/sfascan.py* +%{_bindir}/sfascan %{_bindir}/sfadump.py* %files sfatables @@ -182,21 +196,24 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/sfa_flashpolicy.py* /etc/sfa/sfa_flashpolicy_config.xml +%files xmlbuilder +%{python_sitelib}/xmlbuilder + %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 @@ -212,6 +229,88 @@ fi [ "$1" -ge "1" ] && service sfa-cm restart || : %changelog +* 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. +- server: imporved logging in sfa-import-plc.py + +* Tue Jan 3 2012 Tony Mack - sfa-2.0-7 +- bugfix: Fixed appending public keys in CreateSliver +- bugfix: Fixed various bugs in the PGv2/GENIv3 request, advertisement and manifest rspecs. +- client: -c --current option allows users to request the current/uncached rspec. +- server: Added 'geni_api_versions' field to GetVersion() output. +- server: Moved PLC specific code from sfa.importer.sfaImport to sfa.importer.sfa-import-plc. + +* Fri Dec 16 2011 Thierry Parmentelat - sfa-2.0-6 +- bugfix: sfi was not sending call_id with ListResources to v2 servers +- SFA_API_DEBUG replaced with SFA_API_LOGLEVEL +- PlDriver / PlShell : PLCAPI methods now explicitly go to the shell + +* Wed Dec 14 2011 Thierry Parmentelat - sfa-2.0-5 +- client: sfi -a / -p deprecated (use -s instead) +- client: sfi cleaned up +- client: sfi has backward support for APIv1 aggregates again +- server: only APIv2 is supported and should be rather strict +- server: settings for turning on/off caching in sm or am +- server: plc-dependant code has moved from aggregate to pldriver +- server: driver interface extended accordingly + +* Fri Dec 09 2011 Thierry Parmentelat - sfa-2.0-4 +- screwed up previous tag + +* Fri Dec 09 2011 Thierry Parmentelat - sfa-2.0-3 +- client side revisited with a bootstrap library +- client side has a new source layout +- various (nasty) bug fixes wrt options and call_id + +* Tue Dec 06 2011 Thierry Parmentelat - sfa-2.0-2 +- various fixes in rspecs for sfav1&slice tags +- uses 'geni_rspec_version' and not just 'rspec_version' +- example flavour for the max testbed +- embryo for an sfa client library +- topology.py moved into plc +- sql: table is named records; record_types are enforced +- sql: table creation cleaned up + +* Wed Nov 30 2011 Thierry Parmentelat - sfa-2.0-1 +- cleaned up all references to SFA_*_TYPE in config +- enable cache at the aggregate by default +- registry now uses the driver in a sensible way (see managers/driver.py) +- slice manager supports sfav1/pgv2 neighbours +- get_key renamed into get_key_from_incoming_ip +- new sfa.storage module for record/table and all db-related stuff +- db schema in sfa.storage.sfa.sql +- init.d and cron.d move one step up +- cleaned up rspec/ directory +- add deps to pyopenssl and myplc-config +- start support for new API (return value) +- plc.remoteshell removed, use plshell instead +- plshell uses a 'capability' auth method whenever possible +- various tweaks in rspec elements +- made dependency on sfatables softer + * Thu Nov 24 2011 Thierry Parmentelat - sfa-1.1-5 - sfa should now be started *before* the initial import - sfa to use its own database (default sfa) - can run without myplc