if(sliver instanceof Array){
client_id = sliver['@name'];
}else{
- client_id = node['@client_id'];
+ if ('@sliver_name' in sliver){
+ client_id = sliver['@sliver_name'];
+ }else{
+ client_id = node['@client_id'];
+ }
}
if ('@component_name' in node){
node_name = node['@component_name']
if(state=='pending_add'){
$("#"+id).append("<div class='col-md-1' style='width:40px;margin-left:0px;!important;'><input type='checkbox' id='publicip_"+platform+"_"+client_id+"' onclick=public_ip('"+platform+"','"+client_id+"',this.checked);></div>");
}else{
- $("#"+id).append("<div class='col-md-1' style='margin-left:0px;!important;'> </div>");
+ $("#"+id).append("<div class='col-md-1' style='width:40px;margin-left:0px;!important;'> </div>");
}
- $("#"+id).append("<div class='col-md-2' style='padding-left:0px;'>"+node_name+"</div>");
- $("#"+id).append("<div class='col-md-2' style='padding-left:0px;'>"+client_id+"</div>");
+ $("#"+id).append("<div class='col-md-2'>"+node_name+"</div>");
+ $("#"+id).append("<div class='col-md-2'>"+client_id+"</div>");
if('openstack:flavor' in node[key_sliver]){
$("#"+id).append("<div class='col-md-2'>"+sliver['openstack:flavor']['@name']+"</div>");
$("#"+id).append("<div class='col-md-3'>"+sliver['openstack:flavor']['openstack:image']['@name']+"</div>");
<h2>{{ platform }}</h2>
// display only if VMs already in slice
<h4>VMs in slice {{slicename}}</h4>
- <div id="{{platform}}_existing" class="row alert alert-info" style="display:none;">
+ <div id="{{platform}}_existing" class="row alert alert-info" style='display:none;margin-left:0px;!important;margin-right:0px;!important;'>
<input type="hidden" name="{{platform}}_vm" id="{{platform}}_vm">
<input type="hidden" name="action" id="action" value="delete">
<input type="hidden" name="platform" id="platform" value="{{platform}}">
<h4>Pending changes</h4>
<form id="{{platform}}_form_reserve" method="post">
{% csrf_token %}
- <div id="{{platform}}_pending_add" class="row alert alert-success" style="display:none;margin-bottom:3px !important;"></div>
- <div id="{{platform}}_pending_delete" class="row alert alert-danger" style="display:none;margin-bottom:3px !important;"></div>
+ <div id="{{platform}}_pending_add" class="row alert alert-success" style="display:none;margin-bottom:3px !important;margin-left:0px;!important;margin-right:0px;!important;"></div>
+ <div id="{{platform}}_pending_delete" class="row alert alert-danger" style="display:none;margin-bottom:3px !important;margin-left:0px;!important;margin-right:0px;!important;"></div>
<br>
<input type="hidden" name="action" id="action" value="reserve">
<input type="hidden" name="platform" id="platform" value="{{platform}}">
#return HttpResponse(json.dumps({'error' : '-2'}), content_type="application/json")
return {'error' : '-2'}
- server = SfaServerProxy(server_url, pkey, cert, verbose=False, timeout=5)
+ server = SfaServerProxy(server_url, pkey, cert, verbose=False)#, timeout=5)
#server = SFAProxy(server_url, pkey, cert)
- if 'geni_rspec_version' in options:
- # GetVersion to know if the AM supports the requested version
- # if not ask for the default GENI v3
- start_time = time.time()
- result = server.GetVersion()
- logger.debug("EXEC TIME - GetVersion() - %s sec." % (time.time() - start_time))
- if 'geni_ad_rspec_versions' in result['value']:
- for v in result['value']['geni_ad_rspec_versions']:
- if v['type'] == options['geni_rspec_version']:
- api_options['geni_rspec_version'] = {'type': options['geni_rspec_version']}
- break
- else:
- api_options['geni_rspec_version'] = {'type': 'GENI', 'version': '3'}
- else:
- api_options['geni_rspec_version'] = {'type': 'GENI', 'version': '3'}
+ #if 'geni_rspec_version' in api_options:
+ # # GetVersion to know if the AM supports the requested version
+ # # if not ask for the default GENI v3
+ # start_time = time.time()
+ # result = server.GetVersion()
+ # logger.debug("EXEC TIME - GetVersion() - %s sec." % (time.time() - start_time))
+ # if 'geni_ad_rspec_versions' in result['value']:
+ # for v in result['value']['geni_ad_rspec_versions']:
+ # if v['type'] == api_options['geni_rspec_version']:
+ # api_options['geni_rspec_version'] = {'type': api_options['geni_rspec_version']}
+ # break
+ # else:
+ # api_options['geni_rspec_version'] = {'type': 'GENI', 'version': '3'}
+ #else:
+ # api_options['geni_rspec_version'] = {'type': 'GENI', 'version': '3'}
try:
# Get user config from Manifold
# AM API Calls
if server_am:
if method == "ListResources":
- logger.debug(api_options)
- #logger.debug(user_cred)
start_time = time.time()
result = server.ListResources([user_cred], api_options)
logger.debug("EXEC TIME - ListResources() - %s sec." % (time.time() - start_time))
- #logger.debug(result)
dict_result = xmltodict.parse(result['value'])
result['parsed'] = dict_result
if isinstance(dict_result['rspec']['node'], list):
logger.debug('method %s not handled by Registry' % method)
result = []
if output_format is not None:
- logger.debug("result = " % result)
if 'value' in result:
# TODO Python Caching
# to avoid translating the same RSpec in the same format several times