Merge branch 'dev' of https://github.com/compose-viz/compose-viz into dev
This commit is contained in:
commit
58cf1c63b5
1 changed files with 241 additions and 18 deletions
|
@ -3,7 +3,7 @@ from compose_viz.parser import Parser
|
||||||
from compose_viz.compose import Compose
|
from compose_viz.compose import Compose
|
||||||
from compose_viz.service import Service
|
from compose_viz.service import Service
|
||||||
|
|
||||||
@pytest.mark.parametrize("test_input,expected",[
|
@pytest.mark.parametrize('test_input,expected',[
|
||||||
('tests/in/000001.yaml',Compose([
|
('tests/in/000001.yaml',Compose([
|
||||||
Service(
|
Service(
|
||||||
name='frontend',
|
name='frontend',
|
||||||
|
@ -25,61 +25,284 @@ from compose_viz.service import Service
|
||||||
Service(
|
Service(
|
||||||
name='base',
|
name='base',
|
||||||
image='busybox',
|
image='busybox',
|
||||||
user='root',
|
|
||||||
),
|
),
|
||||||
Service(
|
Service(
|
||||||
name='common',
|
name='common',
|
||||||
image='busybox',
|
image='busybox',
|
||||||
extends='base'
|
extends=['base'],
|
||||||
),
|
),
|
||||||
Service(
|
Service(
|
||||||
name='cli',
|
name='cli',
|
||||||
extends='common'
|
extends=['common'],
|
||||||
|
),
|
||||||
|
])),
|
||||||
|
('tests/in/000011.yaml',Compose([
|
||||||
|
Service(
|
||||||
|
name='frontend',
|
||||||
|
image='awesome/webapp',
|
||||||
|
networks=['front-tier', 'back-tier'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='monitoring',
|
||||||
|
image='awesome/monitoring',
|
||||||
|
networks=['admin'],
|
||||||
|
extends=['frontend'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='backend',
|
||||||
|
image='awesome/backend',
|
||||||
|
networks=['back-tier', 'admin'],
|
||||||
|
extends=['frontend'],
|
||||||
),
|
),
|
||||||
])),
|
])),
|
||||||
('tests/in/000100.yaml',Compose([
|
('tests/in/000100.yaml',Compose([
|
||||||
#version='3.9'
|
|
||||||
Service(
|
Service(
|
||||||
build='.',
|
ports=['8000:5000'],
|
||||||
ports=['8000:5000']
|
|
||||||
),
|
),
|
||||||
Service(
|
Service(
|
||||||
name='redis',
|
name='redis',
|
||||||
image='redis:alpine',
|
image='redis:alpine',
|
||||||
),
|
),
|
||||||
])),
|
])),
|
||||||
|
('tests/in/000101.yaml',Compose([
|
||||||
|
Service(
|
||||||
|
name='frontend',
|
||||||
|
image='awesome/webapp',
|
||||||
|
ports=['8000:5000'],
|
||||||
|
networks=['front-tier', 'back-tier'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='monitoring',
|
||||||
|
image='awesome/monitoring',
|
||||||
|
ports=['8000:5001'],
|
||||||
|
networks=['admin'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='backend',
|
||||||
|
image='awesome/backend',
|
||||||
|
ports=['8000:5010'],
|
||||||
|
networks=['back-tier', 'admin'],
|
||||||
|
),
|
||||||
|
])),
|
||||||
|
('tests/in/000110.yaml',Compose([
|
||||||
|
Service(
|
||||||
|
name='frontend',
|
||||||
|
image='awesome/webapp',
|
||||||
|
ports=['8000:5000'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='monitoring',
|
||||||
|
image='awesome/monitoring',
|
||||||
|
extends=['frontend'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='backend',
|
||||||
|
image='awesome/backend',
|
||||||
|
extends=['frontend'],
|
||||||
|
ports=['8000:5001'],
|
||||||
|
),
|
||||||
|
])),
|
||||||
|
('tests/in/000111.yaml',Compose([
|
||||||
|
Service(
|
||||||
|
name='frontend',
|
||||||
|
image='awesome/webapp',
|
||||||
|
ports=['8000:5000']
|
||||||
|
networks=['front-tier', 'back-tier'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='monitoring',
|
||||||
|
image='awesome/monitoring',
|
||||||
|
networks=['admin'],
|
||||||
|
extends=['frontend'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='backend',
|
||||||
|
image='awesome/backend',
|
||||||
|
ports=['8000:5001'],
|
||||||
|
networks=['back-tier', 'admin'],
|
||||||
|
extends=['frontend'],
|
||||||
|
),
|
||||||
|
])),
|
||||||
('tests/in/001000.yaml',Compose([
|
('tests/in/001000.yaml',Compose([
|
||||||
Service(
|
Service(
|
||||||
name='web',
|
name='web',
|
||||||
build='.',
|
depends_on=['db','redis'],
|
||||||
depends_on=['db','redis']
|
|
||||||
),
|
),
|
||||||
Service(
|
Service(
|
||||||
name='redis',
|
name='redis',
|
||||||
image='redis'
|
image='redis',
|
||||||
),
|
),
|
||||||
Service(
|
Service(
|
||||||
name='db',
|
name='db',
|
||||||
image='postgres'
|
image='postgres',
|
||||||
|
),
|
||||||
|
])),
|
||||||
|
('tests/in/001001.yaml',Compose([
|
||||||
|
Service(
|
||||||
|
name='frontend',
|
||||||
|
image='awesome/webapp',
|
||||||
|
networks=['front-tier', 'back-tier'],
|
||||||
|
depends_on=['monitoring','backend'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='monitoring',
|
||||||
|
image='awesome/monitoring',
|
||||||
|
networks=['admin'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='backend',
|
||||||
|
image='awesome/backend',
|
||||||
|
networks=['back-tier', 'admin'],
|
||||||
|
),
|
||||||
|
])),
|
||||||
|
('tests/in/001010.yaml',Compose([
|
||||||
|
Service(
|
||||||
|
name='web',
|
||||||
|
depends_on=['db','redis'],
|
||||||
|
extends=['redis']
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='redis',
|
||||||
|
image='redis',
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='db',
|
||||||
|
image='postgres',
|
||||||
|
),
|
||||||
|
])),
|
||||||
|
('tests/in/001011.yaml',Compose([
|
||||||
|
Service(
|
||||||
|
name='frontend',
|
||||||
|
image='awesome/webapp',
|
||||||
|
networks=['front-tier', 'back-tier'],
|
||||||
|
depends_on=['monitoring','backend'],
|
||||||
|
extends=['backend'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='monitoring',
|
||||||
|
image='awesome/monitoring',
|
||||||
|
networks=['admin'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='backend',
|
||||||
|
image='awesome/backend',
|
||||||
|
networks=['back-tier', 'admin'],
|
||||||
|
),
|
||||||
|
])),
|
||||||
|
('tests/in/001100.yaml',Compose([
|
||||||
|
Service(
|
||||||
|
name='frontend',
|
||||||
|
image='awesome/webapp',
|
||||||
|
ports=['8000:5000'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='monitoring',
|
||||||
|
image='awesome/monitoring',
|
||||||
|
depends_on=['backend'],
|
||||||
|
ports=['8000:5010'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='backend',
|
||||||
|
image='awesome/backend',
|
||||||
|
ports=['8000:5001'],
|
||||||
|
),
|
||||||
|
])),
|
||||||
|
('tests/in/001101.yaml',Compose([
|
||||||
|
Service(
|
||||||
|
name='frontend',
|
||||||
|
image='awesome/webapp',
|
||||||
|
networks=['front-tier', 'back-tier'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='monitoring',
|
||||||
|
image='awesome/monitoring',
|
||||||
|
networks=['admin'],
|
||||||
|
depends_on=['backend'],
|
||||||
|
ports=['8000:5010'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='backend',
|
||||||
|
image='awesome/backend',
|
||||||
|
networks=['back-tier', 'admin'],
|
||||||
|
),
|
||||||
|
])),
|
||||||
|
('tests/in/001110.yaml',Compose([
|
||||||
|
Service(
|
||||||
|
name='frontend',
|
||||||
|
image='awesome/webapp',
|
||||||
|
ports=['8000:5000'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='monitoring',
|
||||||
|
image='awesome/monitoring',
|
||||||
|
depends_on=['backend'],
|
||||||
|
extends=['frontend'],
|
||||||
|
ports=['8000:5010'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='backend',
|
||||||
|
image='awesome/backend',
|
||||||
|
ports=['8000:5001'],
|
||||||
|
),
|
||||||
|
])),
|
||||||
|
('tests/in/001111.yaml',Compose([
|
||||||
|
Service(
|
||||||
|
name='frontend',
|
||||||
|
image='awesome/webapp',
|
||||||
|
networks=['front-tier', 'back-tier'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='monitoring',
|
||||||
|
image='awesome/monitoring',
|
||||||
|
networks=['admin'],
|
||||||
|
depends_on=['backend'],
|
||||||
|
extends=['frontend'],
|
||||||
|
ports=['8000:5010'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='backend',
|
||||||
|
image='awesome/backend',
|
||||||
|
networks=['back-tier', 'admin'],
|
||||||
),
|
),
|
||||||
])),
|
])),
|
||||||
('tests/in/010000.yaml',Compose([
|
('tests/in/010000.yaml',Compose([
|
||||||
Service(
|
Service(
|
||||||
name='backend',
|
name='backend',
|
||||||
image='awesome/backend',
|
image='awesome/backend',
|
||||||
volumes=['db-data']
|
volumes=['db-data'],
|
||||||
)
|
),
|
||||||
])),
|
])),
|
||||||
|
('tests/in/010001.yaml',Compose([
|
||||||
|
Service(
|
||||||
|
name='frontend',
|
||||||
|
image='awesome/webapp',
|
||||||
|
networks=['front-tier', 'back-tier'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='monitoring',
|
||||||
|
image='awesome/monitoring',
|
||||||
|
networks=['admin'],
|
||||||
|
),
|
||||||
|
Service(
|
||||||
|
name='backend',
|
||||||
|
image='awesome/backend',
|
||||||
|
networks=['back-tier', 'admin'],
|
||||||
|
volumes=['db-data'],
|
||||||
|
),
|
||||||
|
])),
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
('tests/in/100000.yaml',Compose([
|
('tests/in/100000.yaml',Compose([
|
||||||
Service(
|
Service(
|
||||||
name='web',
|
name='web',
|
||||||
build='.',
|
links=['db:database'],
|
||||||
links=['db:database']
|
|
||||||
),
|
),
|
||||||
Service(
|
Service(
|
||||||
name='db',
|
name='db',
|
||||||
image='postgres'
|
image='postgres',
|
||||||
)
|
),
|
||||||
])),
|
])),
|
||||||
])
|
])
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue