Merge branch 'master' into senslab2

[sfa.git] / sfa / examples / miniclient.py

diff --git a/sfa/examples/miniclient.py b/sfa/examples/miniclient.py
index 616d613..1c625e0 100755 (executable)
--- a/sfa/examples/miniclient.py
+++ b/sfa/examples/miniclient.py
@@ -54,9 +54,6 @@ def truncate(content, length=20, suffix='...'):
     else:
         return content[:length+1]+ ' '+suffix
 
-def has_call_id (server_version):
-    return server_version.has_key('call_id_support')
-
 
 ### issue a GetVersion call
 ### this assumes we've already somehow initialized the certificate
@@ -67,7 +64,6 @@ def get_version (url):
     server_version = server_proxy.GetVersion()
     print "miniclient: GetVersion at %s returned:"%(url)
     for (k,v) in server_version.iteritems(): print "miniclient: \tversion[%s]=%s"%(k,truncate(v))
-    print "has-call-id=",has_call_id(server_version)
 
 # version_dict = {'type': 'SFA', 'version': '1', }
 
@@ -81,7 +77,7 @@ def list_resources ():
     credentials = [ credential ]
     options = {}
     options [ 'geni_rspec_version' ] = version_dict
-#    options [ 'call_id' ] = unique_call_id()
+    options [ 'call_id' ] = unique_call_id()
     list_resources = bootstrap.server_proxy (aggregate_url).ListResources(credentials,options)
     print "miniclient: ListResources at %s returned : %s"%(aggregate_url,truncate(list_resources))
 
@@ -92,17 +88,16 @@ def list_slice_resources ():
     options = { }
     options [ 'geni_rspec_version' ] = version_dict
     options [ 'geni_slice_urn' ] = slice_urn
-#    options [ 'call_id' ] = unique_call_id()
+    options [ 'call_id' ] = unique_call_id()
     list_resources = bootstrap.server_proxy (aggregate_url).ListResources(credentials,options)
     print "miniclient: ListResources at %s for slice %s returned : %s"%(aggregate_url,slice_urn,truncate(list_resources))
     
     
-    
 
 def main ():
     get_version(registry_url)
     get_version(aggregate_url)
-#    list_resources()
-#    list_slice_resources()
+    list_resources()
+    list_slice_resources()
 
 main()