feat: add port mapping for containers

Allows the ports specified to be mapped directly into the container. Closes #24
loads · Mar 20, 2017 · af054af · af054af
1 parent 2856cab
commit af054af
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 20 deletions.
diff --git a/ardere/aws.py b/ardere/aws.py
@@ -159,28 +159,43 @@ def create_service(self, step):
 
         # ECS wants a family name for task definitions, no spaces, 255 chars
         family_name = step["name"] + "-" + self._plan_uuid
+
+        # Setup the container definition
+        container_def = {
+            "name": step["name"],
+            "image": step["container_name"],
+            "cpu": step["cpu_units"],
+            # use host network mode for optimal performance
+            "networkMode": "host",
+
+            # using only memoryReservation sets no hard limit
+            "memoryReservation": 256,
+            "environment": env_vars,
+            "entryPoint": cmd,
+            "logConfiguration": {
+                "logDriver": "awslogs",
+                "options": {
+                    "awslogs-group": self.container_log_group,
+                    "awslogs-region": "us-east-1",
+                    "awslogs-stream-prefix": "ardere-{}".format(
+                        self.plan_uuid
+                    )
+                }
+            }
+        }
+
+        if "port_mapping" in step:
+            ports = []
+            for port_map in step["port_mapping"].split(","):
+                ports.append({
+                    "containerPort": int(port_map)
+                })
+            container_def["portMappings"] = ports
+
         task_response = self._ecs_client.register_task_definition(
             family=family_name,
             containerDefinitions=[
-                {
-                    "name": step["name"],
-                    "image": step["container_name"],
-                    "cpu": step["cpu_units"],
-                    # using only memoryReservation sets no hard limit
-                    "memoryReservation": 256,
-                    "environment": env_vars,
-                    "entryPoint": cmd,
-                    "logConfiguration": {
-                        "logDriver": "awslogs",
-                        "options": {
-                            "awslogs-group": self.container_log_group,
-                            "awslogs-region": "us-east-1",
-                            "awslogs-stream-prefix": "ardere-{}".format(
-                                self.plan_uuid
-                            )
-                        }
-                    }
-                }
+                container_def
             ],
             placementConstraints=[
                 # Ensure the service is confined to the right instance type

diff --git a/tests/fixtures.py b/tests/fixtures.py
@@ -13,6 +13,7 @@
       "environment_data": [
           "SOME_VAR=great-value"
       ],
+      "port_mapping": "8000,4000",
       "container_name": "bbangert/ap-loadtester:latest",
       "additional_command_args": "./apenv/bin/aplt_testplan wss://autopush.stage.mozaws.net 'aplt.scenarios:notification_forever,1000,1,0'"
     }
@@ -28,7 +29,7 @@
     "run_max_time": 140,
     "cpu_units": 2048,
     "container_name": "bbangert/pushgo:1.5rc4",
-    "port_mapping": "8080:8090,8081:8081,3000:3000,8082:8082",
+    "port_mapping": "8080,8081,3000,8082",
     "load_balancer": {
         "env_var": "TEST_CLUSTER",
         "ping_path": "/status/health",

diff --git a/tests/test_aws.py b/tests/test_aws.py
@@ -97,6 +97,11 @@ def test_create_service(self):
         eq_(step["serviceArn"], "arn:of:some:service::")
         ecs._ecs_client.register_task_definition.assert_called()
 
+        _, kwargs = ecs._ecs_client.register_task_definition.call_args
+        container_def = kwargs["containerDefinitions"][0]
+        ok_("portMappings" in container_def)
+        eq_(container_def["networkMode"], "host")
+
     def test_create_services(self):
         ecs = self._make_FUT()
         ecs.create_service = mock.Mock()