Rewrote help text. Made login user configurable.

Author: onyxfish

beeswithmachineguns/bees.py

@@ -33,14 +33,18 @@
 importparamiko
 
 EC2_INSTANCE_TYPE='m1.small'
+STATE_FILENAME='~/.bees'
 
-STATE_FILENAME='theswarm.txt'
+username=None
+key_name=None
 
 # Load state from file
 
 instance_ids= []
 ifos.path.isfile(STATE_FILENAME):
 withopen(STATE_FILENAME, 'r') asf:
+username=f.readline()
+key_name=f.readline()
 text=f.read()
 instance_ids=text.split('\n')
 
@@ -50,14 +54,22 @@
 
 def_write_server_list(instances):
 withopen(STATE_FILENAME, 'w') asf:
+f.write('%s\n'%username)
+f.write('%s\n'%key_name)
 f.write('\n'.join([instance.idforinstanceininstances]))
 
 # Methods
 
-defup(count, group, zone, image_id, key_name):
+defup(count, group, zone, image_id, login, key):
 """
  Startup the load testing server.
  """
+globalusername
+globalkey_name
+
+username=login
+key_name=key
+
 ifinstance_ids:
 print'Bees are already assembled and awaiting orders.'
 return
@@ -140,14 +152,17 @@ def _attack(params):
 
  Intended for use with multiprocessing.
  """
+globalusername
+globalkey_name
+
 print'Bee %i is joining the swarm.'%params['i']
 
 client=paramiko.SSHClient()
 client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
 client.connect(
 params['instance_name'],
-username='newsapps',
-key_filename='/Users/sk/.ssh/frakkingtoasters.pem')
+username=username,
+key_filename=key_name)
 
 print'Bee %i is firing his machine gun. Bang bang!'%params['i']
 

beeswithmachineguns/main.py

@@ -34,59 +34,65 @@ def parse_options():
  """
 command=sys,
 parser=OptionParser(usage="""
-bwmg COMMAND L [options]
+bees COMMAND L [options]
 
 Bees with Machine Guns
 
 A utility for arming (creating) many bees (small EC2 instances) to attack
 (load test) targets (web applications).
 
 commands:
- up start a batch of load testing servers
- attack begin the attack on a specific url
- down shutdown and deactivate the load testing servers
+ up Start a batch of load testing servers.
+ attack Begin the attack on a specific url.
+ down Shutdown and deactivate the load testing servers.
  """)
 
-up_group=OptionGroup(parser, "up options", "Options for the up command")
+up_group=OptionGroup(parser, "up", 
+"""In order to spin up new servers you will need to specify at least the -k command, which is the name of the EC2 keypair to use for creating and connecting to the new servers. The bees will expect to find a .pem file with this name in ~/.ssh/.""")
+
+# Required
+up_group.add_option('-k', '--key', metavar="KEY", nargs=1,
+action='store', dest='key', type='string', 
+help="The ssh key pair name to use to connect to the new servers.")
 
 up_group.add_option('-s', '--servers', metavar="SERVERS", nargs=1,
 action='store', dest='servers', type='int', default=5,
-help="number of servers to start (default: 5)")
+help="The number of servers to start (default: 5).")
 up_group.add_option('-g', '--group', metavar="GROUP", nargs=1,
 action='store', dest='group', type='string', default='staging',
-help="the security group to run the instances under (default: staging)")
+help="The security group to run the instances under (default: staging).")
 up_group.add_option('-z', '--zone', metavar="ZONE", nargs=1,
 action='store', dest='zone', type='string', default='us-east-1d',
-help="the availability zone to start the instances in (default: us-east-1d)")
+help="The availability zone to start the instances in (default: us-east-1d).")
 up_group.add_option('-i', '--instance', metavar="INSTANCE", nargs=1,
 action='store', dest='instance', type='string', default='ami-ff17fb96',
-help="the instance-id to start each server from (default ami-ff17fb96)")
-up_group.add_option('-k', '--key', metavar="KEY", nargs=1,
-action='store', dest='key', type='string', 
-help="the ssh key pair name to use to connect to the new servers")
+help="The instance-id to use for each server from (default: ami-ff17fb96).")
+up_group.add_option('-l', '--login', metavar="LOGIN", nargs=1,
+action='store', dest='login', type='string', default='newsapps',
+help="The ssh username name to use to connect to the new servers (default: newsapps).")
 
 parser.add_option_group(up_group)
 
-attack_group=OptionGroup(parser, "attack options", "Options for the attack command.")
+attack_group=OptionGroup(parser, "attack", "")
+
+# Required
+attack_group.add_option('-u', '--url', metavar="URL", nargs=1,
+action='store', dest='url', type='string',
+help="URL of the target to attack.")
 
 attack_group.add_option('-n', '--number', metavar="NUMBER", nargs=1,
 action='store', dest='number', type='int', default=1000,
-help="number of total connections to make to the target (default: 1000)")
-
+help="The number of total connections to make to the target (default: 1000).")
 attack_group.add_option('-c', '--concurrent', metavar="CONCURRENT", nargs=1,
 action='store', dest='concurrent', type='int', default=100,
-help="number of concurrent connections to make to the target (default: 100)")
-
-attack_group.add_option('-u', '--url', metavar="URL", nargs=1,
-action='store', dest='url', type='string',
-help="url of the target to attack")
+help="The number of concurrent connections to make to the target (default: 100).")
 
 parser.add_option_group(attack_group)
 
  (options, args) =parser.parse_args()
 
 iflen(args) <=0:
-parser.error("Please enter a command")
+parser.error("Please enter a command.")
 
 command=args[0]