git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
039bde2
)
resolved imports
author
Larry Peterson
<llp@cs.princeton.edu>
Tue, 30 Dec 2008 21:57:29 +0000
(21:57 +0000)
committer
Larry Peterson
<llp@cs.princeton.edu>
Tue, 30 Dec 2008 21:57:29 +0000
(21:57 +0000)
cmdline/sfi.py
patch
|
blob
|
history
diff --git
a/cmdline/sfi.py
b/cmdline/sfi.py
index
ba2dd3d
..
2d6f188
100755
(executable)
--- a/
cmdline/sfi.py
+++ b/
cmdline/sfi.py
@@
-11,8
+11,8
@@
from util.credential import Credential
from util.geniclient import GeniClient
sfi_dir = os.path.expanduser("~/.sfi/")
from util.geniclient import GeniClient
sfi_dir = os.path.expanduser("~/.sfi/")
-s
m_chan
= None
-reg
_chan
= None
+s
licemgr
= None
+reg
istry
= None
user = None
authority = None
verbose = False
user = None
authority = None
verbose = False
@@
-21,8
+21,8
@@
verbose = False
# Establish Connection to SliceMgr and Registry Servers
#
def set_servers(options):
# Establish Connection to SliceMgr and Registry Servers
#
def set_servers(options):
- global s
m_chan
- global reg
_chan
+ global s
licemgr
+ global reg
istry
global user
global authority
global user
global authority
@@
-72,11
+72,11
@@
def set_servers(options):
# Establish connection to server(s)
# SliceMgr and Registry may be available on the same server
if (sm_url == registry_url):
# Establish connection to server(s)
# SliceMgr and Registry may be available on the same server
if (sm_url == registry_url):
- s
m_chan
= GeniClient(sm_url, key_file, cert_file)
- reg
_chan = sm_chan
+ s
licemgr
= GeniClient(sm_url, key_file, cert_file)
+ reg
istry = slicemgr
else:
else:
- s
m_chan
= GeniClient(sm_url, key_file, cert_file)
- reg
_chan
= GeniClient(registry_url, key_file, cert_file)
+ s
licemgr
= GeniClient(sm_url, key_file, cert_file)
+ reg
istry
= GeniClient(registry_url, key_file, cert_file)
return
#
return
#
@@
-241,8
+241,6
@@
def create_cmd_parser(command):
# Main: parse arguments and dispatch to command
#
def main():
# Main: parse arguments and dispatch to command
#
def main():
- global sm_chan
- global reg_chan
global verbose
# Generate command line parser
global verbose
# Generate command line parser
@@
-255,9
+253,9
@@
def main():
parser.add_option("-d", "--dir", dest="dir",
help="working directory", metavar="PATH", default = sfi_dir)
parser.add_option("-u", "--user", dest="user",
parser.add_option("-d", "--dir", dest="dir",
help="working directory", metavar="PATH", default = sfi_dir)
parser.add_option("-u", "--user", dest="user",
- help="user name", metavar="
USER_
HRN", default=None)
+ help="user name", metavar="HRN", default=None)
parser.add_option("-a", "--auth", dest="auth",
parser.add_option("-a", "--auth", dest="auth",
- help="authority name", metavar="
AUTH_
HRN", default=None)
+ help="authority name", metavar="HRN", default=None)
parser.add_option("-v", "--verbose",
action="store_true", dest="verbose", default=False,
help="verbose mode")
parser.add_option("-v", "--verbose",
action="store_true", dest="verbose", default=False,
help="verbose mode")
@@
-294,15
+292,15
@@
def main():
# list entires in named authority registry
def list(opts, args):
# list entires in named authority registry
def list(opts, args):
- global reg
_chan
+ global reg
istry
user_cred = get_user_cred()
user_cred = get_user_cred()
- result = reg
_chan
.list(user_cred, args[0])
+ result = reg
istry
.list(user_cred, args[0])
display_record(opts.type, results)
return
# show named registry record
def show(opts, args):
display_record(opts.type, results)
return
# show named registry record
def show(opts, args):
- global reg
_chan
+ global reg
istry
user_cred = get_user_cred()
result = reg_chan.resolve(user_cred, args[0])
display_record(opts.type, results)
user_cred = get_user_cred()
result = reg_chan.resolve(user_cred, args[0])
display_record(opts.type, results)
@@
-311,29
+309,29
@@
def show(opts, args):
# removed named registry record
# - have to first retrieve the record to be removed
def remove(opts, args):
# removed named registry record
# - have to first retrieve the record to be removed
def remove(opts, args):
- global reg
_chan
+ global reg
istry
auth_cred = get_auth_cred()
auth_cred = get_auth_cred()
- results = reg
_chan
.resolve(auth_cred, args[0])
+ results = reg
istry
.resolve(auth_cred, args[0])
record = filter_record(opts.type, results)
record = filter_record(opts.type, results)
- return reg
_chan
.remove(auth_cred, record)
+ return reg
istry
.remove(auth_cred, record)
# add named registry record
def add(opts, args):
# add named registry record
def add(opts, args):
- global reg
_chan
+ global reg
istry
auth_cred = get_auth_cred()
rec_file = get_record_file(args[1])
with open(rec_file) as f:
record = f.read()
auth_cred = get_auth_cred()
rec_file = get_record_file(args[1])
with open(rec_file) as f:
record = f.read()
- return reg
_chan
.register(auth_cred, record)
+ return reg
istry
.register(auth_cred, record)
# update named registry entry
def update(opts, args):
# update named registry entry
def update(opts, args):
- global reg
_chan
+ global reg
istry
user_cred = get_user_cred()
rec_file = get_record_file(args[1])
with open(rec_file) as f:
record = f.read()
user_cred = get_user_cred()
rec_file = get_record_file(args[1])
with open(rec_file) as f:
record = f.read()
- return reg
_chan
.update(user_cred, record)
+ return reg
istry
.update(user_cred, record)
#
# Slice-related commands
#
# Slice-related commands
@@
-341,69
+339,69
@@
def update(opts, args):
# list available nodes
def nodes(opts, args):
# list available nodes
def nodes(opts, args):
- global s
m_chan
+ global s
licemgr
user_cred = get_user_cred()
if (len(args) == 0):
context = None
else:
context = args[0]
user_cred = get_user_cred()
if (len(args) == 0):
context = None
else:
context = args[0]
- result = s
m_chan
.list_nodes(user_cred, context)
+ result = s
licemgr
.list_nodes(user_cred, context)
display_rspec(opts.format, result)
return
# list instantiated slices
def slices(opts, args):
display_rspec(opts.format, result)
return
# list instantiated slices
def slices(opts, args):
- global s
m_chan
+ global s
licemgr
user_cred = get_user_cred()
user_cred = get_user_cred()
- result = s
m_chan
.list_slices(user_cred)
+ result = s
licemgr
.list_slices(user_cred)
display_rspec(opts.format, results)
return
# show rspec for named slice
def resources(opts, args):
display_rspec(opts.format, results)
return
# show rspec for named slice
def resources(opts, args):
- global s
m_chan
+ global s
licemgr
slice_cred = get_slice_cred(args[0])
slice_cred = get_slice_cred(args[0])
- print "resources:", opts.format, args[0], sm_chan
- result = sm_chan.get_resources(slice_cred, args[0])
+ result = slicemgr.get_resources(slice_cred, args[0])
display_rspec(opts.format, result)
return
# created named slice with given rspec
def create(opts, args):
display_rspec(opts.format, result)
return
# created named slice with given rspec
def create(opts, args):
- global s
m_chan
+ global s
licemgr
slice_cred = get_slice_cred(args[0])
rspec_file = get_rspec_file(args[1])
with open(rspec_file) as f:
rspec = f.read()
slice_cred = get_slice_cred(args[0])
rspec_file = get_rspec_file(args[1])
with open(rspec_file) as f:
rspec = f.read()
- return s
m_chan
.instantiate(slice_cred, rspec)
+ return s
licemgr
.instantiate(slice_cred, rspec)
# delete named slice
def delete(opts, args):
# delete named slice
def delete(opts, args):
- global s
m_chan
+ global s
licemgr
slice_cred = get_slice_cred(args[0])
slice_cred = get_slice_cred(args[0])
- return s
m_chan
.delete_slice(slice_cred)
+ return s
licemgr
.delete_slice(slice_cred)
# start named slice
def start(opts, args):
# start named slice
def start(opts, args):
- global s
m_chan
+ global s
licemgr
slice_cred = get_slice_cred(args[0])
slice_cred = get_slice_cred(args[0])
- return s
m_chan
.start_slice(slice_cred)
+ return s
licemgr
.start_slice(slice_cred)
# stop named slice
def stop(opts, args):
# stop named slice
def stop(opts, args):
- global s
m_chan
+ global s
licemgr
slice_cred = get_slice_cred(args[0])
slice_cred = get_slice_cred(args[0])
- return s
m_chan
.stop_slice(slice_cred)
+ return s
licemgr
.stop_slice(slice_cred)
# reset named slice
def reset(opts, args):
# reset named slice
def reset(opts, args):
- global s
m_chan
+ global s
licemgr
slice_cred = get_slice_cred(args[0])
slice_cred = get_slice_cred(args[0])
- return s
m_chan
.reset_slice(slice_cred)
+ return s
licemgr
.reset_slice(slice_cred)
#
#
# Display and Filter RSpecs and Records
#
#
# Display and Filter RSpecs and Records
+# - to be replace by EMF-generated routines
#
#
#
#