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/e20f599a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/e20f599a Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/e20f599a Branch: refs/heads/master Commit: e20f599a23ed0e83378e0d7906e7de3ae7e3b728 Parents: 373d404 Author: Pranav Saxena <[email protected]> Authored: Tue Aug 21 02:20:59 2012 +0530 Committer: Vijay Venkatachalam <[email protected]> Committed: Fri Nov 16 10:56:54 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/e20f599a/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 10f4fcd..c11b90b 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1071,9 +1071,15 @@ data.listvirtualmachinesresponse.virtualmachine ? data.listvirtualmachinesresponse.virtualmachine : [], function(instance) { - return $.inArray(instance.state, [ - 'Destroyed','Expunging' - ]) == -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','Expunging']) == -1; + return nonAutoScale && isActiveState; } ) });
