incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pran...@apache.org
Subject [33/50] git commit: CS-15927:Filter to hide the autoscale VM's through a Regular expression for a load balancer Rule
Date Fri, 16 Nov 2012 10:00:31 GMT
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/b8bb6f48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/b8bb6f48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/b8bb6f48

Branch: refs/heads/master
Commit: b8bb6f483e45f776eba3e3d0c01e3ed3e6ca553d
Parents: ce8fe90
Author: Pranav Saxena <pranav.saxena@citrix.com>
Authored: Sat Aug 18 01:01:57 2012 +0530
Committer: Vijay Venkatachalam <vijay.venkatachalam@citrix.com>
Committed: Fri Nov 16 10:56:53 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/b8bb6f48/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
old mode 100644
new mode 100755
index 353be31..36e134d
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2359,12 +2359,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','Expunging'])
== -1;
                                   var notExisting = !$.grep(itemData, function(item) {
                                     return item.id == instance.id;
                                   }).length;
 
-                                  return isActiveState && notExisting;
+                                  return nonAutoScale && isActiveState &&
notExisting;
                                 }
                               );
 


Mime
View raw message