openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Autodetect insecure registry in container image prepare" into stable/pike

This commit is contained in:
Zuul 2017-10-31 11:45:15 +00:00 committed by Gerrit Code Review
parent 4a2134a9ca 2e2a1ec29d
commit 4bad32cf1d
2 changed files with 81 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
tripleoclient/tests/v1/overcloud_image/test_container_image.py
View File

@ -16,6 +16,7 @@
import fixtures
import mock
import os
import requests
import shutil
import six
import tempfile
@ -112,7 +113,8 @@ class TestContainerImagePrepare(TestPluginV1):
enabled_services)
@mock.patch('tripleo_common.image.kolla_builder.KollaImageBuilder')
def test_container_image_prepare_noargs(self, mock_builder):
@mock.patch('requests.get')
def test_container_image_prepare_noargs(self, mock_get, mock_builder):
arglist = []
verifylist = []
cift = mock.MagicMock()
@ -137,7 +139,8 @@ class TestContainerImagePrepare(TestPluginV1):
@mock.patch('tripleo_common.image.kolla_builder.KollaImageBuilder')
@mock.patch('heatclient.common.template_utils.'
'process_multiple_environments_and_files')
def test_container_image_prepare(self, pmef, mock_builder):
@mock.patch('requests.get')
def test_container_image_prepare(self, mock_get, pmef, mock_builder):
temp = tempfile.mkdtemp()
self.addCleanup(shutil.rmtree, temp)
@ -145,6 +148,7 @@ class TestContainerImagePrepare(TestPluginV1):
env_file = os.path.join(temp, 'containers_env.yaml')
tmpl_file = os.path.join(temp, 'overcloud_containers.yaml.j2')
aodh_file = os.path.join(temp, 'docker', 'services', 'aodh.yaml')
mock_get.side_effect = requests.exceptions.SSLError('ouch')
resource_registry = {'resource_registry': {
'OS::TripleO::Services::AodhEvaluator': aodh_file,
@ -158,7 +162,7 @@ class TestContainerImagePrepare(TestPluginV1):
'--tag',
'passed-ci',
'--namespace',
'tripleo',
'192.0.2.0:8787/t',
'--prefix',
'os-',
'--suffix',
@ -180,14 +184,14 @@ class TestContainerImagePrepare(TestPluginV1):
verifylist = []
cift = mock.MagicMock()
cift.return_value = [{
'imagename': 'tripleo/os-aodh-apifoo:passed-ci',
'imagename': '192.0.2.0:8787/t/os-aodh-apifoo:passed-ci',
'params': ['DockerAodhApiImage', 'DockerAodhConfigImage'],
'services': [
'OS::TripleO::Services::AodhApi',
'OS::TripleO::Services::AodhEvaluator',
],
}, {
'imagename': 'tripleo/os-aodh-evaluatorfoo:passed-ci',
'imagename': '192.0.2.0:8787/t/os-aodh-evaluatorfoo:passed-ci',
'params': ['DockerAodhEvaluatorImage'],
'services': [
'OS::TripleO::Services::AodhEvaluator',
@ -206,7 +210,7 @@ class TestContainerImagePrepare(TestPluginV1):
filter=mock.ANY,
name_prefix='os-',
name_suffix='foo',
namespace='tripleo',
namespace='192.0.2.0:8787/t',
tag='passed-ci',
ceph_image='mydaemon',
ceph_namespace='myceph',
@ -215,17 +219,20 @@ class TestContainerImagePrepare(TestPluginV1):
)
ci_data = {
'container_images': [{
'imagename': 'tripleo/os-aodh-apifoo:passed-ci',
'imagename': '192.0.2.0:8787/t/os-aodh-apifoo:passed-ci',
}, {
'imagename': 'tripleo/os-aodh-evaluatorfoo:passed-ci',
'imagename': '192.0.2.0:8787/t/os-aodh-evaluatorfoo:passed-ci',
}]
}
env_data = {
'parameter_defaults': {
'DockerAodhApiImage': 'tripleo/os-aodh-apifoo:passed-ci',
'DockerAodhConfigImage': 'tripleo/os-aodh-apifoo:passed-ci',
'DockerAodhApiImage':
'192.0.2.0:8787/t/os-aodh-apifoo:passed-ci',
'DockerAodhConfigImage':
'192.0.2.0:8787/t/os-aodh-apifoo:passed-ci',
'DockerAodhEvaluatorImage':
'tripleo/os-aodh-evaluatorfoo:passed-ci'
'192.0.2.0:8787/t/os-aodh-evaluatorfoo:passed-ci',
'DockerInsecureRegistryAddress': ['192.0.2.0:8787']
}
}
with open(images_file) as f:
@ -308,7 +315,9 @@ class TestContainerImagePrepare(TestPluginV1):
'process_multiple_environments_and_files')
@mock.patch('tripleoclient.v1.container_image.PrepareImageFiles.'
'get_enabled_services')
def test_container_image_prepare_for_odl(self, ges, pmef, mock_builder):
@mock.patch('requests.get')
def test_container_image_prepare_for_odl(self, mock_get, ges, pmef,
mock_builder):
arglist = [
'-e',
'environments/services-docker/neutron-opendaylight.yaml',
@ -378,7 +387,9 @@ class TestContainerImagePrepare(TestPluginV1):
'process_multiple_environments_and_files')
@mock.patch('tripleoclient.v1.container_image.PrepareImageFiles.'
'get_enabled_services')
def test_container_image_prepare_for_ovn(self, ges, pmef, mock_builder):
@mock.patch('requests.get')
def test_container_image_prepare_for_ovn(self, mock_get, ges, pmef,
mock_builder):
arglist = [
'-e',
'environments/services-docker/neutron-ovn.yaml',
@ -441,6 +452,39 @@ class TestContainerImagePrepare(TestPluginV1):
expected_container_template_params, expected_oc_yaml_contents,
expected_env_contents)
@mock.patch('requests.get')
def test_detect_insecure_registry(self, mock_get):
self.assertEqual(
{},
self.cmd.detect_insecure_registries(
{'foo': 'docker.io/tripleo'}))
self.assertEqual(
{},
self.cmd.detect_insecure_registries(
{'foo': 'tripleo'}))
mock_get.side_effect = requests.exceptions.ReadTimeout('ouch')
self.assertEqual(
{},
self.cmd.detect_insecure_registries(
{'foo': '192.0.2.0:8787/tripleo'}))
mock_get.side_effect = requests.exceptions.SSLError('ouch')
self.assertEqual(
{'DockerInsecureRegistryAddress': ['192.0.2.0:8787']},
self.cmd.detect_insecure_registries(
{'foo': '192.0.2.0:8787/tripleo'}))
self.assertEqual(
{'DockerInsecureRegistryAddress': [
'192.0.2.0:8787',
'192.0.2.1:8787']},
self.cmd.detect_insecure_registries({
'foo': '192.0.2.0:8787/tripleo/foo',
'bar': '192.0.2.0:8787/tripleo/bar',
'baz': '192.0.2.1:8787/tripleo/baz',
}))
class TestContainerImageBuild(TestPluginV1):

24
tripleoclient/v1/container_image.py
View File

@ -25,6 +25,7 @@ from heatclient.common import template_utils
from osc_lib.command import command
from osc_lib import exceptions as oscexc
from osc_lib.i18n import _
import requests
import yaml
from tripleo_common.image import image_uploader
@ -283,6 +284,27 @@ class PrepareImageFiles(command.Command):
'Use the variable=value format.') % s
raise oscexc.CommandError(msg)
def detect_insecure_registries(self, params):
insecure = []
hosts = set()
for image in params.values():
hosts.add(image.split('/')[0])
for host in hosts:
try:
requests.get('https://%s/' % host)
except requests.exceptions.SSLError:
insecure.append(host)
except Exception:
# for any other error assume it is a secure registry, because:
# - it is secure registry
# - the host is not accessible
# - the namespace doesn't include a host name
pass
if not insecure:
return {}
return {'DockerInsecureRegistryAddress': sorted(insecure)}
def write_env_file(self, params, env_file):
with os.fdopen(os.open(env_file,
@ -384,6 +406,8 @@ class PrepareImageFiles(command.Command):
del(entry['services'])
if parsed_args.env_file:
params.update(
self.detect_insecure_registries(params))
self.write_env_file(params, parsed_args.env_file)
result_str = yaml.safe_dump({'container_images': result},