X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa.spec;h=1985bf998d8fda95fabf687c256b425c0f57a8c1;hb=705ad4574dd1c21bf003fd1fc2802b6164bbc4ac;hp=99474459e74eddc50a781d0ca21f46e610d8e3b5;hpb=9fcd24492ce3094030aa0f2fc73c86b2259cce4e;p=sfa.git diff --git a/sfa.spec b/sfa.spec index 99474459..1985bf99 100644 --- a/sfa.spec +++ b/sfa.spec @@ -1,4 +1,3 @@ - # # $Id$ # @@ -7,7 +6,7 @@ %define name sfa %define version 0.9 -%define taglevel 2 +%define taglevel 10 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) @@ -33,10 +32,14 @@ Requires: python Requires: pyOpenSSL >= 0.7 Requires: m2crypto Requires: libxslt-python - -# python 2.5 has uuid module added, for python 2.4 we still need it -%define uuid_missing %(`python -c "import uuid" 2> /dev/null ; echo $?`) -%if uuid_missing +Requires: python-ZSI +Requires: python-psycopg2 +Requires: myplc-config + +# python 2.5 has uuid module added, for python 2.4 we still need it +%define has_uuid %(`python -c "import uuid" 2> /dev/null; echo $?`) +%if has_uuid +%else Requires: python-uuid %endif @@ -59,7 +62,7 @@ Requires: sfa This package provides the python libraries that the SFA implementation requires %description plc -Geniwrapper implements the SFA interface which serves as a layer +This package implements the SFA interface which serves as a layer between the existing PlanetLab interfaces and the SFA API. %description client @@ -69,7 +72,7 @@ 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. +networks. This is the command line interface to manage sfatables %prep %setup -q @@ -85,20 +88,26 @@ make install DESTDIR="$RPM_BUILD_ROOT" rm -rf $RPM_BUILD_ROOT %files +# sfa and sfatables depend each other. +/etc/sfatables/* %{python_sitelib}/* /usr/bin/keyconvert /var/www/html/wsdl/*.wsdl + %files plc %defattr(-,root,root) -%config (noreplace) /etc/sfa/sfa_config +%config /etc/sfa/default_config.xml %config (noreplace) /etc/sfa/aggregates.xml %config (noreplace) /etc/sfa/registries.xml /etc/init.d/sfa +/etc/init.d/sfa_cm %{_bindir}/sfa-config-tty %{_bindir}/sfa-import-plc.py* +%{_bindir}/sfa-clean-peer-records.py* %{_bindir}/sfa-nuke-plc.py* %{_bindir}/sfa-server.py* +%{_bindir}/gen-sfa-cm-config.py* %files client %config (noreplace) /etc/sfa/sfi_config @@ -106,12 +115,10 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/getNodes.py* %{_bindir}/getRecord.py* %{_bindir}/setRecord.py* -%{_bindir}/genidump.py* +%{_bindir}/sfadump.py* %files sfatables -/etc/sfatables/* %{_bindir}/sfatables -%{python_sitelib}/sfatables/* %pre plc [ -f %{_sysconfdir}/init.d/sfa ] && service sfa stop ||: @@ -120,6 +127,50 @@ rm -rf $RPM_BUILD_ROOT chkconfig --add sfa %changelog +* Thu Jan 21 2010 anil vengalil - sfa-0.9-10 +- This tag is quite same as the previous one (sfa-0.9-9) except that the vini and max aggregate managers are also updated for urn support. Other features are: +- - sfa-config-tty now has the same features like plc-config-tty +- - Contains code to support both urn and hrn +- - Cleaned up request_hash related stuff +- - SM, AM and Registry code is organized under respective managers +- - Site and Slice synchronization across federated aggregates +- - Script to generate sfa_component_config + +* Fri Jan 15 2010 anil vengalil - sfa-0.9-9 +- sfa-config-tty now has the same features like plc-config-tty +- Contains code to support both urn and hrn +- Cleaned up request_hash related stuff +- SM, AM and Registry code is organized under respective managers +- Slice synchronization across federated aggregates +- some bugs are fixed + +* Wed Jan 06 2010 Thierry Parmentelat - sfa-0.9-8 +- checkpoint with fewer mentions of geni + +* Tue Jan 05 2010 Thierry Parmentelat - sfa-0.9-7 +- checkpointing +- this is believed to pass the tests; among other things: +- reworked configuration based on the myplc config with xml skeleton (no more sfa_config) + +* Mon Nov 16 2009 anil vengalil - sfa-0.9-6 +- This tag includes: +- - Sfatables +- - Preliminary version of hash based authentication +- - Initial code for Component Manager +- - Authority structure is moved to /var/lib/sfa/ +- - some bug-fixes + +* Fri Oct 09 2009 anil vengalil - sfa-0.9-5 +- Create_slice and get_resources methods are connected to sfatables. +- Other features include compatibility with RP, handling remote objects created as part of federation, preliminary version of sfatables, call tracability and logging. + +* Wed Oct 07 2009 anil vengalil - sfa-0.9-4 +- Bug fix on update and remove_peer_object methods +- Compatibility with RP, preliminiary version of sfatables, call tracability and logging + +* Mon Oct 05 2009 anil vengalil - sfa-0.9-3 +- Compatibility with RP, two additional methods to handle remote objects, call tracability and logging, PLCDB now has single table for sfa records, preliminary version of sfatables (still under development) + * Fri Sep 18 2009 Thierry Parmentelat - sfa-0.9-2 - compatibility with RefreshPeer - incremental mechanism for importing PLC records into SFA tables