git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
group db-related stuff in sfa/storage
[sfa.git]
/
sfa
/
server
/
sfa-ca.py
diff --git
a/sfa/server/sfa-ca.py
b/sfa/server/sfa-ca.py
index
8297b2d
..
b87e119
100755
(executable)
--- a/
sfa/server/sfa-ca.py
+++ b/
sfa/server/sfa-ca.py
@@
-21,11
+21,13
@@
import os
import sys
from optparse import OptionParser
import os
import sys
from optparse import OptionParser
-from sfa.trust.certificate import Keypair, Certificate
+
+from sfa.util.config import Config
+
from sfa.trust.gid import GID, create_uuid
from sfa.trust.hierarchy import Hierarchy
from sfa.trust.gid import GID, create_uuid
from sfa.trust.hierarchy import Hierarchy
-from sfa.util.config import Config
-from
collections import defaultdict
+
+from
sfa.storage.table import SfaTable
def main():
args = sys.argv
def main():
args = sys.argv
@@
-110,7
+112,6
@@
def sign(options):
def export_gid(options):
def export_gid(options):
- from sfa.util.table import SfaTable
# lookup the record for the specified hrn
hrn = options.export
type = options.type
# lookup the record for the specified hrn
hrn = options.export
type = options.type
@@
-124,7
+125,7
@@
def export_gid(options):
# check the authorities hierarchy
hierarchy = Hierarchy()
try:
# check the authorities hierarchy
hierarchy = Hierarchy()
try:
- auth_info = hierarchy.get_auth_info()
+ auth_info = hierarchy.get_auth_info(
hrn
)
gid = auth_info.gid_object
except:
print "Record: %s not found" % hrn
gid = auth_info.gid_object
except:
print "Record: %s not found" % hrn
@@
-148,8
+149,6
@@
def import_gid(options):
Import the specified gid into the registry (db and authorities
hierarchy) overwriting any previous gid.
"""
Import the specified gid into the registry (db and authorities
hierarchy) overwriting any previous gid.
"""
- from sfa.util.table import SfaTable
- from sfa.util.record import SfaRecord
# load the gid
gidfile = os.path.abspath(options.importgid)
if not gidfile or not os.path.isfile(gidfile):
# load the gid
gidfile = os.path.abspath(options.importgid)
if not gidfile or not os.path.isfile(gidfile):
@@
-167,7
+166,7
@@
def import_gid(options):
table = SfaTable()
records = table.find({'hrn': gid.get_hrn(), 'type': 'authority'})
if not records:
table = SfaTable()
records = table.find({'hrn': gid.get_hrn(), 'type': 'authority'})
if not records:
- print "%s not found in record database" % g
et
.get_hrn()
+ print "%s not found in record database" % g
id
.get_hrn()
sys.exit(1)
# update the database record
sys.exit(1)
# update the database record