Updated Branches: refs/heads/autoscale 3d39d44a6 -> bf631808f
CS-15927:Filter to hide the autoscale VM's through a Regular expression for a load balancer Rule Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/bf631808 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/bf631808 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/bf631808 Branch: refs/heads/autoscale Commit: bf631808fb36af9bfde8c251db1e522f109c45f6 Parents: 3d39d44 Author: Pranav Saxena <[email protected]> Authored: Sat Aug 18 01:01:57 2012 +0530 Committer: Pranav Saxena <[email protected]> Committed: Sat Aug 18 01:01:57 2012 +0530 ---------------------------------------------------------------------- ui/scripts/network.js | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/bf631808/ui/scripts/network.js ---------------------------------------------------------------------- diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 90b074b..57d38aa 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1978,12 +1978,20 @@ data.listvirtualmachinesresponse.virtualmachine ? data.listvirtualmachinesresponse.virtualmachine : [], function(instance) { + //Hiding the autoScale VMs + var nonAutoScale =0; + if(instance.name.match(/AutoScale-LB-/) == null) + nonAutoScale = 1; + else { + if( instance.name.match(/AutoScale-LB-/).length) + nonAutoScale =0; + } var isActiveState = $.inArray(instance.state, ['Destroyed']) == -1; var notExisting = !$.grep(itemData, function(item) { return item.id == instance.id; }).length; - return isActiveState && notExisting; + return nonAutoScale && isActiveState && notExisting; } );
