Removed obsolete print_ssh commands; added USAGE output, cleaned-up s…

…ome obsolete TODO comments

lcaws.rb

@@ -28,22 +28,22 @@ def get_web_proxy_config(ecc, instances, args)
   app_count = 0
   proxy_config = Array.new
 
+  # get running web and app instances
   apps = ecc.get_app_instances(instances, "running")
   webs = ecc.get_web_instances(instances, "running")
-
-  # TODO: remove non-running instances from apps and webs
 
   # sort by the number appended to the name
   apps.sort! {|a,b| a.name[3..-1].to_i <=> b.name[3..-1].to_i}
   webs.sort! {|a,b| a.name[3..-1].to_i <=> b.name[3..-1].to_i}
 
+  # make sure the ration of web to apps is correct
   if webs.size * APPS_PER_WEB != apps.size
     puts "Environment Imbalance Error: there must be #{APPS_PER_WEB} app servers for each web server. Currently there are #{webs.size} webs and #{apps.size} apps"
     return nil
   end
 
+  # allocate the app servers to the web servers
   app_index = 0
-
   webs.each_with_index do |web_instance, index|
     proxy_config[index] = Hash.new
     proxy_config[index][:name] = web_instance.name
@@ -138,14 +138,6 @@ def create_database_configs(ecc, instances, args)
   slave_config.each { |x| puts x.inspect + "\n\n ##########"}    
 end
 
-def print_ssh_commands(ecc, instances, args)
-  puts "SSH commands (apps)"
-  LcAws.print_ssh_commands(ecc.get_app_instances(instances))
-
-  puts "SSH commands (loadgen)"
-  LcAws.print_ssh_commands(ecc.get_loadgen_instances(instances))
-end
-
 def stop_apps(ecc, instances, args)
   puts "Stopping all app servers..."
   ecc.stop_app_servers
@@ -275,9 +267,12 @@ def create_envfile(ecc, instances, args)
 
 
 def print_usage
-#   puts self.public_methods.sort
-#  puts "USAGE: ruby lcaws.rb [list][web-proxy][ssh-commands][stop-apps][start-apps][show-apps][open-apps][stop-loadgens][start-loadgens][show-loadgens][open-loadgens][open-webs][show-dbs][scp-loadgen-results][create-envfile]\n"+
- #      "  There should be at least one command. If more than one command is specified then commands are executed in order"
+ puts "USAGE: ruby lcaws.rb <command>"
+ puts "where <command> is one of the following methods: \n"+
+       " create_envfile, create_web_proxy_config, create_database_configs, list_instances, \n"+
+       " start_apps, stop_apps, show_apps, open_app_terminals, \n" +
+       " start_loadgens, stop_loadgens, open_loadgen_termials, \n"+
+       " start_webs, stop_webs, show_webs, open_web_terminals\n"
 end
 
 ###############

lib/lcec2.rb

@@ -165,7 +165,7 @@ def get_rds_instances_by_name(name_filter)
     all_instances = get_rds_instances
     filtered_instances = Array.new
     all_instances.each do |instance|
-      # check if the name matches AND the state matches the filter provided
+      # check if the name matches
       if !instance.name.nil? and instance.name.include?(name_filter) 
         filtered_instances << instance
       else  
@@ -272,27 +272,6 @@ def add_app_instances(num, zone, names, ami = DEFAULT_APP_AMI)
     add_instances(num,names,'app', opts)
   end
 
-  #
-  # printing helpful commands
-  #
-  def print_proxy_members(instances = nil)
-    apps = get_app_instances(instances)
-    apps.each do |instance|
-      puts "# #{instance.name}" if instance.running?
-      puts "BalancerMember http://#{instance.private_dns_name}:8080" if instance.running?
-    end
-  end
-
-  def self.print_ssh_commands(instances)
-    instances.each do |instance|
-      if instance.keyname == ""
-        puts "ssh -i intuit-baseline.pem ea@#{instance.dns_name}"  if instance.running?
-      else
-        puts "ssh -i #{instance.keyname}.pem root@#{instance.dns_name}"  if instance.running?
-      end
-    end
-  end
-
   private
 
   def get_instance_blob

scripts/add_perf_instances.rb

@@ -7,11 +7,11 @@
 
 # add 2 web, 12 app to us-east1-b
 ecc.add_web_instances(2, "us-east-1b", ["web01", "web02"])
-#ecc.add_app_instances(12, "us-east-1b", ["app001", "app002", "app003", "app004", "app005", "app006", "app007", "app008", "app009", "app010", "app011", "app012"])
+ecc.add_app_instances(12, "us-east-1b", ["app001", "app002", "app003", "app004", "app005", "app006", "app007", "app008", "app009", "app010", "app011", "app012"])
 
 # add 2 web, 12 app to us-east1-c
 ecc.add_web_instances(2, "us-east-1c", ["web03", "web04"])
-#ecc.add_app_instances(12, "us-east-1c", ["app013", "app014", "app015", "app016", "app017", "app018", "app019", "app020", "app021", "app022", "app023", "app024"])
+ecc.add_app_instances(12, "us-east-1c", ["app013", "app014", "app015", "app016", "app017", "app018", "app019", "app020", "app021", "app022", "app023", "app024"])
 
 # ensure they were added