Merge branch 'geni-v3' into dbsession

dbsession at this point is almost in sync with geni-v3, let's integrate tehe rest of the deltas

diff --cc sfa/importer/plimporter.py
Simple merge

diff --cc sfa/planetlab/plaggregate.py
index 4649759,2d26f0f..399b3a2
--- 1/sfa/planetlab/plaggregate.py
--- 2/sfa/planetlab/plaggregate.py
+++ b/sfa/planetlab/plaggregate.py
@@@ -18,9 -18,10 +18,9 @@@ from sfa.rspecs.elements.lease import L
  from sfa.rspecs.elements.granularity import Granularity
  from sfa.rspecs.version_manager import VersionManager
  
- from sfa.planetlab.plxrn import PlXrn, hostname_to_urn, hrn_to_pl_slicename, slicename_to_hrn, xrn_to_ext_slicename, top_auth
+ from sfa.planetlab.plxrn import PlXrn, hostname_to_urn, hrn_to_pl_slicename, slicename_to_hrn, top_auth, hash_loginbase
  from sfa.planetlab.vlink import get_tc_rate
  from sfa.planetlab.topology import Topology
 -from sfa.storage.alchemy import dbsession
  from sfa.storage.model import SliverAllocation
  
  

diff --cc sfa/planetlab/pldriver.py
Simple merge

diff --cc sfa/planetlab/plslices.py
index ce54c90,8f24792..9231d7a
--- 1/sfa/planetlab/plslices.py
--- 2/sfa/planetlab/plslices.py
+++ b/sfa/planetlab/plslices.py
@@@ -8,8 -8,9 +8,8 @@@ from sfa.util.xrn import Xrn, get_leaf
  from sfa.rspecs.rspec import RSpec
  from sfa.planetlab.vlink import VLink
  from sfa.planetlab.topology import Topology
- from sfa.planetlab.plxrn import PlXrn, hrn_to_pl_slicename, xrn_to_hostname, xrn_to_ext_slicename, hrn_to_ext_loginbase, top_auth
+ from sfa.planetlab.plxrn import PlXrn, hrn_to_pl_slicename, xrn_to_hostname, top_auth, hash_loginbase
  from sfa.storage.model import SliverAllocation
 -from sfa.storage.alchemy import dbsession
  
  MAXINT =  2L**31-1