Remove configdrive builder
We're leaving this up to Nova these days, remove the unused code here. Change-Id: I2c4ac1bffa59146ae54c8b758f62314454aa8369 Partial-Bug: #1404362
This commit is contained in:
Jim Rollenhagen
parent
3dda038707
commit
5585d96b8a
|
|
@ -1,80 +0,0 @@
|
|||
# Copyright 2013 Rackspace, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
import base64
|
||||
|
||||
import json
|
||||
import os
|
||||
|
||||
from ironic_python_agent import utils
|
||||
|
||||
|
||||
class ConfigDriveWriter(object):
|
||||
def __init__(self):
|
||||
self.metadata = {}
|
||||
self.files = utils.get_ordereddict()
|
||||
|
||||
def add_metadata(self, key, value):
|
||||
self.metadata[key] = value
|
||||
|
||||
def add_file(self, filepath, contents):
|
||||
self.files[filepath] = contents
|
||||
|
||||
def write(self, location, prefix='openstack', version='latest'):
|
||||
os.makedirs(os.path.join(location, prefix, version))
|
||||
os.makedirs(os.path.join(location, prefix, 'content'))
|
||||
|
||||
metadata = {}
|
||||
for k, v in self.metadata.items():
|
||||
metadata[k] = v
|
||||
|
||||
if self.files:
|
||||
metadata['files'] = []
|
||||
filenumber = 0
|
||||
for filepath, contents in self.files.items():
|
||||
content_path = '/content/{0:04}'.format(filenumber)
|
||||
file_info = {
|
||||
'content_path': content_path,
|
||||
'path': filepath
|
||||
}
|
||||
metadata['files'].append(file_info)
|
||||
|
||||
content_path = os.path.join(location, prefix, content_path[1:])
|
||||
with open(content_path, 'wb') as f:
|
||||
f.write(contents)
|
||||
|
||||
filenumber += 1
|
||||
|
||||
json_metadata = json.dumps(metadata)
|
||||
metadata_path = '{0}/{1}/meta_data.json'.format(prefix, version)
|
||||
metadata_path = os.path.join(location, metadata_path)
|
||||
with open(metadata_path, 'wb') as f:
|
||||
f.write(json_metadata)
|
||||
|
||||
|
||||
def write_configdrive(location, metadata, files, prefix='openstack',
|
||||
version='latest'):
|
||||
"""Generates and writes a valid configdrive to `location`.
|
||||
`files` are passed in as a dict {path: base64_contents}.
|
||||
"""
|
||||
writer = ConfigDriveWriter()
|
||||
|
||||
for k, v in metadata.items():
|
||||
writer.add_metadata(k, v)
|
||||
|
||||
for path, b64_contents in files.items():
|
||||
contents = base64.b64decode(b64_contents)
|
||||
writer.add_file(path, contents)
|
||||
|
||||
writer.write(location, prefix=prefix, version=version)
|
||||
|
|
@ -1,171 +0,0 @@
|
|||
# Copyright 2013 Rackspace, Inc.
|
||||
#
|
||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||
# you may not use this file except in compliance with the License.
|
||||
# You may obtain a copy of the License at
|
||||
#
|
||||
# http://www.apache.org/licenses/LICENSE-2.0
|
||||
#
|
||||
# Unless required by applicable law or agreed to in writing, software
|
||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from __future__ import unicode_literals
|
||||
|
||||
import base64
|
||||
import json
|
||||
|
||||
import mock
|
||||
from oslotest import base as test_base
|
||||
import six
|
||||
|
||||
from ironic_python_agent import configdrive
|
||||
from ironic_python_agent import utils
|
||||
|
||||
if six.PY2:
|
||||
OPEN_FUNCTION_NAME = '__builtin__.open'
|
||||
else:
|
||||
OPEN_FUNCTION_NAME = 'builtins.open'
|
||||
|
||||
|
||||
class ConfigDriveWriterTestCase(test_base.BaseTestCase):
|
||||
def setUp(self):
|
||||
super(ConfigDriveWriterTestCase, self).setUp()
|
||||
self.writer = configdrive.ConfigDriveWriter()
|
||||
self.maxDiff = None
|
||||
|
||||
def test_add_metadata(self):
|
||||
self.writer.add_metadata('admin_pass', 'password')
|
||||
metadata = self.writer.metadata
|
||||
self.assertEqual(metadata, {'admin_pass': 'password'})
|
||||
|
||||
def test_add_file(self):
|
||||
self.writer.add_file('/etc/filename', 'contents')
|
||||
files = self.writer.files
|
||||
self.assertEqual(files, {'/etc/filename': 'contents'})
|
||||
|
||||
@mock.patch('os.makedirs', autospec=True)
|
||||
@mock.patch(OPEN_FUNCTION_NAME, autospec=True)
|
||||
def test_write_no_files(self, open_mock, makedirs_mock):
|
||||
metadata = {'admin_pass': 'password', 'hostname': 'test'}
|
||||
json_metadata = json.dumps(metadata)
|
||||
metadata_path = '/lol/ironic/latest/meta_data.json'
|
||||
for k, v in metadata.items():
|
||||
self.writer.add_metadata(k, v)
|
||||
|
||||
open_mock.return_value.__enter__ = lambda s: s
|
||||
open_mock.return_value.__exit__ = mock.Mock()
|
||||
write_mock = open_mock.return_value.write
|
||||
|
||||
self.writer.write('/lol', prefix='ironic', version='latest')
|
||||
open_mock.assert_called_once_with(metadata_path, 'wb')
|
||||
write_mock.assert_called_once_with(json_metadata)
|
||||
makedirs_calls = [
|
||||
mock.call('/lol/ironic/latest'),
|
||||
mock.call('/lol/ironic/content')
|
||||
]
|
||||
self.assertEqual(makedirs_calls, makedirs_mock.call_args_list)
|
||||
|
||||
@mock.patch('os.makedirs', autospec=True)
|
||||
@mock.patch(OPEN_FUNCTION_NAME, autospec=True)
|
||||
def test_write_with_files(self, open_mock, makedirs_mock):
|
||||
metadata = {'admin_pass': 'password', 'hostname': 'test'}
|
||||
for k, v in metadata.items():
|
||||
self.writer.add_metadata(k, v)
|
||||
files = utils.get_ordereddict([
|
||||
('/etc/conf0', 'contents0'),
|
||||
('/etc/conf1', 'contents1'),
|
||||
])
|
||||
for path, contents in files.items():
|
||||
self.writer.add_file(path, contents)
|
||||
|
||||
open_mock.return_value.__enter__ = lambda s: s
|
||||
open_mock.return_value.__exit__ = mock.Mock()
|
||||
write_mock = open_mock.return_value.write
|
||||
|
||||
metadata = self.writer.metadata
|
||||
metadata['files'] = [
|
||||
{'content_path': '/content/0000', 'path': '/etc/conf0'},
|
||||
{'content_path': '/content/0001', 'path': '/etc/conf1'},
|
||||
]
|
||||
|
||||
self.writer.write('/lol', prefix='openstack', version='latest')
|
||||
|
||||
# have to pull out the JSON passed to write and parse it
|
||||
# because arbitrary dictionary ordering, etc
|
||||
calls = write_mock.mock_calls
|
||||
json_data = calls[-1][1][0]
|
||||
data = json.loads(json_data)
|
||||
self.assertEqual(data, metadata)
|
||||
|
||||
open_calls = [
|
||||
mock.call('/lol/openstack/content/0000', 'wb'),
|
||||
mock.call().write('contents0'),
|
||||
mock.call().__exit__(None, None, None),
|
||||
mock.call('/lol/openstack/content/0001', 'wb'),
|
||||
mock.call().write('contents1'),
|
||||
mock.call().__exit__(None, None, None),
|
||||
mock.call('/lol/openstack/latest/meta_data.json', 'wb'),
|
||||
# already checked
|
||||
mock.call().write(mock.ANY),
|
||||
mock.call().__exit__(None, None, None),
|
||||
]
|
||||
self.assertEqual(open_mock.mock_calls, open_calls)
|
||||
|
||||
makedirs_calls = [
|
||||
mock.call('/lol/openstack/latest'),
|
||||
mock.call('/lol/openstack/content')
|
||||
]
|
||||
self.assertEqual(makedirs_calls, makedirs_mock.call_args_list)
|
||||
|
||||
@mock.patch('os.makedirs', autospec=True)
|
||||
@mock.patch(OPEN_FUNCTION_NAME, autospec=True)
|
||||
def test_write_configdrive(self, open_mock, makedirs_mock):
|
||||
metadata = {'admin_pass': 'password', 'hostname': 'test'}
|
||||
files = utils.get_ordereddict([
|
||||
('/etc/conf0', base64.b64encode(b'contents0')),
|
||||
('/etc/conf1', base64.b64encode(b'contents1')),
|
||||
])
|
||||
metadata['files'] = [
|
||||
{'content_path': '/content/0000', 'path': '/etc/conf0'},
|
||||
{'content_path': '/content/0001', 'path': '/etc/conf1'},
|
||||
]
|
||||
|
||||
open_mock.return_value.__enter__ = lambda s: s
|
||||
open_mock.return_value.__exit__ = mock.Mock()
|
||||
write_mock = open_mock.return_value.write
|
||||
|
||||
configdrive.write_configdrive('/lol',
|
||||
metadata,
|
||||
files,
|
||||
prefix='openstack',
|
||||
version='latest')
|
||||
|
||||
# have to pull out the JSON passed to write and parse it
|
||||
# because arbitrary dictionary ordering, etc
|
||||
calls = write_mock.mock_calls
|
||||
json_data = calls[-1][1][0]
|
||||
data = json.loads(json_data)
|
||||
self.assertEqual(data, metadata)
|
||||
|
||||
open_calls = [
|
||||
mock.call('/lol/openstack/content/0000', 'wb'),
|
||||
mock.call().write(b'contents0'),
|
||||
mock.call().__exit__(None, None, None),
|
||||
mock.call('/lol/openstack/content/0001', 'wb'),
|
||||
mock.call().write(b'contents1'),
|
||||
mock.call().__exit__(None, None, None),
|
||||
mock.call('/lol/openstack/latest/meta_data.json', 'wb'),
|
||||
# already checked
|
||||
mock.call().write(mock.ANY),
|
||||
mock.call().__exit__(None, None, None),
|
||||
]
|
||||
self.assertEqual(open_mock.mock_calls, open_calls)
|
||||
|
||||
makedirs_calls = [
|
||||
mock.call('/lol/openstack/latest'),
|
||||
mock.call('/lol/openstack/content')
|
||||
]
|
||||
self.assertEqual(makedirs_calls, makedirs_mock.call_args_list)
|
||||
Loading…
Reference in New Issue