openstack/ironic
Code Issues Proposed changes

Merge "Pass session directly to swiftclient"

Browse Source
This commit is contained in:
Jenkins 2017-02-08 12:14:06 +00:00 committed by Gerrit Code Review
commit 1dc1d7995c
2 changed files with 3 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ironic/common/swift.py
View File

@ -14,7 +14,6 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
import six
from six.moves import http_client from six.moves import http_client
from six.moves.urllib import parse from six.moves.urllib import parse
from swiftclient import client as swift_client from swiftclient import client as swift_client
@ -24,7 +23,6 @@ from swiftclient import utils as swift_utils
from ironic.common import exception from ironic.common import exception
from ironic.common.i18n import _ from ironic.common.i18n import _
from ironic.common import keystone from ironic.common import keystone
from ironic.conf import CONF
_SWIFT_SESSION = None _SWIFT_SESSION = None
@ -41,26 +39,8 @@ class SwiftAPI(object):
"""API for communicating with Swift.""" """API for communicating with Swift."""
def __init__(self): def __init__(self):
# TODO(pas-ha): swiftclient does not support keystone sessions ATM.
# Must be reworked when LP bug #1518938 is fixed.
session = _get_swift_session() session = _get_swift_session()
params = { self.connection = swift_client.Connection(session=session)
'retries': CONF.swift.swift_max_retries,
'preauthurl': keystone.get_service_url(
session,
service_type='object-store'),
'preauthtoken': keystone.get_admin_auth_token(session)
}
# NOTE(pas-ha):session.verify is for HTTPS urls and can be
# - False (do not verify)
# - True (verify but try to locate system CA certificates)
# - Path (verify using specific CA certificate)
verify = session.verify
params['insecure'] = not verify
if verify and isinstance(verify, six.string_types):
params['cacert'] = verify
self.connection = swift_client.Connection(**params)
def create_object(self, container, obj, filename, def create_object(self, container, obj, filename,
object_headers=None): object_headers=None):

13
ironic/tests/unit/common/test_swift.py
View File

@ -39,18 +39,9 @@ class SwiftTestCase(base.TestCase):
self.swift_exception = swift_exception.ClientException('', '') self.swift_exception = swift_exception.ClientException('', '')
def test___init__(self, connection_mock, keystone_mock): def test___init__(self, connection_mock, keystone_mock):
sess = mock.Mock()
sess.get_endpoint.return_value = 'http://swift:8080'
sess.get_token.return_value = 'fake_token'
sess.verify = '/path/to/ca/file'
keystone_mock.return_value = sess
swift.SwiftAPI() swift.SwiftAPI()
params = {'retries': 2, connection_mock.assert_called_once_with(
'preauthurl': 'http://swift:8080', session=keystone_mock.return_value)
'preauthtoken': 'fake_token',
'insecure': False,
'cacert': '/path/to/ca/file'}
connection_mock.assert_called_once_with(**params)
@mock.patch.object(__builtin__, 'open', autospec=True) @mock.patch.object(__builtin__, 'open', autospec=True)
def test_create_object(self, open_mock, connection_mock, keystone_mock): def test_create_object(self, open_mock, connection_mock, keystone_mock):