'+
- '
'+
+ '
'+
'
'+
@@ -4103,6 +4170,10 @@ $(document).ready(function(){
var template_id = role.vm_template;
var role_html_id = "#provision_create_flow_role_"+index;
+ generate_cardinality_selector(
+ $(".provision_cardinality_selector", context),
+ role);
+
OpenNebula.Template.show({
data : {
id: template_id
@@ -4119,11 +4190,12 @@ $(document).ready(function(){
$(".provision_capacity_selector", context),
template_json.VMTEMPLATE.TEMPLATE);
- generate_provision_network_accordion($(".provision_network_selector", context))
- $.each(nics, function(index, nic){
- generate_provision_network_table($(".provision_nic_accordion", context), nic);
- })
+ //generate_provision_network_accordion($(".provision_network_selector", context))
+//
+ //$.each(nics, function(index, nic){
+ // generate_provision_network_table($(".provision_nic_accordion", context), nic);
+ //})
}
})
@@ -4169,9 +4241,16 @@ $(document).ready(function(){
return false;
}
+ var roles = [];
+ $(".provision_create_flow_role", context).each(function(){
+ var role_template = JSON.parse($(this).attr("data"));
+ roles.push($.extend(role_template, {"cardinality": $(".cardinality_value", $(this)).text()}));
+ })
+
var extra_info = {
'merge_template': {
- "name" : flow_name
+ "name" : flow_name,
+ "roles" : roles
}
}
@@ -4669,8 +4748,8 @@ $(document).ready(function(){
$.each(body.roles, function(index, role) {
var role_state = get_provision_flow_state(role);
var rvms = {
- str : role.nodes.length + " / " + role.cardinality ,
- percentage : Math.floor(role.nodes.length / role.cardinality)*100
+ str : (role.nodes ? role.nodes.length : 0) + " / " + role.cardinality ,
+ percentage : Math.floor((role.nodes ? role.nodes.length : 0) / role.cardinality)*100
}
roles_li +=