First succesful end-to-end test without fab.

Author: onyxfish

beeswithmachineguns/bees.py

@@ -28,12 +28,13 @@
 importos
 importre
 importtime
+importurllib2
 
 importboto
 importparamiko
 
 EC2_INSTANCE_TYPE='m1.small'
-STATE_FILENAME='~/.bees'
+STATE_FILENAME=os.path.expanduser('~/.bees')
 
 username=None
 key_name=None
@@ -43,8 +44,8 @@
 instance_ids= []
 ifos.path.isfile(STATE_FILENAME):
 withopen(STATE_FILENAME, 'r') asf:
-username=f.readline()
-key_name=f.readline()
+username=f.readline().strip()
+key_name=f.readline().strip()
 text=f.read()
 instance_ids=text.split('\n')
 
@@ -58,6 +59,9 @@ def _write_server_list(instances):
 f.write('%s\n'%key_name)
 f.write('\n'.join([instance.idforinstanceininstances]))
 
+def_get_pem_path(key):
+returnos.path.expanduser('~/.ssh/%s.pem'%key)
+
 # Methods
 
 defup(count, group, zone, image_id, login, key):
@@ -76,6 +80,12 @@ def up(count, group, zone, image_id, login, key):
 
 count=int(count)
 
+pem_path=_get_pem_path()
+
+ifnotos.path.isfile(pem_path):
+print'No key file found at %s'%pem_path
+return
+
 print'Connecting to the hive.'
 
 ec2_connection=boto.connect_ec2()
@@ -162,7 +172,7 @@ def _attack(params):
 client.connect(
 params['instance_name'],
 username=username,
-key_filename=key_name)
+key_filename=_get_pem_path(key_name))
 
 print'Bee %i is firing his machine gun. Bang bang!'%params['i']
 
@@ -276,7 +286,7 @@ def attack(url, n, c):
 print'Stinging URL so it will be cached for the attack.'
 
 # Ping url so it will be cached for testing
-local('curl %s >> /dev/null'%url)
+urllib2.urlopen(url)
 
 print'Organizing the swarm.'
 

beeswithmachineguns/main.py

@@ -34,7 +34,7 @@ def parse_options():
  """
 command=sys,
 parser=OptionParser(usage="""
-bees COMMAND L [options]
+bees COMMAND [options]
 
 Bees with Machine Guns
 
@@ -100,12 +100,12 @@ def parse_options():
 ifnotoptions.key:
 parser.error('To spin up new instances you need to specify a key-pair name with -k')
 
-bees.up(options.servers, options.group, options.zone, options.instance, options.key)
+bees.up(options.servers, options.group, options.zone, options.instance, options.login, options.key)
 elifcommand=="attack":
 ifnotoptions.url:
 parser.error("To run an attack you need to specify a url with -u")
 
-bees.attack(options.url, options.number, options.concurrency)
+bees.attack(options.url, options.number, options.concurrent)
 elifcommand=="down":
 bees.down()