openstack/rally-openstack
Code Issues Proposed changes

Merge "Remove old random name generator"

Browse Source
This commit is contained in:
Jenkins 2015-11-26 17:42:22 +00:00 committed by Gerrit Code Review
commit 311c618e2c
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rally/plugins/openstack/scenarios/murano/utils.py
View File

@ -189,10 +189,14 @@ class MuranoScenario(scenario.OpenStackScenario):
def _zip_package(self, package_path): def _zip_package(self, package_path):
"""Call _prepare_package method that returns path to zip archive.""" """Call _prepare_package method that returns path to zip archive."""
return MuranoPackageManager()._prepare_package(package_path) return MuranoPackageManager(self.task)._prepare_package(package_path)
class MuranoPackageManager(object): class MuranoPackageManager(common_utils.RandomNameGeneratorMixin):
RESOURCE_NAME_FORMAT = "app.rally_XXXXXXXX_XXXXXXXX"
def __init__(self, task):
self.task = task
@staticmethod @staticmethod
def _read_from_file(filename): def _read_from_file(filename):
@ -228,7 +232,7 @@ class MuranoPackageManager(object):
:param app_dir: path to directory with Murano application context :param app_dir: path to directory with Murano application context
""" """
new_fullname = common_utils.generate_random_name("app.") new_fullname = self.generate_random_name()
manifest_file = os.path.join(app_dir, "manifest.yaml") manifest_file = os.path.join(app_dir, "manifest.yaml")
manifest = self._read_from_file(manifest_file) manifest = self._read_from_file(manifest_file)

8
tests/unit/plugins/openstack/scenarios/murano/test_utils.py
View File

@ -106,7 +106,7 @@ class MuranoScenarioTestCase(test.ScenarioTestCase):
side_effect=mock.mock_open(read_data="Key: value"), side_effect=mock.mock_open(read_data="Key: value"),
create=True) create=True)
def test_read_from_file(self, mock_open): def test_read_from_file(self, mock_open):
utility = utils.MuranoPackageManager() utility = utils.MuranoPackageManager({"uuid": "fake_task_id"})
data = utility._read_from_file("filename") data = utility._read_from_file("filename")
expected_data = {"Key": "value"} expected_data = {"Key": "value"}
self.assertEqual(expected_data, data) self.assertEqual(expected_data, data)
@ -120,7 +120,7 @@ class MuranoScenarioTestCase(test.ScenarioTestCase):
"Classes": {"app.name_abc": "app_class.yaml"}} "Classes": {"app.name_abc": "app_class.yaml"}}
mock_murano_package_manager__read_from_file.side_effect = ( mock_murano_package_manager__read_from_file.side_effect = (
[manifest]) [manifest])
utility = utils.MuranoPackageManager() utility = utils.MuranoPackageManager({"uuid": "fake_task_id"})
utility._change_app_fullname("tmp/tmpfile/") utility._change_app_fullname("tmp/tmpfile/")
mock_murano_package_manager__read_from_file.assert_has_calls( mock_murano_package_manager__read_from_file.assert_has_calls(
[mock.call("tmp/tmpfile/manifest.yaml")] [mock.call("tmp/tmpfile/manifest.yaml")]
@ -140,7 +140,7 @@ class MuranoScenarioTestCase(test.ScenarioTestCase):
mock_murano_package_manager__change_app_fullname, mock_murano_package_manager__change_app_fullname,
mock_shutil_copytree, mock_tempfile_mkdtemp, mock_shutil_copytree, mock_tempfile_mkdtemp,
mock_zipfile_is_zipfile): mock_zipfile_is_zipfile):
utility = utils.MuranoPackageManager() utility = utils.MuranoPackageManager({"uuid": "fake_task_id"})
package_path = "tmp/tmpfile" package_path = "tmp/tmpfile"
mock_zipfile_is_zipfile.return_value = False mock_zipfile_is_zipfile.return_value = False
@ -161,7 +161,7 @@ class MuranoScenarioTestCase(test.ScenarioTestCase):
@mock.patch("zipfile.is_zipfile") @mock.patch("zipfile.is_zipfile")
def test_prepare_zip_if_zip(self, mock_zipfile_is_zipfile): def test_prepare_zip_if_zip(self, mock_zipfile_is_zipfile):
utility = utils.MuranoPackageManager() utility = utils.MuranoPackageManager({"uuid": "fake_task_id"})
package_path = "tmp/tmpfile.zip" package_path = "tmp/tmpfile.zip"
mock_zipfile_is_zipfile.return_value = True mock_zipfile_is_zipfile.return_value = True
zip_file = utility._prepare_package(package_path) zip_file = utility._prepare_package(package_path)