openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Make python uploader the default"

This commit is contained in:
Zuul 2019-02-05 06:37:08 +00:00 committed by Gerrit Code Review
parent 9c540ccc7f 008c1ef98c
commit 954c6bc72b
2 changed files with 8 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleo_common/image/image_uploader.py
View File

@ -88,7 +88,7 @@ MEDIA_TYPES = (
'application/vnd.docker.image.rootfs.diff.tar.gzip'
)
DEFAULT_UPLOADER = 'docker'
DEFAULT_UPLOADER = 'python'
def get_undercloud_registry():

31
tripleo_common/tests/image/test_image_uploader.py
View File

@ -54,6 +54,10 @@ class TestImageUploadManager(base.TestCase):
files.append('testfile')
self.filelist = files
@mock.patch('tripleo_common.image.image_uploader.'
'PythonImageUploader._fetch_manifest')
@mock.patch('tripleo_common.image.image_uploader.'
'PythonImageUploader._copy_registry_to_registry')
@mock.patch('tripleo_common.image.image_uploader.'
'BaseImageUploader.authenticate')
@mock.patch('tripleo_common.image.image_uploader.'
@ -68,13 +72,13 @@ class TestImageUploadManager(base.TestCase):
return_value=False)
@mock.patch('os.path.isfile', return_value=True)
@mock.patch('fcntl.ioctl', side_effect=Exception)
@mock.patch('tripleo_common.image.image_uploader.Client')
@mock.patch('tripleo_common.image.image_uploader.'
'get_undercloud_registry', return_value='192.0.2.0:8787')
def test_file_parsing(self, mock_gur, mockdocker, mockioctl, mockpath,
def test_file_parsing(self, mock_gur, mockioctl, mockpath,
mock_images_match, mock_is_insecure, mock_inspect,
mock_auth):
mock_auth, mock_copy, mock_manifest):
mock_manifest.return_value = '{"layers": []}'
mock_inspect.return_value = {}
manager = image_uploader.ImageUploadManager(self.filelist)
parsed_data = manager.upload()
@ -87,27 +91,6 @@ class TestImageUploadManager(base.TestCase):
key=operator.itemgetter('imagename'))
self.assertEqual(sorted_expected_data, sorted_parsed_data)
dockerc = mockdocker.return_value
dockerc.remove_image.assert_has_calls([
mock.call('192.0.2.0:8787/tripleomaster'
'/centos-binary-nova-libvirt:liberty'),
mock.call('docker.io/tripleomaster'
'/centos-binary-nova-compute:liberty'),
mock.call('docker.io/tripleomaster'
'/centos-binary-nova-libvirt:liberty'),
mock.call('docker.io/tripleomaster'
'/heat-docker-agents-centos:latest'),
mock.call('docker.io/tripleomaster'
'/image-with-missing-tag:latest'),
mock.call('localhost:8787/tripleomaster'
'/centos-binary-nova-compute:liberty'),
mock.call('localhost:8787/tripleomaster'
'/heat-docker-agents-centos:latest'),
mock.call('localhost:8787/tripleomaster/'
'image-with-missing-tag:latest'),
])
@mock.patch('netifaces.ifaddresses')
@mock.patch('netifaces.interfaces')
def test_get_undercloud_registry(self, mock_interfaces, mock_addresses):