# @param key_file private key filename of registry
# @param cert_file certificate filename containing public key (could be a GID file)
- def __init__(self, ip, port, key_file, cert_file, config = "/usr/share/geniwrapper/geni/util/geni_config"):
+ def __init__(self, ip, port, key_file, cert_file, config = "/etc/planetlab/geni_config"):
GeniServer.__init__(self, ip, port, key_file, cert_file)
self.key_file = key_file
self.cert_file = cert_file
# is up to date and accurate.
#
# 1) Import the existing planetlab database, creating the
-# appropriate geni records. This is done by running the "import.py" tool.
+# appropriate geni records. This is done by running the "gimport.py" tool.
#
# 2) Create a "trusted_roots" directory and place the certificate of the root
-# authority in that directory. Given the defaults in import.py, this
+# authority in that directory. Given the defaults in gimport.py, this
# certificate would be named "planetlab.gid". For example,
#
# mkdir trusted_roots; cp authorities/planetlab.gid trusted_roots/
# @param key_file private key filename of registry
# @param cert_file certificate filename containing public key (could be a GID file)
- def __init__(self, ip, port, key_file, cert_file, config = "/usr/share/geniwrapper/geni/util/geni_config"):
+ def __init__(self, ip, port, key_file, cert_file, config = os.getcwd() + "/geni/util/geni_config"):
GeniServer.__init__(self, ip, port, key_file, cert_file)
self.key_file = key_file
self.cert_file = cert_file