Change tar stream formatters to be based on tag and manifest, instead of legacy images
This commit is contained in:
parent
c92294c218
commit
bafab2e734
4 changed files with 21 additions and 55 deletions
|
@ -1,7 +1,6 @@
|
|||
import pytest
|
||||
|
||||
from image.appc import DockerV1ToACIManifestTranslator
|
||||
from endpoints.verbs.models_interface import RepositoryReference, ImageWithBlob
|
||||
from util.dict_wrappers import JSONPathDict
|
||||
|
||||
|
||||
|
@ -74,31 +73,6 @@ EXAMPLE_MANIFEST_OBJ = {
|
|||
"throwaway": True
|
||||
}
|
||||
|
||||
|
||||
@pytest.fixture
|
||||
def repo_image():
|
||||
repo_ref = RepositoryReference(1, 'simple', 'devtable')
|
||||
return ImageWithBlob(1, None, EXAMPLE_MANIFEST_OBJ, repo_ref, 1, None)
|
||||
|
||||
|
||||
def test_port_conversion(repo_image):
|
||||
output = DockerV1ToACIManifestTranslator.build_manifest(repo_image, 'v3.0.15', 'abcdef')
|
||||
ports = output['app']['ports']
|
||||
ports.sort()
|
||||
assert {'name':'port-2379', 'port':2379, 'protocol':'tcp'} == ports[0]
|
||||
assert {'name':'port-2380', 'port':2380, 'protocol':'tcp'} == ports[1]
|
||||
|
||||
|
||||
def test_legacy_port_conversion(repo_image):
|
||||
del repo_image.compat_metadata['config']['ExposedPorts']
|
||||
repo_image.compat_metadata['config']['ports'] = ['8080', '8081']
|
||||
output = DockerV1ToACIManifestTranslator.build_manifest(repo_image, 'v3.0.15', 'abcdef')
|
||||
ports = output['app']['ports']
|
||||
ports.sort()
|
||||
assert {'name':'port-8080', 'port':8080, 'protocol':'tcp'} == ports[0]
|
||||
assert {'name':'port-8081', 'port':8081, 'protocol':'tcp'} == ports[1]
|
||||
|
||||
|
||||
@pytest.mark.parametrize("vcfg,expected", [
|
||||
({'Volumes': None}, []),
|
||||
({'Volumes': {}}, []),
|
||||
|
|
Reference in a new issue