From 71dfca41a7a66d2bbc7d03d391d73370e919cf67 Mon Sep 17 00:00:00 2001 From: Pranav Saxena Date: Tue, 21 Aug 2012 02:11:59 +0530 Subject: [PATCH] CS-15927:Filter to hide the autoscale VM's through a Regular expression for a Basic Zone Reviewed-by:Brian --- ui/scripts/network.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index d109f34fd04..45e6bda0420 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -896,10 +896,17 @@ 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; + } ) }); },