Update requirements
Manually updating the requirements, since this project isn't in the list getting requirements syncs from global requirements. Updating hacking required some format changes to docstrings, and I included those in this patch. Change-Id: Ib33f6308ed121fa2350eb32846e476f2a9dd28f4
This commit is contained in:
parent
7b17e6d22e
commit
f4c07e1ae7
|
@ -82,8 +82,8 @@ def parse_args(args=None, usage=None, default_config_files=None):
|
||||||
|
|
||||||
|
|
||||||
def setup_logging():
|
def setup_logging():
|
||||||
"""
|
"""Sets up the logging options for a log with supplied name
|
||||||
Sets up the logging options for a log with supplied name
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if CONF.log_config:
|
if CONF.log_config:
|
||||||
|
|
|
@ -36,7 +36,7 @@ class ExecutionPlanQueue(object):
|
||||||
|
|
||||||
def put_execution_plan(self, execution_plan):
|
def put_execution_plan(self, execution_plan):
|
||||||
timestamp = str(int(time.time() * 10000))
|
timestamp = str(int(time.time() * 10000))
|
||||||
#execution_plan['_timestamp'] = timestamp
|
# execution_plan['_timestamp'] = timestamp
|
||||||
folder_path = os.path.join(self._plans_folder, timestamp)
|
folder_path = os.path.join(self._plans_folder, timestamp)
|
||||||
os.mkdir(folder_path)
|
os.mkdir(folder_path)
|
||||||
file_path = os.path.join(
|
file_path = os.path.join(
|
||||||
|
|
|
@ -31,11 +31,11 @@ class ChefPuppetExecutorBase(object):
|
||||||
self._name = name
|
self._name = name
|
||||||
|
|
||||||
def load(self, path, options):
|
def load(self, path, options):
|
||||||
"""It loads the path and options from template into
|
"""Load the path and options from template into the executor.
|
||||||
the executor.
|
|
||||||
|
|
||||||
:param path: The path
|
:param path: The path
|
||||||
:param options: execution plan options.
|
:param options: execution plan options.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
self._path = path
|
self._path = path
|
||||||
self._capture_stdout = options.get('captureStdout', True)
|
self._capture_stdout = options.get('captureStdout', True)
|
||||||
|
|
|
@ -86,8 +86,10 @@ class FilesManager(object):
|
||||||
return out_path
|
return out_path
|
||||||
|
|
||||||
def _download_url_file(self, file_def):
|
def _download_url_file(self, file_def):
|
||||||
"""It download the file in the murano-agent. It can proceed
|
"""It download the file in the murano-agent.
|
||||||
from a git file or any other internal URL
|
|
||||||
|
It can proceed from a git file or any other internal URL
|
||||||
|
|
||||||
"""
|
"""
|
||||||
|
|
||||||
if 'URL' not in file_def:
|
if 'URL' not in file_def:
|
||||||
|
|
|
@ -58,8 +58,8 @@ class TestFileManager(base.MuranoAgentTestCase):
|
||||||
@mock.patch('os.makedirs')
|
@mock.patch('os.makedirs')
|
||||||
def test_execution_plan_type_downloable_git(self, mock_makedir, mock_path,
|
def test_execution_plan_type_downloable_git(self, mock_makedir, mock_path,
|
||||||
mock_git):
|
mock_git):
|
||||||
"""It tests an execution plan when there are files
|
"""Test an execution plan with downloadable git files
|
||||||
which should be downloable.
|
|
||||||
"""
|
"""
|
||||||
mock_makedir.return_value = None
|
mock_makedir.return_value = None
|
||||||
mock_path.return_value = True
|
mock_path.return_value = True
|
||||||
|
@ -76,8 +76,8 @@ class TestFileManager(base.MuranoAgentTestCase):
|
||||||
def test_execution_plan_type_downloable(self, mock_requests, open_mock,
|
def test_execution_plan_type_downloable(self, mock_requests, open_mock,
|
||||||
mock_makedir,
|
mock_makedir,
|
||||||
mock_mkdir, mock_path):
|
mock_mkdir, mock_path):
|
||||||
"""It tests an execution plan when there are files
|
"""Test an execution plan with downloadable files
|
||||||
which should be downloable.
|
|
||||||
"""
|
"""
|
||||||
mock_path.return_value = True
|
mock_path.return_value = True
|
||||||
mock_mkdir.return_value = None
|
mock_mkdir.return_value = None
|
||||||
|
@ -110,8 +110,8 @@ class TestFileManager(base.MuranoAgentTestCase):
|
||||||
@mock.patch('os.path.isdir')
|
@mock.patch('os.path.isdir')
|
||||||
@mock.patch('os.makedirs')
|
@mock.patch('os.makedirs')
|
||||||
def test_putfile_downloable(self, mock_makedir, path, mock_git):
|
def test_putfile_downloable(self, mock_makedir, path, mock_git):
|
||||||
"""It tests the putfile method when the file is a git
|
"""It tests the putfile method when the file is a git URL.
|
||||||
URL.
|
|
||||||
"""
|
"""
|
||||||
path.return_value = True
|
path.return_value = True
|
||||||
mock_git.clone.return_value = None
|
mock_git.clone.return_value = None
|
||||||
|
|
|
@ -1,19 +1,19 @@
|
||||||
# The order of packages is significant, because pip processes them in the order
|
# The order of packages is significant, because pip processes them in the order
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
pbr>=0.6,!=0.7,<1.0
|
pbr<2.0,>=0.11
|
||||||
anyjson>=0.3.3
|
anyjson>=0.3.3
|
||||||
Babel>=1.3
|
Babel>=1.3
|
||||||
eventlet>=0.16.1,!=0.17.0
|
eventlet>=0.17.4
|
||||||
iso8601>=0.1.9
|
iso8601>=0.1.9
|
||||||
kombu>=2.5.0
|
kombu>=3.0.7
|
||||||
oslo.config>=1.9.3,<1.10.0 # Apache-2.0
|
oslo.config>=1.11.0 # Apache-2.0
|
||||||
PyYAML>=3.1.0
|
PyYAML>=3.1.0
|
||||||
six>=1.9.0
|
six>=1.9.0
|
||||||
stevedore>=1.3.0,<1.4.0 # Apache-2.0
|
stevedore>=1.5.0 # Apache-2.0
|
||||||
semantic_version>=2.3.1
|
semantic-version>=2.3.1
|
||||||
|
requests>=2.5.2
|
||||||
|
|
||||||
# not listed in global requirements
|
# not listed in global requirements
|
||||||
bunch
|
bunch
|
||||||
gitpython
|
gitpython
|
||||||
requests
|
|
||||||
|
|
|
@ -1,4 +1,3 @@
|
||||||
#!/usr/bin/env python
|
|
||||||
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
|
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
|
|
@ -1,11 +1,11 @@
|
||||||
# The order of packages is significant, because pip processes them in the order
|
# The order of packages is significant, because pip processes them in the order
|
||||||
# of appearance. Changing the order has an impact on the overall integration
|
# of appearance. Changing the order has an impact on the overall integration
|
||||||
# process, which may cause wedges in the gate later.
|
# process, which may cause wedges in the gate later.
|
||||||
hacking>=0.8.0,<0.9
|
hacking<0.11,>=0.10.0
|
||||||
unittest2
|
unittest2
|
||||||
coverage>=3.6
|
coverage>=3.6
|
||||||
discover
|
discover
|
||||||
mock>=1.0
|
mock>=1.0
|
||||||
sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
|
sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
|
||||||
testtools>=0.9.36,!=1.2.0
|
testtools>=1.4.0
|
||||||
testrepository>=0.0.18
|
testrepository>=0.0.18
|
||||||
|
|
Loading…
Reference in New Issue