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

# Conflicts:
#	aws-experiment-launch/create_and_deploy.py

aws-experiment-launch/create_and_deploy.py

@@ -21,10 +21,11 @@ REGION_SECURITY_GROUP = 'region_security_group'
 REGION_HUMAN_NAME = 'region_human_name'
 INSTANCE_TYPE = 't2.small'
 REGION_AMI = 'region_ami'
-# USER_DATA = 'user-data.sh'
+with open("user-data.sh", "r") as userdata_file:
+    USER_DATA = userdata_file.read()
+
 # UserData must be base64 encoded for spot instances.
-with open("user-data.sh", "rb") as userdata_file:
-    USER_DATA = base64.b64encode(userdata_file.read())
+USER_DATA_BASE64 = base64.b64encode(USER_DATA)
 
 IAM_INSTANCE_PROFILE = 'BenchMarkCodeDeployInstanceProfile'
 REPO = "simple-rules/harmony-benchmark"
@@ -37,8 +38,7 @@ NODE_NAME_SUFFIX = "NODE-" + CURRENT_SESSION
 
 """
 TODO:
-NODE = region_number + NODE_VALUE
-Use that to retrieve ids, only deploy on specific nodes (right now it deploys everywere), remove placement group. 
+
 save NODE to disk, so that you can selectively only run deploy (not recreate instances). 
 Right now all instances have "NODE" so this has uninted consequences of running on instances that were previous created.
 Build (argparse,functions) support for 
@@ -60,8 +60,9 @@ def run_one_region_instances(config, region_number, number_of_instances, instanc
     session = boto3.Session(region_name=region_name)
     ec2_client = session.client('ec2')
     if instance_type == InstanceType.ON_DEMAND:
-        response = create_instances(
+        NODE_NAME = create_instances(
             config, ec2_client, region_number, int(number_of_instances))
+        print("Created %s in region %s"%(NODE_NAME,region_number))  ##REPLACE ALL print with logger
     elif instance_type == InstanceType.SPOT_INSTANCE:
         response = request_spot_instances(
             config, ec2_client, region_number, int(number_of_instances))
@@ -109,7 +110,7 @@ def create_instances(config, ec2_client, region_number, number_of_instances):
         #     }
         # }
     )
-    return response
+    return NODE_NAME
 
 
 def request_spot_instances(config, ec2_client, region_number, number_of_instances):
@@ -123,7 +124,7 @@ def request_spot_instances(config, ec2_client, region_number, number_of_instance
             'IamInstanceProfile': {
                 'Name': IAM_INSTANCE_PROFILE
             },
-            'UserData': USER_DATA,
+            'UserData': USER_DATA_BASE64,
             'ImageId': config[region_number][REGION_AMI],
             'InstanceType': INSTANCE_TYPE,
             'KeyName': config[region_number][REGION_KEY],
@@ -223,45 +224,39 @@ def run_one_region_codedeploy(region_number, commitId):
     NODE_NAME = region_number + "-" + NODE_NAME_SUFFIX
     session = boto3.Session(region_name=region_name)
     ec2_client = session.client('ec2')
-    filters = [
-        {
-            'Name': 'tag:Name',
-            'Values': [NODE_NAME]
-        }
-    ]
+    filters = [{'Name': 'tag:Name','Values': [NODE_NAME]}]
+    instance_ids = get_instance_ids(ec2_client.describe_instances(Filters=filters))
+    
+    print("Number of instances: %d" % len(instance_ids))
 
-    print("Waiting for all instances to start running")
+    print("Waiting for all %d instances in region %s to start running"%(len(instance_ids),region_number))
     waiter = ec2_client.get_waiter('instance_running')
-    waiter.wait(Filters=filters)
+    waiter.wait(InstanceIds=instance_ids)
 
-    print("Waiting for all instances to be status ok")
+    print("Waiting for all %d instances in region %s to be INSTANCE STATUS OK"%(len(instance_ids),region_number))
     waiter = ec2_client.get_waiter('instance_status_ok')
-    waiter.wait(Filters=filters)
+    waiter.wait(InstanceIds=instance_ids)
 
-    print("Waiting for system to be status ok")
+    print("Waiting for all %d instances in region %s to be SYSTEM STATUS OK"%(len(instance_ids),region_number))
     waiter = ec2_client.get_waiter('system_status_ok')
-    waiter.wait(Filters=filters)
+    waiter.wait(InstanceIds=instance_ids)
 
     codedeploy = session.client('codedeploy')
     application_name = APPLICATION_NAME
-    deployment_group = APPLICATION_NAME + "-" + str(commitId)
+    deployment_group = APPLICATION_NAME + "-" + str(commitId)[6] + "-" + CURRENT_SESSION
     repo = REPO
+
+    print("Setting up to deploy commitId %s on region %s"%(commitId,region_number))
     response = get_application(codedeploy, application_name)
-    response = get_deployment_group(
-        codedeploy, application_name, deployment_group)
+    deployment_group = get_deployment_group(
+        codedeploy, region_number, application_name, deployment_group)
     depId = deploy(codedeploy, application_name,
                    deployment_group, repo, commitId)
     return region_number, depId
 
 
-def get_deployment_group(codedeploy, application_name, deployment_group):
+def get_deployment_group(codedeploy, region_number,application_name, deployment_group):
     NODE_NAME = region_number + "-" + NODE_NAME_SUFFIX
-    response = codedeploy.list_deployment_groups(
-        applicationName=application_name
-    )
-    if deployment_group in response['deploymentGroups']:
-        return response
-    else:
     response = codedeploy.create_deployment_group(
         applicationName=application_name,
         deploymentGroupName=deployment_group,
@@ -271,19 +266,15 @@ def get_deployment_group(codedeploy, application_name, deployment_group):
             'deploymentType': 'IN_PLACE',
             'deploymentOption': 'WITHOUT_TRAFFIC_CONTROL'
         },
-            ec2TagSet={
-                'ec2TagSetList': [
-                    [
+        ec2TagFilters = [
             {
                 'Key': 'Name',
                 'Value': NODE_NAME,
                 'Type': 'KEY_AND_VALUE'
-                        },
-                    ],
-                ]
             }
+        ]
     )
-        return response
+    return deployment_group
 
 
 def get_application(codedeploy, application_name):
@@ -338,12 +329,10 @@ def deploy(codedeploy, application_name, deployment_group, repo, commitId):
         print(info)
         return depId
 
-
 def run_one_region_codedeploy_wrapper(region_number, commitId, queue):
     region_number, depId = run_one_region_codedeploy(region_number, commitId)
     queue.put((region_number, depId))
 
-
 def launch_code_deploy(region_list, commitId):
     queue = Queue()
     jobs = []
@@ -368,7 +357,6 @@ def get_instance_ids(describe_instances_response):
             instance_ids.append(instance["InstanceId"])
     return instance_ids
 
-
 def read_configuration_file(filename):
     config = {}
     with open(filename, 'r') as f:
@@ -383,7 +371,6 @@ def read_configuration_file(filename):
             config[region_num][REGION_AMI] = mylist[5]
     return config
 
-
 def get_commitId(commitId):
     if commitId is None:
         commitId = run("git rev-list --max-count=1 HEAD",