From e20f599a23ed0e83378e0d7906e7de3ae7e3b728 Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Tue, 21 Aug 2012 02:20:59 +0530 Subject: [PATCH] CS-15927:Filter to hide the autoscale VM's through a Regular expression for a Basic Zone --- ui/scripts/network.js | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 10f4fcdec0d..c11b90b7432 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; } ) });