microsoft
/
vsts-docker
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

External VHOST port should always be 80. The port specified in the label is the container port under which the VIP ends up.

This commit is contained in:
Peter Jausovec 2016-11-10 17:00:16 -08:00
Родитель b6ded21e9f
Коммит 41fbc58073
2 изменённых файлов: 11 добавлений и 11 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
src/tasks/dockerDeploy/acs-dcos/portmappings.py
Просмотреть файл

@ -208,7 +208,7 @@ class PortMappings(object):
vhost_added = False
port = all_vhosts[vhost]
port = str(port).strip()
external_vip = vhost + '.external' + ':' + port
external_vip = vhost + '.external' + ':80'
for port_mapping in existing_port_mappings:
if str(port_mapping['containerPort']).strip() == str(port):
port_mapping['labels']['VIP_2'] = external_vip

20
src/tasks/dockerDeploy/acs-dcos/test_portmappings.py
Просмотреть файл

@ -186,64 +186,64 @@ class PortMappingsTest(unittest.TestCase):
def test_get_port_mappings_external_port(self):
p = portmappings.PortMappings()
expected = [{'labels': {'VIP_1': 'myvipname.internal:5000', 'VIP_0': '1.1.1.1:5000', 'VIP_2': 'www.example.com.external:5000'}, 'protocol': 'tcp', 'containerPort': 5000, 'hostPort': 0}]
expected = [{'labels': {'VIP_1': 'myvipname.internal:5000', 'VIP_0': '1.1.1.1:5000', 'VIP_2': 'www.example.com.external:80'}, 'protocol': 'tcp', 'containerPort': 5000, 'hostPort': 0}]
service_data = {'ports': ["5000"], 'labels': {'com.microsoft.acs.dcos.marathon.vhost': 'www.example.com:5000'} }
self.assertEquals(p.get_port_mappings('1.1.1.1', service_data, 'myvipname'), expected)
def test_get_port_mappings_external_port_case(self):
p = portmappings.PortMappings()
expected = [{'labels': {'VIP_1': 'myvipname.internal:5000', 'VIP_0': '1.1.1.1:5000', 'VIP_2': 'www.example.com.external:5000'}, 'protocol': 'tcp', 'containerPort': 5000, 'hostPort': 0}]
expected = [{'labels': {'VIP_1': 'myvipname.internal:5000', 'VIP_0': '1.1.1.1:5000', 'VIP_2': 'www.example.com.external:80'}, 'protocol': 'tcp', 'containerPort': 5000, 'hostPort': 0}]
service_data = {'ports': ["5000"], 'labels': {'com.MICROSOFT.acs.dcos.marathon.vhost': 'www.example.com:5000'} }
self.assertEquals(p.get_port_mappings('1.1.1.1', service_data, 'myvipname'), expected)
def test_get_port_mappings_external_no_internal_port(self):
p = portmappings.PortMappings()
expected = [{'labels': {'VIP_0': '1.1.1.1:5000', 'VIP_2': 'www.example.com.external:5000'}, 'protocol': 'tcp', 'containerPort': 5000, 'hostPort': 0}]
expected = [{'labels': {'VIP_0': '1.1.1.1:5000', 'VIP_2': 'www.example.com.external:80'}, 'protocol': 'tcp', 'containerPort': 5000, 'hostPort': 0}]
service_data = {'labels': {'com.microsoft.acs.dcos.marathon.vhost': 'www.example.com:5000'} }
self.assertEquals(p.get_port_mappings('1.1.1.1', service_data, 'myvipname'), expected)
def test_get_port_mappings_external_no_internal_port_case(self):
p = portmappings.PortMappings()
expected = [{'labels': {'VIP_0': '1.1.1.1:5000', 'VIP_2': 'www.example.com.external:5000'}, 'protocol': 'tcp', 'containerPort': 5000, 'hostPort': 0}]
expected = [{'labels': {'VIP_0': '1.1.1.1:5000', 'VIP_2': 'www.example.com.external:80'}, 'protocol': 'tcp', 'containerPort': 5000, 'hostPort': 0}]
service_data = {'labels': {'com.microsoft.acs.dcos.MARATHON.vhost': 'www.example.com:5000'} }
self.assertEquals(p.get_port_mappings('1.1.1.1', service_data, 'myvipname'), expected)
def test_get_port_mappings_multiple_externals(self):
p = portmappings.PortMappings()
expected = [{'labels': {'VIP_0': '1.1.1.1:8080', 'VIP_2': u'www.contoso.com.external:8080'}, 'protocol': 'tcp', 'containerPort': 8080, 'hostPort': 0}, {'labels': {'VIP_0': '1.1.1.1:8081', 'VIP_2': u'api.contoso.com.external:8081'}, 'protocol': 'tcp', 'containerPort': 8081, 'hostPort': 0}]
expected = [{'labels': {'VIP_0': '1.1.1.1:8080', 'VIP_2': u'www.contoso.com.external:80'}, 'protocol': 'tcp', 'containerPort': 8080, 'hostPort': 0}, {'labels': {'VIP_0': '1.1.1.1:8081', 'VIP_2': u'api.contoso.com.external:80'}, 'protocol': 'tcp', 'containerPort': 8081, 'hostPort': 0}]
service_data = {'labels': {'com.microsoft.acs.dcos.marathon.vhosts': '["www.contoso.com:8080", "api.contoso.com:8081"]' } }
actual = p.get_port_mappings('1.1.1.1', service_data, 'myvipname')
self.assertEquals(actual, expected)
def test_get_port_mappings_multiple_externals_case(self):
p = portmappings.PortMappings()
expected = [{'labels': {'VIP_0': '1.1.1.1:8080', 'VIP_2': u'www.contoso.com.external:8080'}, 'protocol': 'tcp', 'containerPort': 8080, 'hostPort': 0}, {'labels': {'VIP_0': '1.1.1.1:8081', 'VIP_2': u'api.contoso.com.external:8081'}, 'protocol': 'tcp', 'containerPort': 8081, 'hostPort': 0}]
expected = [{'labels': {'VIP_0': '1.1.1.1:8080', 'VIP_2': u'www.contoso.com.external:80'}, 'protocol': 'tcp', 'containerPort': 8080, 'hostPort': 0}, {'labels': {'VIP_0': '1.1.1.1:8081', 'VIP_2': u'api.contoso.com.external:80'}, 'protocol': 'tcp', 'containerPort': 8081, 'hostPort': 0}]
service_data = {'labels': {'com.microsoft.acs.dcos.marathon.VHOSTS': '["www.contoso.com:8080", "api.contoso.com:8081"]' } }
actual = p.get_port_mappings('1.1.1.1', service_data, 'myvipname')
self.assertEquals(actual, expected)
def test_get_port_mappings_string(self):
p = portmappings.PortMappings()
expected = [{'labels': {'VIP_0': '1.1.1.1:5000', 'VIP_2': 'www.example.com.external:5000'}, 'protocol': 'tcp', 'containerPort': 5000, 'hostPort': 0}]
expected = [{'labels': {'VIP_0': '1.1.1.1:5000', 'VIP_2': 'www.example.com.external:80'}, 'protocol': 'tcp', 'containerPort': 5000, 'hostPort': 0}]
service_data = {'labels': {'com.microsoft.acs.dcos.marathon.vhost=www.example.com:5000'} }
self.assertEquals(p.get_port_mappings('1.1.1.1', service_data, 'myvipname'), expected)
def test_get_port_mappings_string_case(self):
p = portmappings.PortMappings()
expected = [{'labels': {'VIP_0': '1.1.1.1:5000', 'VIP_2': 'www.example.com.external:5000'}, 'protocol': 'tcp', 'containerPort': 5000, 'hostPort': 0}]
expected = [{'labels': {'VIP_0': '1.1.1.1:5000', 'VIP_2': 'www.example.com.external:80'}, 'protocol': 'tcp', 'containerPort': 5000, 'hostPort': 0}]
service_data = {'labels': {'com.microsoft.ACS.dcos.MARATHON.vhost=www.example.com:5000'} }
self.assertEquals(p.get_port_mappings('1.1.1.1', service_data, 'myvipname'), expected)
def test_get_port_mappings_string_list(self):
p = portmappings.PortMappings()
expected = [{'labels': {'VIP_0': '1.1.1.1:8080', 'VIP_2': u'www.contoso.com.external:8080'}, 'protocol': 'tcp', 'containerPort': 8080, 'hostPort': 0}, {'labels': {'VIP_0': '1.1.1.1:8081', 'VIP_2': u'api.contoso.com.external:8081'}, 'protocol': 'tcp', 'containerPort': 8081, 'hostPort': 0}]
expected = [{'labels': {'VIP_0': '1.1.1.1:8080', 'VIP_2': u'www.contoso.com.external:80'}, 'protocol': 'tcp', 'containerPort': 8080, 'hostPort': 0}, {'labels': {'VIP_0': '1.1.1.1:8081', 'VIP_2': u'api.contoso.com.external:80'}, 'protocol': 'tcp', 'containerPort': 8081, 'hostPort': 0}]
service_data = {'labels': { "com.microsoft.acs.dcos.marathon.vhosts=[\"www.contoso.com:8080\", \"api.contoso.com:8081\"]" }}
actual = p.get_port_mappings('1.1.1.1', service_data, 'myvipname')
self.assertEquals(actual, expected)
def test_get_port_mappings_string_list_case(self):
p = portmappings.PortMappings()
expected = [{'labels': {'VIP_0': '1.1.1.1:8080', 'VIP_2': u'www.contoso.com.external:8080'}, 'protocol': 'tcp', 'containerPort': 8080, 'hostPort': 0}, {'labels': {'VIP_0': '1.1.1.1:8081', 'VIP_2': u'api.contoso.com.external:8081'}, 'protocol': 'tcp', 'containerPort': 8081, 'hostPort': 0}]
expected = [{'labels': {'VIP_0': '1.1.1.1:8080', 'VIP_2': u'www.contoso.com.external:80'}, 'protocol': 'tcp', 'containerPort': 8080, 'hostPort': 0}, {'labels': {'VIP_0': '1.1.1.1:8081', 'VIP_2': u'api.contoso.com.external:80'}, 'protocol': 'tcp', 'containerPort': 8081, 'hostPort': 0}]
service_data = {'labels': { "com.microsoft.acs.DCOS.marathon.vhosts=[\"www.contoso.com:8080\", \"api.contoso.com:8081\"]" }}
actual = p.get_port_mappings('1.1.1.1', service_data, 'myvipname')
self.assertEquals(actual, expected)