Merge branch 'master' of https://github.com/simple-rules/harmony-benchmark

aws-experiment-launch/collect_public_ips.py

@@ -16,7 +16,7 @@ if __name__ == "__main__":
                         dest='file_output', default='raw_ip.txt')
     args = parser.parse_args()
 
-    if not args.instance_output or not args.instance_output or not os.path.isfile(args.instance_output):
+    if not args.instance_output or not os.path.isfile(args.instance_output):
         print "%s or %s are not existed" % (args.file_output, args.instance_output)
         sys.exit(1)
     if args.instance_output:

aws-experiment-launch/terminate_instances.py

@@ -0,0 +1,32 @@
+import argparse
+import os
+import random
+import sys
+
+from utils import utils
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(description='This script helps you to collect public ips')
+    parser.add_argument('--instance_output', type=str, dest='instance_output',
+                        default='instance_output.txt',
+                        help='the file contains node_name_tag and region number of created instances.')
+    parser.add_argument('--region_config', type=str,
+                        dest='region_config', default='configuration.txt')
+    args = parser.parse_args()
+
+    if not args.instance_output or not os.path.isfile(args.instance_output):
+        print "%s is not existed" % args.instance_output
+        sys.exit(1)
+    if args.instance_output:
+        with open(args.instance_output, "r") as fin:
+            for line in fin.readlines():
+                items = line.split(" ")
+                region_number = items[1].strip()
+                node_name_tag = items[0].strip()
+                ec2_client, session = utils.create_ec2_client(region_number, args.region_config)
+                filters = [{'Name': 'tag:Name','Values': [node_name_tag]}]
+                instance_ids = utils.get_instance_ids(ec2_client.describe_instances(Filters=filters))
+                ec2_client.terminate_instances(InstanceIds=instance_ids)
+                print "waiting until instances with tag %s died." % node_name_tag
+                waiter = ec2_client.get_waiter('instance_terminated')
+                waiter.wait(InstanceIds=instance_ids)