X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa.spec;h=ef0cb948e880be1ebff6577ee348ed4b0007ef1d;hb=c6884b76347be620a7b2aed427291a2e49b53850;hp=b709bcf523b43a03ef283f5dc38cd553427c67fc;hpb=0abc272f4c11fd140fc5596984d6006081a36078;p=sfa.git diff --git a/sfa.spec b/sfa.spec index b709bcf5..ef0cb948 100644 --- a/sfa.spec +++ b/sfa.spec @@ -1,6 +1,6 @@ %define name sfa -%define version 1.1 -%define taglevel 4 +%define version 2.0 +%define taglevel 2 %define release %{taglevel}%{?pldistro:.%{pldistro}}%{?date:.%{date}} %global python_sitearch %( python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)" ) @@ -14,6 +14,8 @@ License: GPL Group: Applications/System BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot +# xxx TODO : package cron.d/ + Vendor: PlanetLab Packager: PlanetLab Central Distribution: PlanetLab %{plrelease} @@ -30,7 +32,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 @@ -38,6 +40,9 @@ Requires: python-dateutil Requires: postgresql >= 8.2, postgresql-server >= 8.2 Requires: postgresql-python Requires: python-psycopg2 +Requires: pyOpenSSL >= 0.7 +Requires: myplc-config +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, @@ -57,8 +62,6 @@ Summary: the SFA layer around MyPLC Group: Applications/System Requires: sfa Requires: python-psycopg2 -Requires: myplc-config -Requires: pyOpenSSL >= 0.7 %package client Summary: the SFA experimenter-side CLI @@ -82,6 +85,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 @@ -106,10 +114,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 @@ -129,9 +141,6 @@ rm -rf $RPM_BUILD_ROOT %files # sfa and sfatables depend on each other. %{python_sitelib}/sfa -%{python_sitelib}/sfa*egg-info -%{python_sitelib}/xmlbuilder -%{python_sitelib}/xmlbuilder*egg-info /etc/init.d/sfa %{_bindir}/sfa-start.py* %{_bindir}/keyconvert.py* @@ -139,6 +148,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/examples /var/www/html/wsdl/*.wsdl %files plc @@ -158,10 +169,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 @@ -178,6 +191,9 @@ 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 @@ -208,6 +224,40 @@ fi [ "$1" -ge "1" ] && service sfa-cm restart || : %changelog +* 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 +- server calls support optional 'options' +- client sends options in argument when needed +- fix infinite getattr recursion in elements/element.py +- error codes in line with geni + * Fri Nov 18 2011 Thierry Parmentelat - sfa-1.1-4 - fixed links and attributes in rspecs - minor cleanup in the API methods, and more consistent names in manager methods