opennebula_sched.diff

Fix for sched prefix in template dialog - Laurent Grawet, 09/10/2013 09:06 AM

Download (3.08 KB)

View differences:

templates-tab.js 2013-09-10 10:52:25.179386109 +0200
3448 3448
                    '<hr>'+
3449 3449
                    '<div class="row vm_param">'+
3450 3450
                        '<div class="two columns">'+
3451
                            '<label class="inline right" for="REQUIREMENTS">'+tr("Requirements")+':</label>'+
3451
                            '<label class="inline right" for="SCHED_REQUIREMENTS">'+tr("Requirements")+':</label>'+
3452 3452
                        '</div>'+
3453 3453
                        '<div class="nine columns">'+
3454
                            '<input type="text" id="REQUIREMENTS" name="requirements" />'+
3454
                            '<input type="text" id="SCHED_REQUIREMENTS" name="sched__requirements" />'+
3455 3455
                        '</div>'+
3456 3456
                        '<div class="one columns">'+
3457 3457
                            '<div class="tip">'+tr("Boolean expression that rules out provisioning hosts from list of machines suitable to run this VM")+'.</div>'+
......
3482 3482
                      '<hr>'+
3483 3483
                    '<div class="row vm_param">'+
3484 3484
                      '<div class="two columns">'+
3485
                        '<label class="inline right" for="RANK">'+tr("Rank")+':</label>'+
3485
                        '<label class="inline right" for="SCHED_RANK">'+tr("Rank")+':</label>'+
3486 3486
                      '</div>'+
3487 3487
                      '<div class="nine columns">'+
3488
                        '<input type="text" id="RANK" name="RANK" />'+
3488
                        '<input type="text" id="SCHED_RANK" name="SCHED_RANK" />'+
3489 3489
                      '</div>'+
3490 3490
                      '<div class="one columns">'+
3491 3491
                        '<div class="tip">'+tr("This field sets which attribute will be used to sort the suitable hosts for this VM")+'.</div>'+
......
3676 3676
        });
3677 3677

  
3678 3678
        $("input[name='rank_select']").change(function(){
3679
            $("#RANK", dialog).val(this.value);
3679
            $("#SCHED_RANK", dialog).val(this.value);
3680 3680
        });
3681 3681

  
3682 3682
        var generate_requirements = function() {
......
3690 3690
            req_string.push('CLUSTER_ID=\\"'+key+'\\"');
3691 3691
            });
3692 3692

  
3693
            $('#REQUIREMENTS', dialog).val(req_string.join(" | "));
3693
            $('#SCHED_REQUIREMENTS', dialog).val(req_string.join(" | "));
3694 3694
        };
3695 3695
    }
3696 3696

  
......
4586 4586
    // REQUIREMENTS & RANK
4587 4587
    //
4588 4588

  
4589
    var req = template.REQUIREMENTS;
4589
    var req = template.SCHED_REQUIREMENTS;
4590 4590
    var req_section = $('li#schedulingTab', $create_template_dialog);
4591 4591

  
4592 4592
    if (req) {
......
4669 4669
            });
4670 4670
        }
4671 4671

  
4672
        $('input#REQUIREMENTS', req_section).val(req);
4672
        $('input#SCHED_REQUIREMENTS', req_section).val(req);
4673 4673
    }
4674 4674

  
4675
    var rank = template.RANK;
4675
    var rank = template.SCHED_RANK;
4676 4676

  
4677 4677
    if (rank) {
4678 4678
        var striping_regexp = /-RUNNING_VMS/;
......
4689 4689
            $('input#loadawareRadio', req_section).click()
4690 4690
        }
4691 4691

  
4692
        $('input#RANK', req_section).val(rank);
4692
        $('input#SCHED_RANK', req_section).val(rank);
4693 4693
    }
4694 4694

  
4695 4695
    //