Updated Branches: refs/heads/autoscale f5e8a3708 -> 61be77f46
CS-15927:Filter to hide the autoscale VM's through a Regular expression for a Basic Zone Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/61be77f4 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/61be77f4 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/61be77f4 Branch: refs/heads/autoscale Commit: 61be77f46c0154c99802b7f259ecfffd535af80e Parents: f5e8a37 Author: Pranav Saxena <[email protected]> Authored: Tue Aug 21 02:20:59 2012 +0530 Committer: Pranav Saxena <[email protected]> Committed: Tue Aug 21 02:20:59 2012 +0530 ---------------------------------------------------------------------- ui/scripts/network.js | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/61be77f4/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index cc056ed..a1ad2ab 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -807,9 +807,15 @@ data.listvirtualmachinesresponse.virtualmachine ? data.listvirtualmachinesresponse.virtualmachine : [], function(instance) { - return $.inArray(instance.state, [ - 'Destroyed' - ]) == -1; + var nonAutoScale=0; + if( instance.displayname.match(/AutoScale-LB-/)==null) + nonAutoScale =1; + else { + if(instance.displayname.match(/AutoScale-LB-/).length) + nonAutoScale =0; + } + var isActiveState= $.inArray(instance.state, ['Destroyed' ]) == -1; + return nonAutoScale && isActiveState; } ) });
