Nicolas Turro [Fri, 18 Nov 2011 16:38:34 +0000 (17:38 +0100)]
Merge branch 'master' into senslab2
Conflicts:
sfa/util/xml.py
Thierry Parmentelat [Fri, 18 Nov 2011 10:02:36 +0000 (11:02 +0100)]
remove extra docs file to align with masinstream
Sandrine Avakian [Fri, 18 Nov 2011 09:57:32 +0000 (10:57 +0100)]
Modified slab import script to create authorities only if it doesn't exist.
+Clean up.
Thierry Parmentelat [Fri, 18 Nov 2011 09:54:08 +0000 (10:54 +0100)]
Merge branch 'upstreammaster'
Thierry Parmentelat [Fri, 18 Nov 2011 09:49:06 +0000 (10:49 +0100)]
Setting tag sfa-1.1-4
fixed links and attributes in rspecs
minor cleanup in the API methods, and more consistent names in manager methods
Sandrine Avakian [Fri, 18 Nov 2011 09:35:48 +0000 (10:35 +0100)]
Removed SA special ssh key in slab import script (ssh key copied from senslab VM ok).
Sandrine Avakian [Fri, 18 Nov 2011 09:24:26 +0000 (10:24 +0100)]
Corrected bug in function call fill_record_info in registry.
Added interface records creation in slab-import.
TODO : Remove special SA ssh key in slab-import.
Thierry Parmentelat [Fri, 18 Nov 2011 08:55:44 +0000 (09:55 +0100)]
Merge branches 'master' and 'master' of ssh://git.onelab.eu/git/sfa
Tony Mack [Fri, 18 Nov 2011 00:34:26 +0000 (19:34 -0500)]
fix rspec links
Thierry Parmentelat [Thu, 17 Nov 2011 19:22:09 +0000 (20:22 +0100)]
Merge branch 'master' of ssh://git.onelab.eu/git/sfa
Tony Mack [Thu, 17 Nov 2011 19:17:22 +0000 (14:17 -0500)]
fix slice/sliver attributes methods
Thierry Parmentelat [Thu, 17 Nov 2011 17:30:17 +0000 (18:30 +0100)]
bugfixes with manager.Resolve vs manager.resolve
Tony Mack [Thu, 17 Nov 2011 17:08:27 +0000 (12:08 -0500)]
fix bug in add_service()
Thierry Parmentelat [Thu, 17 Nov 2011 16:16:05 +0000 (17:16 +0100)]
oops need to update __init__ for methods
Thierry Parmentelat [Thu, 17 Nov 2011 16:11:41 +0000 (17:11 +0100)]
cleaning unneeded registry methods {register,remove}_peer_object (and camlcase)
and get_{aggregates,registries}
Thierry Parmentelat [Thu, 17 Nov 2011 15:20:58 +0000 (16:20 +0100)]
oops that was meant to be part of previous commit too
Thierry Parmentelat [Thu, 17 Nov 2011 15:20:32 +0000 (16:20 +0100)]
comment on the existence of XmlElement
implement __getattr__ so etree.Element methods and fields are
available to XmlElement for free
Thierry Parmentelat [Thu, 17 Nov 2011 12:21:52 +0000 (13:21 +0100)]
more consistency between API method names and corresponding manager implementation
Thierry Parmentelat [Thu, 17 Nov 2011 10:51:26 +0000 (11:51 +0100)]
cleanup obsolete code in plc/network.py
Thierry Parmentelat [Thu, 17 Nov 2011 10:32:17 +0000 (11:32 +0100)]
Merge branch 'upstreammaster'
Thierry Parmentelat [Thu, 17 Nov 2011 10:30:46 +0000 (11:30 +0100)]
Setting tag sfa-1.1-3
ongoing refoactoring towards more genericity
passes tests again although known issues remain with attributes/tags
Tony Mack [Thu, 17 Nov 2011 04:24:23 +0000 (23:24 -0500)]
fix bugs
Tony Mack [Thu, 17 Nov 2011 02:56:32 +0000 (21:56 -0500)]
replaced Element.get_elements() with XmlNode.get_instance(). replaced Element.add_elements() with XmlNodde.add_instance()
Tony Mack [Wed, 16 Nov 2011 18:08:18 +0000 (13:08 -0500)]
fix get_nodes_with_slivers()
Sandrine Avakian [Wed, 16 Nov 2011 16:08:13 +0000 (17:08 +0100)]
Removed fill_record_info
Nicolas Turro [Wed, 16 Nov 2011 15:08:54 +0000 (16:08 +0100)]
gid creation code change, again. NT.
Sandrine Avakian [Wed, 16 Nov 2011 14:44:58 +0000 (15:44 +0100)]
Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
Sandrine Avakian [Wed, 16 Nov 2011 14:44:49 +0000 (15:44 +0100)]
Added creation time for slices,nodes and users
Nicolas Turro [Wed, 16 Nov 2011 14:39:08 +0000 (15:39 +0100)]
Gid creation code moved. NT.
Nicolas Turro [Wed, 16 Nov 2011 14:23:25 +0000 (15:23 +0100)]
We use the regular table.py now. NT.
Nicolas Turro [Wed, 16 Nov 2011 14:12:17 +0000 (15:12 +0100)]
Merge branch 'senslab2' of ssh://git.f-lab.fr/git/sfa into senslab2
Nicolas Turro [Wed, 16 Nov 2011 14:11:20 +0000 (15:11 +0100)]
Merge with master xml.py. NT
Tony Mack [Wed, 16 Nov 2011 13:58:14 +0000 (08:58 -0500)]
fix typo
Thierry Parmentelat [Wed, 16 Nov 2011 13:44:14 +0000 (14:44 +0100)]
Merge branch 'upstreammaster'
Sandrine Avakian [Wed, 16 Nov 2011 13:38:18 +0000 (14:38 +0100)]
Cleaned up in import_slice. Added import_person that was previously removed.
Sandrine Avakian [Wed, 16 Nov 2011 13:23:43 +0000 (14:23 +0100)]
Fixed gid bug problem in import_slice
Nicolas Turro [Wed, 16 Nov 2011 13:04:43 +0000 (14:04 +0100)]
Simplification of slice import. NT.
Sandrine Avakian [Wed, 16 Nov 2011 10:30:12 +0000 (11:30 +0100)]
Added import slices based on the user name.
Tony Mack [Wed, 16 Nov 2011 03:26:43 +0000 (22:26 -0500)]
bugfixes
Tony Mack [Tue, 15 Nov 2011 03:36:10 +0000 (22:36 -0500)]
added append() and iterchildern() to XML class
Tony Mack [Tue, 15 Nov 2011 03:35:39 +0000 (22:35 -0500)]
cleanup
Tony Mack [Tue, 15 Nov 2011 03:35:16 +0000 (22:35 -0500)]
fix merge
Tony Mack [Tue, 15 Nov 2011 03:34:39 +0000 (22:34 -0500)]
added add_sliver_attributes method
Tony Mack [Tue, 15 Nov 2011 03:34:05 +0000 (22:34 -0500)]
fix add_slivers
Tony Mack [Tue, 15 Nov 2011 03:32:53 +0000 (22:32 -0500)]
import xrn_to_hostname
Tony Mack [Tue, 15 Nov 2011 03:29:27 +0000 (22:29 -0500)]
hasattr() second arg must be a string
Tony Mack [Tue, 15 Nov 2011 03:28:34 +0000 (22:28 -0500)]
fix bug in add_stats
Tony Mack [Tue, 15 Nov 2011 02:57:23 +0000 (21:57 -0500)]
added getparent()
Tony Mack [Tue, 15 Nov 2011 02:57:09 +0000 (21:57 -0500)]
fix add_slivers
Tony Mack [Tue, 15 Nov 2011 02:55:22 +0000 (21:55 -0500)]
fix add_slivers
Sandrine Avakian [Tue, 15 Nov 2011 16:02:10 +0000 (17:02 +0100)]
Cleaning up end for the slab-import script.
Sandrine Avakian [Tue, 15 Nov 2011 16:00:09 +0000 (17:00 +0100)]
............
Sandrine Avakian [Tue, 15 Nov 2011 15:58:34 +0000 (16:58 +0100)]
2nd attempt ...
Sandrine Avakian [Tue, 15 Nov 2011 15:54:42 +0000 (16:54 +0100)]
Added prints upon insertion/deletion of an element into the sfa db.
Thierry Parmentelat [Tue, 15 Nov 2011 15:40:14 +0000 (16:40 +0100)]
with a slow connection, make fastsync does only the python code
Thierry Parmentelat [Tue, 15 Nov 2011 15:39:49 +0000 (16:39 +0100)]
various fixes - passes tests in sfav1 mode
Sandrine Avakian [Tue, 15 Nov 2011 15:32:16 +0000 (16:32 +0100)]
Fixed problem inserting ldap user into sfa table.
Nicolas Turro [Tue, 15 Nov 2011 14:26:53 +0000 (15:26 +0100)]
Small bugfix. NT.
Sandrine Avakian [Tue, 15 Nov 2011 14:22:46 +0000 (15:22 +0100)]
Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2
Sandrine Avakian [Tue, 15 Nov 2011 14:19:20 +0000 (15:19 +0100)]
Fixed parsing fonction problem for slab-import.py.
Sandrine Avakian [Tue, 15 Nov 2011 13:57:34 +0000 (14:57 +0100)]
Fixed GetPerson problem in slabdriver.
Nicolas Turro [Tue, 15 Nov 2011 13:54:52 +0000 (14:54 +0100)]
Added missing import. NT.
Sandrine Avakian [Tue, 15 Nov 2011 13:42:03 +0000 (14:42 +0100)]
Added import in slabdriver.
Thierry Parmentelat [Tue, 15 Nov 2011 13:40:47 +0000 (14:40 +0100)]
cosmetic
Thierry Parmentelat [Tue, 15 Nov 2011 13:40:33 +0000 (14:40 +0100)]
renamed rspec_version into baseversion after the defined class
Sandrine Avakian [Tue, 15 Nov 2011 13:27:15 +0000 (14:27 +0100)]
Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2
Sandrine Avakian [Tue, 15 Nov 2011 13:26:57 +0000 (14:26 +0100)]
Cleaning.
Thierry Parmentelat [Tue, 15 Nov 2011 11:26:35 +0000 (12:26 +0100)]
bugfix
Nicolas Turro [Tue, 15 Nov 2011 11:26:35 +0000 (12:26 +0100)]
Missing imports added, hostname to hrn conversion. NT
Thierry Parmentelat [Tue, 15 Nov 2011 10:51:57 +0000 (11:51 +0100)]
less spam
Sandrine Avakian [Tue, 15 Nov 2011 10:42:51 +0000 (11:42 +0100)]
Removed printings.
Sandrine Avakian [Tue, 15 Nov 2011 10:40:57 +0000 (11:40 +0100)]
Removed variables sites in slab import script.
Sandrine Avakian [Tue, 15 Nov 2011 10:38:44 +0000 (11:38 +0100)]
Removed ParseSites calls in OARrestapi, since we only have one site for all nodes.
Sandrine Avakian [Tue, 15 Nov 2011 10:35:24 +0000 (11:35 +0100)]
Feeding config object to SlabDriver init.
Sandrine Avakian [Tue, 15 Nov 2011 10:33:44 +0000 (11:33 +0100)]
Corrected calls to SlabDriver in slab-import.
Sandrine Avakian [Tue, 15 Nov 2011 10:32:02 +0000 (11:32 +0100)]
Fixed pb in import .
Sandrine Avakian [Tue, 15 Nov 2011 10:29:03 +0000 (11:29 +0100)]
Fixed inheritance problems in slabdriver.
Sandrine Avakian [Tue, 15 Nov 2011 10:26:01 +0000 (11:26 +0100)]
Added import slabdriver in slab-import script.
Sandrine Avakian [Tue, 15 Nov 2011 10:24:08 +0000 (11:24 +0100)]
Fixed bugs for the import part .
Thierry Parmentelat [Tue, 15 Nov 2011 09:57:15 +0000 (10:57 +0100)]
comment out wrong fragment
Thierry Parmentelat [Tue, 15 Nov 2011 09:55:19 +0000 (10:55 +0100)]
use logger in helper commands
Tony Mack [Mon, 14 Nov 2011 22:07:47 +0000 (17:07 -0500)]
fix AttributeError
Tony Mack [Mon, 14 Nov 2011 21:20:05 +0000 (16:20 -0500)]
Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
Tony Mack [Mon, 14 Nov 2011 21:13:48 +0000 (16:13 -0500)]
assume links between all nodes at linked sites
Thierry Parmentelat [Mon, 14 Nov 2011 20:33:26 +0000 (21:33 +0100)]
solve conflict in sfa/plc/aggregate.py
Sandrine Avakian [Mon, 14 Nov 2011 16:48:21 +0000 (17:48 +0100)]
Import script using OARapi and LDAPapi
Sandrine Avakian [Mon, 14 Nov 2011 14:38:07 +0000 (15:38 +0100)]
Please enter the commit message for your changes. Lines starting
Sandrine Avakian [Mon, 14 Nov 2011 14:34:27 +0000 (15:34 +0100)]
Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2
Sandrine Avakian [Mon, 14 Nov 2011 14:33:51 +0000 (15:33 +0100)]
Added file slab-import : script to import LDAP users and OAR ressources to sfa table.
Nicolas Turro [Mon, 14 Nov 2011 14:18:44 +0000 (15:18 +0100)]
Change ressources hostnames. NT.
Sandrine Avakian [Mon, 14 Nov 2011 10:51:40 +0000 (11:51 +0100)]
Merge branch 'senslab2' of ssh://flab-git.pl.sophia.inria.fr/git/sfa into senslab2
Conflicts:
sfa/managers/registry_manager_slab.py
Sandrine Avakian [Mon, 14 Nov 2011 10:03:30 +0000 (11:03 +0100)]
Changes to registry manager. SA.
Thierry Parmentelat [Mon, 14 Nov 2011 08:21:44 +0000 (09:21 +0100)]
bugfix
Thierry Parmentelat [Mon, 14 Nov 2011 08:14:06 +0000 (09:14 +0100)]
bugfix
Thierry Parmentelat [Mon, 14 Nov 2011 08:00:52 +0000 (09:00 +0100)]
removed unneeded import
Thierry Parmentelat [Mon, 14 Nov 2011 08:00:36 +0000 (09:00 +0100)]
use api.manager
Thierry Parmentelat [Mon, 14 Nov 2011 08:00:18 +0000 (09:00 +0100)]
registry manager is a class as well
Tony Mack [Fri, 11 Nov 2011 13:35:08 +0000 (08:35 -0500)]
check if bwlimit is None
Tony Mack [Fri, 11 Nov 2011 06:23:15 +0000 (01:23 -0500)]
fix errors
Tony Mack [Fri, 11 Nov 2011 06:14:26 +0000 (01:14 -0500)]
fix bug