Merge pull request #101 from Rob-Johnson/add-name-attribute-port-mapping

add name attribute to port mapping
thefactory · May 11, 2016 · bc63250 · bc63250
2 parents 15f5845 + 49767b9
commit bc63250
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/itests/steps/marathon_steps.py b/itests/steps/marathon_steps.py
@@ -48,6 +48,7 @@ def create_complex_new_app_with_unicode(context):
             'docker': {
                 'portMappings':
                     [{'protocol': 'tcp',
+                      'name': 'myport',
                       'containerPort': 8888,
                       'hostPort': 0}],
                 'image': u'localhost/fake_docker_url',

diff --git a/marathon/models/container.py b/marathon/models/container.py
@@ -74,6 +74,7 @@ class MarathonContainerPortMapping(MarathonObject):
 
     See https://mesosphere.github.io/marathon/docs/native-docker.html
 
+    :param str name:
     :param int container_port:
     :param int host_port:
     :param str protocol:
@@ -83,7 +84,8 @@ class MarathonContainerPortMapping(MarathonObject):
     PROTOCOLS = ['tcp', 'udp']
     """Valid protocols"""
 
-    def __init__(self, container_port=None, host_port=0, service_port=None, protocol='tcp', labels=None):
+    def __init__(self, name=None, container_port=None, host_port=0, service_port=None, protocol='tcp', labels=None):
+        self.name = name
         self.container_port = container_port
         self.host_port = host_port
         self.service_port = service_port