diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/api-ref/source/conf.py sahara-12.0.0/api-ref/source/conf.py --- sahara-12.0.0~b3~git2020041014.0825bdde/api-ref/source/conf.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/api-ref/source/conf.py 2020-05-13 11:03:54.000000000 +0000 @@ -34,8 +34,7 @@ # openstackdocstheme options repository_name = 'openstack/sahara' -bug_project = '935' -bug_tag = 'api-ref' +use_storyboard = True html_theme = 'openstackdocs' html_theme_options = { diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/ChangeLog sahara-12.0.0/ChangeLog --- sahara-12.0.0~b3~git2020041014.0825bdde/ChangeLog 2020-04-10 18:12:52.000000000 +0000 +++ sahara-12.0.0/ChangeLog 2020-05-13 11:05:58.000000000 +0000 @@ -1,6 +1,22 @@ CHANGES ======= +12.0.0 +------ + +* Monkey patch original current\_thread \_active +* Imported Translations from Zanata +* Update TOX\_CONSTRAINTS\_FILE for stable/ussuri +* Update .gitreview for stable/ussuri + +12.0.0.0rc1 +----------- + +* Ussuri contributor docs community goal +* Update hacking for Python3 +* Use unittest.mock instead of third party mock +* Cleanup Python 2.7 support +* (Temporarily) skip TestVerifications tests * Fix syntax error in image widths * [ussuri][goal] Drop python 2.7 support and testing * Migrate grenade jobs to py3 @@ -1607,8 +1623,8 @@ * pass environment variables of proxy to tox * Switch to oslo.service -3.0.0.0b1 ---------- +3.0.0b1 +------- * Updated from global requirements * Add sentry check for CDH 5.3 diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/CONTRIBUTING.rst sahara-12.0.0/CONTRIBUTING.rst --- sahara-12.0.0~b3~git2020041014.0825bdde/CONTRIBUTING.rst 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/CONTRIBUTING.rst 2020-05-13 11:03:54.000000000 +0000 @@ -1,20 +1,19 @@ -If you would like to contribute to the development of OpenStack, -you must follow the steps in this page: +The source repository for this project can be found at: - https://docs.openstack.org/infra/manual/developers.html + https://opendev.org/openstack/sahara -You can find more Sahara-specific info in our How To Participate guide: +Pull requests submitted through GitHub are not monitored. - https://docs.openstack.org/sahara/latest/contributor/how-to-participate.html +To start contributing to OpenStack, follow the steps in the contribution guide +to set up and use Gerrit: -Once those steps have been completed, changes to OpenStack -should be submitted for review via the Gerrit tool, following -the workflow documented at: + https://docs.openstack.org/contributors/code-and-documentation/quick-start.html - https://docs.openstack.org/infra/manual/developers.html#development-workflow +Bugs should be filed on Storyboard: -Pull requests submitted through GitHub will be ignored. + https://storyboard.openstack.org/#!/project/openstack/sahara -Bugs should be filed on Storyboard, not GitHub: +For more specific information about contributing to this repository, see the +sahara contributor guide: - https://storyboard.openstack.org/#!/project/935 + https://docs.openstack.org/sahara/latest/contributor/contributing.html diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/debian/changelog sahara-12.0.0/debian/changelog --- sahara-12.0.0~b3~git2020041014.0825bdde/debian/changelog 2020-04-10 18:13:17.000000000 +0000 +++ sahara-12.0.0/debian/changelog 2020-05-15 19:45:40.000000000 +0000 @@ -1,3 +1,19 @@ +sahara (1:12.0.0-0ubuntu0.20.04.1) focal; urgency=medium + + [ Chris MacNaughton ] + * New upstream release for OpenStack Ussuri (LP: #1877642). + * d/watch: Scope to 12.x series. + * d/watch: Update to point at tarballs.opendev.org. + * d/control: Align (Build-)Depends with upstream. + + [ Corey Bryant ] + * d/p/use-flask-builtin-method-for-test-context.patch: Cherry-picked + from upstream stable/ussuri (https://review.opendev.org/#/c/728566/) + to fix unit test failures with Python 3.8 (LP: #1878978). + * d/gbp.conf: Create stable/ussuri branch. + + -- Corey Bryant Fri, 15 May 2020 15:45:40 -0400 + sahara (1:12.0.0~b3~git2020041014.0825bdde-0ubuntu1) focal; urgency=medium * New upstream snapshot for OpenStack Ussuri. diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/debian/control sahara-12.0.0/debian/control --- sahara-12.0.0~b3~git2020041014.0825bdde/debian/control 2020-04-10 18:13:17.000000000 +0000 +++ sahara-12.0.0/debian/control 2020-05-15 19:45:40.000000000 +0000 @@ -48,7 +48,7 @@ python3-mysqldb, python3-neutronclient (>= 1:6.7.0), python3-novaclient (>= 2:9.1.0), - python3-openstackdocstheme (>= 1.20.0), + python3-openstackdocstheme (>= 1.31.2), python3-os-api-ref (>= 1.6.0), python3-os-testr (>= 1.0.0), python3-oslo.concurrency (>= 3.26.0), diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/debian/gbp.conf sahara-12.0.0/debian/gbp.conf --- sahara-12.0.0~b3~git2020041014.0825bdde/debian/gbp.conf 2020-04-10 18:13:17.000000000 +0000 +++ sahara-12.0.0/debian/gbp.conf 2020-05-15 19:45:40.000000000 +0000 @@ -1,5 +1,5 @@ [DEFAULT] -debian-branch = master +debian-branch = stable/ussuri upstream-tag = %(version)s pristine-tar = True diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/debian/patches/series sahara-12.0.0/debian/patches/series --- sahara-12.0.0~b3~git2020041014.0825bdde/debian/patches/series 2020-04-10 18:13:17.000000000 +0000 +++ sahara-12.0.0/debian/patches/series 2020-05-15 19:45:40.000000000 +0000 @@ -1,2 +1,3 @@ add-mysql8-compatibility.patch install-missing-files.patch +use-flask-builtin-method-for-test-context.patch diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/debian/patches/use-flask-builtin-method-for-test-context.patch sahara-12.0.0/debian/patches/use-flask-builtin-method-for-test-context.patch --- sahara-12.0.0~b3~git2020041014.0825bdde/debian/patches/use-flask-builtin-method-for-test-context.patch 1970-01-01 00:00:00.000000000 +0000 +++ sahara-12.0.0/debian/patches/use-flask-builtin-method-for-test-context.patch 2020-05-15 19:45:40.000000000 +0000 @@ -0,0 +1,137 @@ +From 1fea6624b4cdecf9d95de5912e192eb50bbda795 Mon Sep 17 00:00:00 2001 +From: Jeremy Freudberg +Date: Thu, 30 Apr 2020 10:35:10 -0400 +Subject: [PATCH] Use flask's builtin methods for test context + +In Python 3.8 unittest.mock can't successfully mock Flask. +So we need to use test_request_context instead. + +Tests are slightly restructured: assertions are now done on an actual +Response object. + +Remove some apparently duplicated lines. + +Change-Id: I83f240400295d38fe40d54ab7a8f6442f3981729 +Story: 2007596 +Task: 39565 +--- + sahara/tests/unit/utils/test_api.py | 87 +++++++++++++++-------------- + 1 file changed, 45 insertions(+), 42 deletions(-) + +diff --git a/sahara/tests/unit/utils/test_api.py b/sahara/tests/unit/utils/test_api.py +index 6571b085..c5c8625f 100644 +--- a/sahara/tests/unit/utils/test_api.py ++++ b/sahara/tests/unit/utils/test_api.py +@@ -14,7 +14,6 @@ + # limitations under the License. + + import copy +-from unittest import mock + + import testtools + +@@ -40,56 +39,60 @@ class APIUtilsTest(testtools.TestCase): + ] + } + +- @mock.patch('flask.request') +- @mock.patch('flask.Response') +- def test_render_pagination(self, flask, request): +- serializer = wsgi.JSONDictSerializer() +- request.status_code = 200 ++ def test_render_pagination(self): ++ def _assert_response_equal(response_obj, response, status, mimetype): ++ self.assertEqual(response_obj.response, [response.encode()]) ++ self.assertEqual(response_obj.status, status) ++ self.assertEqual(response_obj.mimetype, mimetype) + +- api.render(self.page, 'application/json', 200, name='clusters') +- body = serializer.serialize(self.response) +- flask.assert_called_with( +- response=body, status=200, mimetype='application/json') ++ from sahara.api.middleware import sahara_middleware # noqa ++ app = sahara_middleware.build_app() + +- self.page.prev, self.page.next = 35, 49 +- api.render(self.page, 'application/json', 200, name='clusters') +- paginate_response = copy.copy(self.response) +- paginate_response["markers"] = \ +- {"prev": 35, "next": 49} ++ with app.test_request_context(): ++ _200_OK = '200 OK' ++ serializer = wsgi.JSONDictSerializer() + +- body = serializer.serialize(paginate_response) +- flask.assert_called_with( +- response=body, status=200, mimetype='application/json') ++ resp = \ ++ api.render(self.page, 'application/json', 200, name='clusters') ++ body = serializer.serialize(self.response) ++ _assert_response_equal(resp, body, _200_OK, 'application/json') + +- self.page.prev, self.page.next = 7, None +- api.render(self.page, 'application/json', 200, name='clusters') +- paginate_response = copy.copy(self.response) +- paginate_response["markers"] = {"prev": 7, "next": None} ++ self.page.prev, self.page.next = 35, 49 ++ resp = \ ++ api.render(self.page, 'application/json', 200, name='clusters') ++ paginate_response = copy.copy(self.response) ++ paginate_response["markers"] = \ ++ {"prev": 35, "next": 49} + +- body = serializer.serialize(paginate_response) +- flask.assert_called_with( +- response=body, status=200, mimetype='application/json') ++ body = serializer.serialize(paginate_response) ++ _assert_response_equal(resp, body, _200_OK, 'application/json') + +- self.page.prev, self.page.next = None, 14 +- api.render(self.page, 'application/json', 200, name='clusters') ++ self.page.prev, self.page.next = 7, None ++ resp = \ ++ api.render(self.page, 'application/json', 200, name='clusters') ++ paginate_response = copy.copy(self.response) ++ paginate_response["markers"] = {"prev": 7, "next": None} + +- paginate_response = copy.copy(self.response) +- paginate_response["markers"] = {"prev": None, "next": 14} ++ body = serializer.serialize(paginate_response) ++ _assert_response_equal(resp, body, _200_OK, 'application/json') + +- body = serializer.serialize(paginate_response) +- flask.assert_called_with( +- response=body, status=200, mimetype='application/json') ++ self.page.prev, self.page.next = None, 14 ++ resp = \ ++ api.render(self.page, 'application/json', 200, name='clusters') + +- self.page.prev, self.page.next = None, 11 +- api.render(self.page, 'application/json', 200, name='clusters') ++ paginate_response = copy.copy(self.response) ++ paginate_response["markers"] = {"prev": None, "next": 14} + +- paginate_response = copy.copy(self.response) +- paginate_response["markers"] = \ +- {"prev": None, "next": 11} ++ body = serializer.serialize(paginate_response) ++ _assert_response_equal(resp, body, _200_OK, 'application/json') + +- body = serializer.serialize(paginate_response) +- flask.assert_called_with( +- response=body, status=200, mimetype='application/json') ++ self.page.prev, self.page.next = None, 11 ++ resp = \ ++ api.render(self.page, 'application/json', 200, name='clusters') + +- self.page.prev, self.page.next = None, 11 +- api.render(self.page, 'application/json', 200, name='clusters') ++ paginate_response = copy.copy(self.response) ++ paginate_response["markers"] = \ ++ {"prev": None, "next": 11} ++ ++ body = serializer.serialize(paginate_response) ++ _assert_response_equal(resp, body, _200_OK, 'application/json') +-- +2.25.1 + diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/debian/watch sahara-12.0.0/debian/watch --- sahara-12.0.0~b3~git2020041014.0825bdde/debian/watch 2020-04-10 18:13:17.000000000 +0000 +++ sahara-12.0.0/debian/watch 2020-05-15 19:45:40.000000000 +0000 @@ -1,3 +1,3 @@ version=3 opts="uversionmangle=s/\.([a-zA-Z])/~$1/;s/%7E/~/;s/\.0b/~b/;s/\.0rc/~rc/" \ - http://tarballs.openstack.org/sahara sahara-(11\.\d.*)\.tar\.gz + https://tarballs.opendev.org/openstack/sahara sahara-(12\.\d.*)\.tar\.gz diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/doc/requirements.txt sahara-12.0.0/doc/requirements.txt --- sahara-12.0.0~b3~git2020041014.0825bdde/doc/requirements.txt 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/doc/requirements.txt 2020-05-13 11:03:54.000000000 +0000 @@ -1,10 +1,9 @@ # 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 # process, which may cause wedges in the gate later. -openstackdocstheme>=1.20.0 # Apache-2.0 +openstackdocstheme>=1.31.2 # Apache-2.0 os-api-ref>=1.6.0 # Apache-2.0 reno>=2.5.0 # Apache-2.0 -sphinx!=1.6.6,!=1.6.7,>=1.6.2,<2.0.0;python_version=='2.7' # BSD -sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2;python_version>='3.4' # BSD +sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD sphinxcontrib-httpdomain>=1.3.0 # BSD whereto>=0.3.0 # Apache-2.0 diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/doc/source/conf.py sahara-12.0.0/doc/source/conf.py --- sahara-12.0.0~b3~git2020041014.0825bdde/doc/source/conf.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/doc/source/conf.py 2020-05-13 11:03:54.000000000 +0000 @@ -41,8 +41,7 @@ # openstackdocstheme options repository_name = 'openstack/sahara' -bug_project = '935' -bug_tag = 'doc' +use_storyboard = True config_generator_config_file = 'config-generator.conf' config_sample_basename = 'sahara' diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/doc/source/contributor/contributing.rst sahara-12.0.0/doc/source/contributor/contributing.rst --- sahara-12.0.0~b3~git2020041014.0825bdde/doc/source/contributor/contributing.rst 1970-01-01 00:00:00.000000000 +0000 +++ sahara-12.0.0/doc/source/contributor/contributing.rst 2020-05-13 11:03:54.000000000 +0000 @@ -0,0 +1,70 @@ +============================ +So You Want to Contribute... +============================ + +For general information on contributing to OpenStack, please check out the +`contributor guide `_ to get started. +It covers all the basics that are common to all OpenStack projects: the +accounts you need, the basics of interacting with our Gerrit review system, how +we communicate as a community, etc. + +Below will cover the more project specific information you need to get started +with Sahara. + +Communication +~~~~~~~~~~~~~ +* If you have something to discuss use + `OpenStack development mail-list `_. + Prefix the mail subject with ``[sahara]`` + +* Join ``#openstack-sahara`` IRC channel on `freenode `_ + +* Attend Sahara team meetings + + * Weekly on Thursdays at 1400 UTC + + * IRC channel: ``#openstack-meeting-3`` + +Contacting the Core Team +~~~~~~~~~~~~~~~~~~~~~~~~ +* The core team has coverage in the timezones of Europe and the Americas. + +* Just pop over to IRC; we keep a close eye on it! + +* You can also find the email addresses of the core team `here + https://review.opendev.org/#/admin/groups/133,members>`. + +New Feature Planning +~~~~~~~~~~~~~~~~~~~~ +Sahara uses specs to track feature requests. They provide a high-level summary +of proposed changes and track associated commits. Sahara also uses specs for +in-depth descriptions and discussions of blueprints. Specs follow a defined +format and are submitted as change requests to the openstack/sahara-specs +repository. + +Task Tracking +~~~~~~~~~~~~~ +We track our tasks in Storyboard. + +The Sahara project group homepage on Storyboard is +https://storyboard.openstack.org/#!/project_group/sahara. + +If you're looking for some smaller, easier work item to pick up and get started +on, search for the 'low-hanging-fruit' or 'new-contributor' tag. + +Reporting a Bug +~~~~~~~~~~~~~~~ +You found an issue and want to make sure we are aware of it? You can do so on +https://storyboard.openstack.org/#!/project_group/sahara. + +Getting Your Patch Merged +~~~~~~~~~~~~~~~~~~~~~~~~~ +Typically two +2s are required before merging. + +Project Team Lead Duties +~~~~~~~~~~~~~~~~~~~~~~~~ +If you are the PTL of Sahara then you should follow the `PTL guide +`_. You should also +keep track of new versions of the various Hadoop distros/components coming out +(this can also be delegated to another contributor, but the PTL needs to track +it either way). diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/doc/source/contributor/how-to-participate.rst sahara-12.0.0/doc/source/contributor/how-to-participate.rst --- sahara-12.0.0~b3~git2020041014.0825bdde/doc/source/contributor/how-to-participate.rst 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/doc/source/contributor/how-to-participate.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -How to Participate -================== - -Getting started ---------------- - -* Make sure that your local git is properly configured by executing - ``git config --list``. If not, configure ``user.name``, ``user.email`` - -* Create account on `Launchpad `_ - (if you don't have one) - -* Subscribe to `OpenStack general mail-list `_ - -* Subscribe to `OpenStack development mail-list `_ - -* Create `OpenStack profile `_ - -* Login to `OpenStack Gerrit `_ with your - Launchpad id - - * Sign `OpenStack Individual Contributor License Agreement `_ - * Make sure that your email is listed in `identities `_ - -* Subscribe to code-reviews. Go to your settings on https://review.opendev.org - - * Go to ``watched projects`` - * Add ``openstack/sahara``, ``openstack/sahara-extra``, - ``openstack/python-saharaclient``, and ``openstack/sahara-image-elements`` - - -How to stay in touch with the community ---------------------------------------- - -* If you have something to discuss use - `OpenStack development mail-list `_. - Prefix the mail subject with ``[sahara]`` - -* Join ``#openstack-sahara`` IRC channel on `freenode `_ - -* Attend Sahara team meetings - - * Weekly on Thursdays at 1400 UTC - - * IRC channel: ``#openstack-meeting-3`` - - * See agenda at https://wiki.openstack.org/wiki/Meetings/SaharaAgenda - - -How to post your first patch for review ---------------------------------------- - -* Checkout Sahara code from `its repository `_ - -* Carefully read https://docs.openstack.org/infra/manual/developers.html#development-workflow - - * Pay special attention to https://docs.openstack.org/infra/manual/developers.html#committing-a-change - -* Apply and commit your changes - -* Make sure that your code passes ``PEP8`` checks and unit-tests. - See :doc:`development-guidelines` - -* Post your patch for review - -* Monitor the status of your patch review on https://review.opendev.org/#/ - - - diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/doc/source/contributor/index.rst sahara-12.0.0/doc/source/contributor/index.rst --- sahara-12.0.0~b3~git2020041014.0825bdde/doc/source/contributor/index.rst 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/doc/source/contributor/index.rst 2020-05-13 11:03:54.000000000 +0000 @@ -12,7 +12,6 @@ development-environment devstack dashboard-dev-environment-guide - how-to-participate how-to-build-oozie adding-database-migrations testing @@ -26,6 +25,6 @@ .. toctree:: :maxdepth: 2 - project + contributing gerrit jenkins diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/doc/source/contributor/project.rst sahara-12.0.0/doc/source/contributor/project.rst --- sahara-12.0.0~b3~git2020041014.0825bdde/doc/source/contributor/project.rst 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/doc/source/contributor/project.rst 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -Project hosting -=============== - -`Storyboard`_ hosts the Sahara project. The Sahara project group homepage on -Storyboard is https://storyboard.openstack.org/#!/project_group/74. - -Launchpad credentials ---------------------- - -Creating a login on Launchpad is important even if you don't use the Launchpad -site itself, since Launchpad credentials are used for logging in on several -OpenStack-related sites. These sites include: - -* `Wiki`_ -* Gerrit (see :doc:`gerrit`) -* Jenkins (see :doc:`jenkins`) - -Mailing list ------------- - -The mailing list email is ``openstack-discuss@lists.openstack.org``; use the -subject prefix ``[sahara]`` to address the team. To participate in the -mailing list subscribe to the list at -http://lists.openstack.org/cgi-bin/mailman/listinfo - -Bug tracking ------------- - -Report Sahara bugs/stories at the various project under the Sahara project -group https://storyboard.openstack.org/#!/project_group/74 - -Feature requests (Specs) ------------------------------ - -Sahara uses specs to track feature requests. They provide a high-level summary -of proposed changes and track associated commits. Sahara also uses specs for -in-depth descriptions and discussions of blueprints. Specs follow a defined -format and are submitted as change requests to the openstack/sahara-specs -repository. - -Technical support ------------------ - -Sahara uses `Ask OpenStack`_ to track Sahara technical support questions. -Questions related to Sahara should be tagged with 'sahara'. - -.. _Storyboard: https://storyboard.openstack.org -.. _Wiki: http://wiki.openstack.org/sahara -.. _Ask OpenStack: https://ask.openstack.org diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/doc/source/_extra/.htaccess sahara-12.0.0/doc/source/_extra/.htaccess --- sahara-12.0.0~b3~git2020041014.0825bdde/doc/source/_extra/.htaccess 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/doc/source/_extra/.htaccess 2020-05-13 11:03:54.000000000 +0000 @@ -5,3 +5,5 @@ redirectmatch 301 ^/sahara/(?!ocata|pike|queens)([^/]+)/user/cdh-imagebuilder.html$ /sahara/$1/user/cdh-plugin.html redirectmatch 301 ^/sahara/(?!ocata|pike|queens)([^/]+)/user/guest-requirements.html$ /sahara/$1/user/building-guest-images.html redirectmatch 301 ^/sahara/([^/]+)/user/([^-]+)-plugin.html$ /sahara-plugin-$2/$1/ +redirectmatch 301 ^/sahara/([^/]+)/contributor/how-to-participate.html$ /sahara/$1/contributor/contributing.html +redirectmatch 301 ^/sahara/([^/]+)/contributor/project.html$ /sahara/$1/contributor/contributing.html diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/doc/test/redirect-tests.txt sahara-12.0.0/doc/test/redirect-tests.txt --- sahara-12.0.0~b3~git2020041014.0825bdde/doc/test/redirect-tests.txt 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/doc/test/redirect-tests.txt 2020-05-13 11:03:54.000000000 +0000 @@ -7,3 +7,5 @@ /sahara/rocky/user/guest-requirements.html 301 /sahara/rocky/user/building-guest-images.html /sahara/latest/user/vanilla-plugin.html 301 /sahara-plugin-vanilla/latest/ /sahara/stein/user/storm-plugin.html 301 /sahara-plugin-storm/stein/ +/sahara/latest/contributor/how-to-participate.html 301 /sahara/latest/contributor/contributing.html +/sahara/latest/contributor/project.html 301 /sahara/latest/contributor/contributing.html diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/PKG-INFO sahara-12.0.0/PKG-INFO --- sahara-12.0.0~b3~git2020041014.0825bdde/PKG-INFO 2020-04-10 18:12:52.957682100 +0000 +++ sahara-12.0.0/PKG-INFO 2020-05-13 11:05:59.000000000 +0000 @@ -1,6 +1,6 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: sahara -Version: 11.1.0.dev13 +Version: 12.0.0 Summary: Sahara project Home-page: https://docs.openstack.org/sahara/latest/ Author: OpenStack @@ -52,3 +52,4 @@ Classifier: Intended Audience :: System Administrators Classifier: License :: OSI Approved :: Apache Software License Classifier: Operating System :: POSIX :: Linux +Requires-Python: >=3.6 diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/releasenotes/source/conf.py sahara-12.0.0/releasenotes/source/conf.py --- sahara-12.0.0~b3~git2020041014.0825bdde/releasenotes/source/conf.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/releasenotes/source/conf.py 2020-05-13 11:03:54.000000000 +0000 @@ -21,8 +21,7 @@ # openstackdocstheme options repository_name = 'openstack/sahara' -bug_project = '935' -bug_tag = 'releasenotes' +use_storyboard = True # Add any paths that contain templates here, relative to this directory. templates_path = ['_templates'] diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po sahara-12.0.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po --- sahara-12.0.0~b3~git2020041014.0825bdde/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,797 +0,0 @@ -# Andi Chandler , 2017. #zanata -# Andi Chandler , 2018. #zanata -msgid "" -msgstr "" -"Project-Id-Version: sahara\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-03-21 18:55+0000\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2018-08-08 10:03+0000\n" -"Last-Translator: Andi Chandler \n" -"Language-Team: English (United Kingdom)\n" -"Language: en_GB\n" -"X-Generator: Zanata 4.3.3\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -msgid "3.0.1" -msgstr "3.0.1" - -msgid "4.0.0" -msgstr "4.0.0" - -msgid "4.0.1" -msgstr "4.0.1" - -msgid "4.1.0" -msgstr "4.1.0" - -msgid "5.0.0" -msgstr "5.0.0" - -msgid "6.0.0" -msgstr "6.0.0" - -msgid "7.0.0" -msgstr "7.0.0" - -msgid "8.0.0" -msgstr "8.0.0" - -msgid "8.0.1" -msgstr "8.0.1" - -msgid "" -"A few responses in the experimental (but nearly-stable) APIv2 have been " -"tweaked. To be specific, the key `hadoop_version` has been replaced with " -"`plugin_version`, the key `job` has been replaced with `job_template`, the " -"key `job_execution` has been replaced with `job`, and the key `oozie_job_id` " -"has been replaced with `engine_job_id`. In fact, these changes were all " -"previously partially implemented, and are now completely implemented." -msgstr "" -"A few responses in the experimental (but nearly-stable) APIv2 have been " -"tweaked. To be specific, the key `hadoop_version` has been replaced with " -"`plugin_version`, the key `job` has been replaced with `job_template`, the " -"key `job_execution` has been replaced with `job`, and the key `oozie_job_id` " -"has been replaced with `engine_job_id`. In fact, these changes were all " -"previously partially implemented, and are now completely implemented." - -msgid "Add Kafka to MapR plugin" -msgstr "Add Kafka to MapR plugin" - -msgid "Add Sentry to MapR plugin" -msgstr "Add Sentry to MapR plugin" - -msgid "Add ability of scheduling EDP jobs for sahara" -msgstr "Add ability of scheduling EDP jobs for sahara" - -msgid "" -"Add ability to automaticaly generate better configurations for Ambari " -"cluster by using 'ALWAYS_APPLY' strategy" -msgstr "" -"Add ability to automatically generate better configurations for Ambari " -"cluster by using 'ALWAYS_APPLY' strategy" - -msgid "Add impala 2.2 to MapR plugin" -msgstr "Add impala 2.2 to MapR plugin" - -msgid "" -"Add regular expression matching on search values for certain string fields " -"of sahara objects. This applies to list operations through the REST API and " -"therefore applies to the dashboard and sahara client as well. Closes bug " -"1503345." -msgstr "" -"Add regular expression matching on search values for certain string fields " -"of Sahara objects. This applies to list operations through the REST API and " -"therefore applies to the dashboard and Sahara client as well. Closes bug " -"1503345." - -msgid "Added additional filter to volume_type check, closed bug 1508017" -msgstr "Added additional filter to volume_type check, closed bug 1508017" - -msgid "Added event log for HDP plugin" -msgstr "Added event log for HDP plugin" - -msgid "" -"Added integration of Designate for hostname resolution through dns servers" -msgstr "" -"Added integration of Designate for hostname resolution through DNS servers" - -msgid "Added rack awareness feature for CDH 5.5 and CDH 5.7" -msgstr "Added rack awareness feature for CDH 5.5 and CDH 5.7" - -msgid "Added rack awareness feature for HDP plugin" -msgstr "Added rack awareness feature for HDP plugin" - -msgid "" -"Added support of running sahara-api as wsgi application. Use 'sahara-wsgi-" -"api' command for use this feature." -msgstr "" -"Added support of running sahara-api as wsgi application. Use 'sahara-wsgi-" -"api' command for use this feature." - -msgid "Adding Spark 2.3 to supported plugins list." -msgstr "Adding Spark 2.3 to supported plugins list." - -msgid "Adding Spark version 2.2 to Sahara." -msgstr "Adding Spark version 2.2 to Sahara." - -msgid "" -"Adding ability to create and validate MapR 5.2.0 images using the new image " -"gen tool." -msgstr "" -"Adding ability to create and validate MapR 5.2.0 images using the new image " -"gen tool." - -msgid "" -"Adding new versions of Storm, 1.2.0 and 1.2.1. Both will exist under the " -"same tag 1.2." -msgstr "" -"Adding new versions of Storm, 1.2.0 and 1.2.1. Both will exist under the " -"same tag 1.2." - -msgid "Adding support to CDH 5.13.0 in CDH plugin." -msgstr "Adding support to CDH 5.13.0 in CDH plugin." - -msgid "" -"Adding the ability to boot a Sahara cluster from volumes instead of images." -msgstr "" -"Adding the ability to boot a Sahara cluster from volumes instead of images." - -msgid "Adding the ability to create Ambari 2.6 images on sahara-image-pack" -msgstr "Adding the ability to create Ambari 2.6 images on sahara-image-pack" - -msgid "" -"After decommissioning hosts all assoicated configs groups will be removed in " -"ambari plugin." -msgstr "" -"After decommissioning hosts all associated configs groups will be removed in " -"Ambari plugin." - -msgid "" -"An EDP data source may reference a file stored in a S3-like object store." -msgstr "" -"An EDP data source may reference a file stored in a S3-like object store." - -msgid "" -"An EDP job binary may reference a file stored in a S3-like object store." -msgstr "" -"An EDP job binary may reference a file stored in a S3-like object store." - -msgid "Bug Fixes" -msgstr "Bug Fixes" - -msgid "" -"CA certificate handling in keystone, nova, neutron and cinder clients are " -"fixed (#330635)" -msgstr "" -"CA certificate handling in Keystone, Nova, Neutron and Cinder clients are " -"fixed (#330635)" - -msgid "CDH 5.11.0 is supported in CDH plugin." -msgstr "CDH 5.11.0 is supported in CDH plugin." - -msgid "CDH 5.5.0 is supported in CDH plugin." -msgstr "CDH 5.5.0 is supported in CDH plugin." - -msgid "CDH 5.7 is supported in CDH plugin." -msgstr "CDH 5.7 is supported in CDH plugin." - -msgid "CDH 5.9.0 is supported in CDH plugin." -msgstr "CDH 5.9.0 is supported in CDH plugin." - -msgid "" -"Cluster with 'is_protected' field can be created now, closed bug 1510929" -msgstr "" -"Cluster with 'is_protected' field can be created now, closed bug 1510929" - -msgid "" -"Convert to cluster template feature is no longer supported by all plugins." -msgstr "" -"Convert to cluster template feature is no longer supported by all plugins." - -msgid "Correctly configure Spark with Hive and HBase on different nodes." -msgstr "Correctly configure Spark with Hive and HBase on different nodes." - -msgid "Current Series Release Notes" -msgstr "Current Series Release Notes" - -msgid "Custom health check is added to MapR plugin" -msgstr "Custom health check is added to MapR plugin" - -msgid "Deprecation Notes" -msgstr "Deprecation Notes" - -msgid "" -"Documentation about distributed periodics are extended with steps about " -"installation additional libs required for correct work of coordination " -"backend. Please refer Advanced Configuration Guide for details." -msgstr "" -"Documentation about distributed periodics are extended with steps about " -"installation additional libs required for correct work of coordination " -"backend. Please refer Advanced Configuration Guide for details." - -msgid "" -"Enables the creation and validation of Ambari 2.4 images using the new image " -"generation process where libguestfs replaces the use of DIB." -msgstr "" -"Enables the creation and validation of Ambari 2.4 images using the new image " -"generation process where libguestfs replaces the use of DIB." - -msgid "" -"Enables the creation and validation of CDH 5.11.0 images using the new image " -"generation process where libguestfs replaces the use of DIB." -msgstr "" -"Enables the creation and validation of CDH 5.11.0 images using the new image " -"generation process where libguestfs replaces the use of DIB." - -msgid "" -"Enables the creation and validation of CDH 5.7.0 images using the new image " -"generation process where libguestfs replaces the use of DIB." -msgstr "" -"Enables the creation and validation of CDH 5.7.0 images using the new image " -"generation process where libguestfs replaces the use of DIB." - -msgid "" -"Enables the creation and validation of CDH 5.9.0 images using the new image " -"generation process where libguestfs replaces the use of DIB." -msgstr "" -"Enables the creation and validation of CDH 5.9.0 images using the new image " -"generation process where libguestfs replaces the use of DIB." - -msgid "Escape unhandled unicode characters in environment configuration files" -msgstr "Escape unhandled Unicode characters in environment configuration files" - -msgid "" -"Event log hanling fixed in case of problems with volumes formatting, closed " -"bug 1506839" -msgstr "" -"Event log handling fixed in case of problems with volumes formatting, closed " -"bug 1506839" - -msgid "" -"Every new release of Sahara we update our plugins list. Some new versions " -"are added and some removed and other marked as deprecated. For Rocky we are " -"deprecating CDH 5.7.0, Spark 1.6.0 and 2.1 as well as Storm 1.0.1. We are " -"also removing CDH 5.5.0, MapR 5.1.0, Spark 1.3.1 and Storm 0.9.2." -msgstr "" -"Every new release of Sahara we update our plugins list. Some new versions " -"are added and some removed and other marked as deprecated. For Rocky we are " -"deprecating CDH 5.7.0, Spark 1.6.0 and 2.1 as well as Storm 1.0.1. We are " -"also removing CDH 5.5.0, MapR 5.1.0, Spark 1.3.1 and Storm 0.9.2." - -msgid "Fix Hue intergation with Spark and Hive on different nodes" -msgstr "Fix Hue integration with Spark and Hive on different nodes" - -msgid "Fix creating Hive database schema automatically." -msgstr "Fix creating Hive database schema automatically." - -msgid "Fix unavailable MCS link." -msgstr "Fix unavailable MCS link." - -msgid "Fix uncompleted event logs for Oozie and Drill in MapR plugin." -msgstr "Fix uncompleted event logs for Oozie and Drill in MapR plugin." - -msgid "Fix visualization of MapR versions when running on python 3" -msgstr "Fix visualisation of MapR versions when running on Python 3" - -msgid "Fixed api_insecure handling in sessions. Closed bug 1539498." -msgstr "Fixed api_insecure handling in sessions. Closed bug 1539498." - -msgid "Fixed arguments list in latest cdh plugin" -msgstr "Fixed arguments list in latest CDH plugin" - -msgid "Fixed client tempest tests" -msgstr "Fixed client tempest tests" - -msgid "Fixed incorrect down scaling of ambari cluster" -msgstr "Fixed incorrect down scaling of Ambari cluster" - -msgid "" -"Fixed issue with handling endpoint_type during creation neutron client, " -"closed bug 1564805" -msgstr "" -"Fixed issue with handling endpoint_type during creation neutron client, " -"closed bug 1564805" - -msgid "Fixed issue with incorrect retrieving of auth url." -msgstr "Fixed issue with incorrect retrieving of auth URL." - -msgid "Fixed issue with launching clusters without auto-security groups." -msgstr "Fixed issue with launching clusters without auto-security groups." - -msgid "" -"Fixed issues with hardcoded password during creation MySQL database for " -"Oozie, bug 1541122." -msgstr "" -"Fixed issues with hardcoded password during creation MySQL database for " -"Oozie, bug 1541122." - -msgid "" -"Fixed issues with hardcoded password during starting hive process, bug " -"1498035." -msgstr "" -"Fixed issues with hardcoded password during starting Hive process, bug " -"1498035." - -msgid "Fixed issues with using Swift as an output datasource." -msgstr "Fixed issues with using Swift as an output data source." - -msgid "Fixed launching Hive jobs in Ambari plugin." -msgstr "Fixed launching Hive jobs in Ambari plugin." - -msgid "" -"Fixed problems with validation of job binaries update, closed bug 1508507" -msgstr "" -"Fixed problems with validation of job binaries update, closed bug 1508507" - -msgid "Fixed search of devices that need to be mounted, closed bug 1508872" -msgstr "Fixed search of devices that need to be mounted, closed bug 1508872" - -msgid "Fixed tempest config group" -msgstr "Fixed Tempest config group" - -msgid "" -"Fixes `story 2002551`_ in which CDH cluster creation was stuck when the " -"image was generated using sahara-image-elements, and at the same time extjs " -"2.2 was not injected inside the images generated using sahara-image-pack." -msgstr "" -"Fixes `story 2002551`_ in which CDH cluster creation was stuck when the " -"image was generated using sahara-image-elements, and at the same time extjs " -"2.2 was not injected inside the images generated using sahara-image-pack." - -msgid "" -"HDP plugin removed from default configuration list. End users who are using " -"HDP should ensure that their configuration files continue to list \"hdp\"." -msgstr "" -"HDP plugin removed from default configuration list. End users who are using " -"HDP should ensure that their configuration files continue to list \"hdp\"." - -msgid "" -"Hadoop is now better configured to use the proper Keystone domain for " -"interaction with Swift; previously the 'default' domain may have been " -"incorrectly used." -msgstr "" -"Hadoop is now better configured to use the proper Keystone domain for " -"interaction with Swift; previously the 'default' domain may have been " -"incorrectly used." - -msgid "Heat engine shows reasons in case of failure" -msgstr "Heat engine shows reasons in case of failure" - -msgid "Implemented support of HDP 2.5 in the Ambari plugin." -msgstr "Implemented support of HDP 2.5 in the Ambari plugin." - -msgid "Implemented support of HDP 2.6 in the Ambari plugin." -msgstr "Implemented support of HDP 2.6 in the Ambari plugin." - -msgid "In case of XFS volume will be formatted with '-f' option." -msgstr "In case of XFS volume will be formatted with '-f' option." - -msgid "" -"Ironic integration might be broken if floating IPs are used, due to the use " -"of pre-created ports by the Sahara engine. The status of Ironic support was " -"untested for this release." -msgstr "" -"Ironic integration might be broken if Floating IPs are used, due to the use " -"of pre-created ports by the Sahara engine. The status of Ironic support was " -"untested for this release." - -msgid "" -"Issues with job types call are fixed. Jobs can be launched from UI if ambari " -"plugin enabled." -msgstr "" -"Issues with job types call are fixed. Jobs can be launched from UI if Ambari " -"plugin enabled." - -msgid "" -"Job execution can be created with 'is_protected' field, closed bug 1510994" -msgstr "" -"Job execution can be created with 'is_protected' field, closed bug 1510994" - -msgid "Kafka was added in CDH 5.5 and CDH 5.7" -msgstr "Kafka was added in CDH 5.5 and CDH 5.7" - -msgid "" -"Kerberos support implemented for Cloudera and Ambari plugins. New oozie " -"client implemented to support authentication for oozie in kerberized cluster." -msgstr "" -"Kerberos support implemented for Cloudera and Ambari plugins. New Oozie " -"client implemented to support authentication for Oozie in Kerberised cluster." - -msgid "Known Issues" -msgstr "Known Issues" - -msgid "Liberty Series Release Notes" -msgstr "Liberty Series Release Notes" - -msgid "MaR 5.2.0 is supported in MapR plugin." -msgstr "MapR 5.2.0 is supported in MapR plugin." - -msgid "Make Oozie use correct maprfs jar in MapR plugin" -msgstr "Make Oozie use correct maprfs jar in MapR plugin" - -msgid "" -"MapR 5.0.0.mrv2 is now Deprecated. It is not recommended for usage. It is " -"better to use MapR 5.1.0.mrv2 instead. This version of plugin will be " -"removed in Ocata release." -msgstr "" -"MapR 5.0.0.mrv2 is now deprecated. It is not recommended for usage. It is " -"better to use MapR 5.1.0.mrv2 instead. This version of plugin will be " -"removed in the Ocata release." - -msgid "MapR 5.1.0.mrv2 is now Enabled." -msgstr "MapR 5.1.0.mrv2 is now Enabled." - -msgid "" -"MapR 5.1.0.mrv2 is now deprecated and will be removed in Ocata release. It " -"is recommended to use MapR 5.2.0.mrv2 instead." -msgstr "" -"MapR 5.1.0.mrv2 is now deprecated and will be removed in the Ocata release. " -"It is recommended to use MapR 5.2.0.mrv2 instead." - -msgid "" -"MapR repositories now can be configured in general section of cluster " -"template configs" -msgstr "" -"MapR repositories now can be configured in general section of cluster " -"template configs" - -msgid "Migration from novaclient.v2.images to glanceclient" -msgstr "Migration from novaclient.v2.images to glanceclient" - -msgid "Mitaka Series Release Notes" -msgstr "Mitaka Series Release Notes" - -msgid "Move notifications options into oslo_messaging_notifications" -msgstr "Move notifications options into oslo_messaging_notifications" - -msgid "" -"Neutron is used by default now (use_neutron=True). Nova-network is not " -"functionaly for most use cases starting from Ocata." -msgstr "" -"Neutron is used by default now (use_neutron=True). Nova-Network is not " -"functional for most use cases starting from Ocata." - -msgid "New Features" -msgstr "New Features" - -msgid "Newton Series Release Notes" -msgstr "Newton Series Release Notes" - -msgid "" -"Nova network has been fully removed from the OpenStack codebase, remove all " -"instances of switches on use_neutron and the configuration value." -msgstr "" -"Nova Network has been fully removed from the OpenStack codebase, remove all " -"instances of switches on use_neutron and the configuration value." - -msgid "Ocata Series Release Notes" -msgstr "Ocata Series Release Notes" - -msgid "Open ports for Kafka in Ambari plugin, closed bug 1512661" -msgstr "Open ports for Kafka in Ambari plugin, closed bug 1512661" - -msgid "" -"OpenStack Key Manager service can now be used by sahara to enable storage of " -"sensitive information in an external service such as barbican." -msgstr "" -"OpenStack Key Manager service can now be used by Sahara to enable storage of " -"sensitive information in an external service such as Barbican." - -msgid "" -"Operators can now update the running configuration of Sahara processes by " -"sending the parent process a \"HUP\" signal. Note: The configuration option " -"must support mutation." -msgstr "" -"Operators can now update the running configuration of Sahara processes by " -"sending the parent process a \"HUP\" signal. Note: The configuration option " -"must support mutation." - -msgid "Option 'infrastructure engine' is removed from sahara configs." -msgstr "Option 'infrastructure engine' is removed from Sahara configs." - -msgid "Other Notes" -msgstr "Other Notes" - -msgid "Pike Series Release Notes" -msgstr "Pike Series Release Notes" - -msgid "Prelude" -msgstr "Prelude" - -msgid "Queens Series Release Notes" -msgstr "Queens Series Release Notes" - -msgid "" -"Refactoring the logic on how floating ips are used by Sahara. This change " -"will allow the coexistence of cluster using floating ips with cluster that " -"do not." -msgstr "" -"Refactoring the logic on how Floating IPs are used by Sahara. This change " -"will allow the coexistence of cluster using Floating IPs with cluster that " -"do not." - -msgid "" -"Remove Impala 1.4.1, HBase 0.98.9, Hive 1.0, Hue 3.7 support in MapR 5.1.0 " -"plugin" -msgstr "" -"Remove Impala 1.4.1, HBase 0.98.9, Hive 1.0, Hue 3.7 support in MapR 5.1.0 " -"plugin" - -msgid "" -"Remove hive.server2.authentication property from hive-site.xml for Hue 3.9.0 " -"in MapR plugin." -msgstr "" -"Remove hive.server2.authentication property from hive-site.xml for Hue 3.9.0 " -"in MapR plugin." - -msgid "Remove support for Spark standalone in MapR plugin" -msgstr "Remove support for Spark standalone in MapR plugin" - -msgid "" -"Remove the step \"upload httpclient to oozie/sharelib\" in sahara code. User " -"should use latest vanilla-2.8.2 image which is built on SIE \"Change-ID: " -"I3a25ee8c282849911089adf6c3593b1bb50fd067\"." -msgstr "" -"Remove the step \"upload httpclient to oozie/sharelib\" in sahara code. User " -"should use latest vanilla-2.8.2 image which is built on SIE \"Change-ID: " -"I3a25ee8c282849911089adf6c3593b1bb50fd067\"." - -msgid "Removed support for the MapR 5.0.0 plugin." -msgstr "Removed support for the MapR 5.0.0 plugin." - -msgid "Removed support for the Spark 1.0.0 plugin." -msgstr "Removed support for the Spark 1.0.0 plugin." - -msgid "Removed support of Vanilla 2.6.0 plugin." -msgstr "Removed support of Vanilla 2.6.0 plugin." - -msgid "Removed unneeded volume serialization" -msgstr "Removed unneeded volume serialisation" - -msgid "" -"Sahara APIv2 is reaching a point of maturity. Therefore, new deployments " -"should include an **unversioned** endpoint in the service catalog for the " -"\"data-processing\" service, for the purposes of more intuitive version " -"discovery. Eventually existing deployments should switch to an unversioned " -"endpoint, too, but only after time is given for the use of older clients to " -"be less likely." -msgstr "" -"Sahara APIv2 is reaching a point of maturity. Therefore, new deployments " -"should include an **unversioned** endpoint in the service catalogue for the " -"\"data-processing\" service, for the purposes of more intuitive version " -"discovery. Eventually existing deployments should switch to an unversioned " -"endpoint, too, but only after time is given for the use of older clients to " -"be less likely." - -msgid "Sahara Release Notes" -msgstr "Sahara Release Notes" - -msgid "" -"Sahara's APIv2 is now exposed by default (although its state is still " -"experimental). It has feature parity with Sahara's APIv1.1, but APIv2 brings " -"better REST semantics, tweaks to some response payloads, and some other " -"improvements. APIv2 will remain labeled experimental until it is stabilized " -"following the addition of new features to it in the coming cycle(s)." -msgstr "" -"Sahara's APIv2 is now exposed by default (although its state is still " -"experimental). It has feature parity with Sahara's APIv1.1, but APIv2 brings " -"better REST semantics, tweaks to some response payloads, and some other " -"improvements. APIv2 will remain labelled experimental until it is stabilised " -"following the addition of new features to it in the upcoming cycle(s)." - -msgid "" -"Sample configuration files previously installed in share/sahara will now be " -"installed into etc/sahara instead." -msgstr "" -"Sample configuration files previously installed in share/Sahara will now be " -"installed into etc/Sahara instead." - -msgid "" -"Separate transport url can be used for notifications purposes now, to enable " -"this feature 'transport_url' should be provided in " -"'oslo_messaging_notifications' section." -msgstr "" -"Separate transport URL can be used for notifications purposes now, to enable " -"this feature 'transport_url' should be provided in " -"'oslo_messaging_notifications' section." - -msgid "Spark version 1.3.1 is deprecated." -msgstr "Spark version 1.3.1 is deprecated." - -msgid "Spark workers are found by fqdn" -msgstr "Spark workers are found by FQDN" - -msgid "Start using reno to manage release notes." -msgstr "Start using Reno to manage release notes." - -msgid "Starting Ambari clusters on Centos 7 is fixed." -msgstr "Starting Ambari clusters on Centos 7 is fixed." - -msgid "Storm 1.1.0 is supported in Storm plugin." -msgstr "Storm 1.1.0 is supported in Storm plugin." - -msgid "Storm version 0.9.2 is deprecated." -msgstr "Storm version 0.9.2 is deprecated." - -msgid "Support deploy hadoop 2.7.5 with vanilla plugin." -msgstr "Support deploy Hadoop 2.7.5 with vanilla plugin." - -msgid "Support deploy hadoop 2.8.2 with vanilla plugin." -msgstr "Support deploy Hadoop 2.8.2 with vanilla plugin." - -msgid "" -"Support for nova-network is removed, reflective of its removal from nova " -"itself and from python-novaclient. use_neutron=False is unsupported." -msgstr "" -"Support for Nova-Network is removed, reflective of its removal from Nova " -"itself and from python-novaclient. use_neutron=False is unsupported." - -msgid "Support of HDP 2.0.6 plugin was removed. Use Ambari plugin instead." -msgstr "Support of HDP 2.0.6 plugin was removed. Use Ambari plugin instead." - -msgid "" -"The 'enable' option of the 'oslo_messaging_notifications' section has been " -"removed. To enable notifications now please specify the 'driver' option in " -"the same section." -msgstr "" -"The 'enable' option of the 'oslo_messaging_notifications' section has been " -"removed. To enable notifications now please specify the 'driver' option in " -"the same section." - -msgid "" -"The HDP 2.0.6 plugin is deprecated in Mitaka release and will be removed in " -"Newton release. Please, use the Ambari 2.3 instead." -msgstr "" -"The HDP 2.0.6 plugin is deprecated in Mitaka release and will be removed in " -"Newton release. Please, use the Ambari 2.3 instead." - -msgid "" -"The URL of an S3 data source may have `s3://` or `s3a://`, equivalently." -msgstr "" -"The URL of an S3 data source may have `s3://` or `s3a://`, equivalently." - -msgid "" -"The `sahara-all` entry point is now deprecated. Please use the sahara-api " -"and sahara-engine entry points instead." -msgstr "" -"The `sahara-all` entry point is now deprecated. Please use the Sahara-API " -"and sahara-engine entry points instead." - -msgid "" -"The ability to force delete clusters is exposed in Sahara APIv2. The Heat " -"service must support Stack Abandon for force delete to function properly." -msgstr "" -"The ability to force delete clusters is exposed in Sahara APIv2. The Heat " -"service must support Stack Abandon for force delete to function properly." - -msgid "" -"The behavior of force deletion of clusters (APIv2) has changed. Stack-" -"abandon is no longer used. The response from the force-delete API call now " -"includes the name of the stack which had underlain that deleted cluster." -msgstr "" -"The behaviour of force deletion of clusters (APIv2) has changed. Stack-" -"abandon is no longer used. The response from the force-delete API call now " -"includes the name of the stack which had underlain that deleted cluster." - -msgid "" -"The custom admin_user_domain_name and admin_project_domain_name " -"configuration options have been removed; they are provided by " -"keystone_authtoken as user_domain_name and project_domain_name respectively." -msgstr "" -"The custom admin_user_domain_name and admin_project_domain_name " -"configuration options have been removed; they are provided by " -"keystone_authtoken as user_domain_name and project_domain_name respectively." - -msgid "" -"The experimental APIv2 supports simultaneous creation of multiple clusters " -"only through POST /v2/clusters (using the `count` parameter). The POST /v2/" -"clusters/multiple endpoint has been removed." -msgstr "" -"The experimental APIv2 supports simultaneous creation of multiple clusters " -"only through POST /v2/clusters (using the `count` parameter). The POST /v2/" -"clusters/multiple endpoint has been removed." - -msgid "" -"The following service versions were added to MapR 5.2.0 plugin - HBase 1.1 - " -"Drill 1.6 - Mahout 0.11 0.12 - Spark 1.6.1 - Impala 2.5" -msgstr "" -"The following service versions were added to MapR 5.2.0 plugin - HBase 1.1 - " -"Drill 1.6 - Mahout 0.11 0.12 - Spark 1.6.1 - Impala 2.5" - -msgid "" -"The following service versions were added to MapR 5.2.0 plugin - Pig 0.16 - " -"Spark 2.0.1 - Hue 3.10 - Drill 1.8, 1.9" -msgstr "" -"The following service versions were added to MapR 5.2.0 plugin - Pig 0.16 - " -"Spark 2.0.1 - Hue 3.10 - Drill 1.8, 1.9" - -msgid "The presence of project ID in Sahara APIv1 paths is now optional." -msgstr "The presence of project ID in Sahara APIv1 paths is now optional." - -msgid "" -"The use of [keystone_authtoken] credentials for trust creation is now " -"deprecated. Please use the new [trustee] config section. The options " -"``username``, ``password``, ``project_name``, ``user_domain_name``, " -"``project_domain_name``, and ``auth_url`` (with version) are obligatory " -"within that section." -msgstr "" -"The use of [keystone_authtoken] credentials for trust creation is now " -"deprecated. Please use the new [trustee] config section. The options " -"``username``, ``password``, ``project_name``, ``user_domain_name``, " -"``project_domain_name``, and ``auth_url`` (with version) are obligatory " -"within that section." - -msgid "" -"This feature allows the policy enforcement to be done in code thus " -"facilitating better maintenance of the policy file. In code the default " -"policies are set and the operator only needs to change the policy file if " -"they wish to override the rule or role for a specific policy or operation. " -"Also, a complete policy file can be generated using genconfig tool." -msgstr "" -"This feature allows the policy enforcement to be done in code thus " -"facilitating better maintenance of the policy file. In code the default " -"policies are set and the operator only needs to change the policy file if " -"they wish to override the rule or role for a specific policy or operation. " -"Also, a complete policy file can be generated using genconfig tool." - -msgid "This patch adds ability to work with swift by using Keystone API v3" -msgstr "This patch adds ability to work with swift by using Keystone API v3" - -msgid "Timeouts for ssh operations are configurable now" -msgstr "Timeouts for SSH operations are configurable now" - -msgid "Upgrade Notes" -msgstr "Upgrade Notes" - -msgid "" -"Use a new keypair to access to the running cluster when the cluster's " -"keypair is deleted." -msgstr "" -"Use a new keypair to access to the running cluster when the cluster's " -"keypair is deleted." - -msgid "Version 5.5.0 of Cloudera plugin is deprecated." -msgstr "Version 5.5.0 of Cloudera plugin is deprecated." - -msgid "" -"Versions 5, 5.3.0, 5.4.0 of Cloudera plugin are deprecated. It is no longer " -"maintainted and supposed to be removed in P release." -msgstr "" -"Versions 5, 5.3.0, 5.4.0 of Cloudera plugin are deprecated. It is no longer " -"maintained and supposed to be removed in P release." - -msgid "Versions 5.0.0 5.3.0 and 5.4.0 of Cloudera plugin are removed." -msgstr "Versions 5.0.0 5.3.0 and 5.4.0 of Cloudera plugin are removed." - -msgid "Versions 5.5.0 and 5.7.0 of Cloudera plugin are declared as stable." -msgstr "Versions 5.5.0 and 5.7.0 of Cloudera plugin are declared as stable." - -msgid "Wait condition feature can be disabled by the option." -msgstr "Wait condition feature can be disabled by the option." - -msgid "" -"We are assuring that ironic support was tested after latest updates to nova " -"and sahara and it is fully functional." -msgstr "" -"We are assuring that Ironic support was tested after latest updates to Nova " -"and Sahara and it is fully functional." - -msgid "We are deprecating CDH 5.7.0, Spark 1.6.0 and 2.1 and Storm 1.0.1." -msgstr "We are deprecating CDH 5.7.0, Spark 1.6.0 and 2.1 and Storm 1.0.1." - -msgid "" -"We are removing some plugins versions. Those are CDH 5.5.0, MapR 5.1.0, " -"Spark 1.3.1 and Storm 0.9.2." -msgstr "" -"We are removing some plugins versions. Those are CDH 5.5.0, MapR 5.1.0, " -"Spark 1.3.1 and Storm 0.9.2." - -msgid "" -"migration from keystoneclient to keystoneauth is done for using auth " -"features of keystone." -msgstr "" -"migration from keystoneclient to keystoneauth is done for using auth " -"features of Keystone." diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po sahara-12.0.0/releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po --- sahara-12.0.0~b3~git2020041014.0825bdde/releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,63 +0,0 @@ -# Gérald LONLAS , 2016. #zanata -msgid "" -msgstr "" -"Project-Id-Version: sahara\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-08-09 19:13+0000\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2016-10-22 06:34+0000\n" -"Last-Translator: Gérald LONLAS \n" -"Language-Team: French\n" -"Language: fr\n" -"X-Generator: Zanata 4.3.3\n" -"Plural-Forms: nplurals=2; plural=(n > 1)\n" - -msgid "3.0.1" -msgstr "3.0.1" - -msgid "4.0.0" -msgstr "4.0.0" - -msgid "4.0.1" -msgstr "4.0.1" - -msgid "4.1.0" -msgstr "4.1.0" - -msgid "5.0.0" -msgstr "5.0.0" - -msgid "Bug Fixes" -msgstr "Corrections de bugs" - -msgid "Current Series Release Notes" -msgstr "Note de la release actuelle" - -msgid "Deprecation Notes" -msgstr "Notes dépréciées " - -msgid "Known Issues" -msgstr "Problèmes connus" - -msgid "Liberty Series Release Notes" -msgstr "Note de release pour Liberty" - -msgid "Mitaka Series Release Notes" -msgstr "Note de release pour Mitaka" - -msgid "New Features" -msgstr "Nouvelles fonctionnalités" - -msgid "Newton Series Release Notes" -msgstr "Note de release pour Newton" - -msgid "Other Notes" -msgstr "Autres notes" - -msgid "Sahara Release Notes" -msgstr "Note de release de Sahara" - -msgid "Upgrade Notes" -msgstr "Notes de mises à jours" diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/releasenotes/source/locale/it/LC_MESSAGES/releasenotes.po sahara-12.0.0/releasenotes/source/locale/it/LC_MESSAGES/releasenotes.po --- sahara-12.0.0~b3~git2020041014.0825bdde/releasenotes/source/locale/it/LC_MESSAGES/releasenotes.po 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/releasenotes/source/locale/it/LC_MESSAGES/releasenotes.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,537 +0,0 @@ -# Luigi Toscano , 2018. #zanata -# Luigi Toscano , 2019. #zanata -msgid "" -msgstr "" -"Project-Id-Version: sahara\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-07-02 08:55+0000\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2019-07-02 10:35+0000\n" -"Last-Translator: Luigi Toscano \n" -"Language-Team: Italian\n" -"Language: it\n" -"X-Generator: Zanata 4.3.3\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -msgid "10.0.0" -msgstr "10.0.0" - -msgid "3.0.1" -msgstr "3.0.1" - -msgid "4.0.0" -msgstr "4.0.0" - -msgid "4.0.1" -msgstr "4.0.1" - -msgid "4.1.0" -msgstr "4.1.0" - -msgid "5.0.0" -msgstr "5.0.0" - -msgid "6.0.0" -msgstr "6.0.0" - -msgid "7.0.0" -msgstr "7.0.0" - -msgid "7.0.3" -msgstr "7.0.3" - -msgid "8.0.0" -msgstr "8.0.0" - -msgid "8.0.1" -msgstr "8.0.1" - -msgid "8.0.2" -msgstr "8.0.2" - -msgid "8.0.2-13" -msgstr "8.0.2-13" - -msgid "9.0.0" -msgstr "9.0.0" - -msgid "9.0.1" -msgstr "9.0.1" - -msgid "9.0.1-8" -msgstr "9.0.1-8" - -msgid "" -"A few responses in the experimental (but nearly-stable) APIv2 have been " -"tweaked. To be specific, the key `hadoop_version` has been replaced with " -"`plugin_version`, the key `job` has been replaced with `job_template`, the " -"key `job_execution` has been replaced with `job`, and the key `oozie_job_id` " -"has been replaced with `engine_job_id`. In fact, these changes were all " -"previously partially implemented, and are now completely implemented." -msgstr "" -"Alcune risposte delle APIv2 - sperimentali, ma quasi stabili - sono state " -"rifinite. In particolare la chiave `hadoop_version` è stata sostituita da " -"`plugin_version`, la chiave `job` è stata sostituita da `job_template`, la " -"chiave `job_execution` è stata sostituita da `job`, e la chiave " -"`oozie_job_id` è stata sostituita da `engine_job_ide`. In effetti questi " -"cambiamenti erano già stati tutti parzialmente implementati, ed ora lo sono " -"totalmente." - -msgid "Add Kafka to MapR plugin" -msgstr "Aggiunto Kafka al plugin MapR" - -msgid "Add Sentry to MapR plugin" -msgstr "Aggiunto Sentry al plugin MapR" - -msgid "Add ability of scheduling EDP jobs for sahara" -msgstr "Aggiunta la capacità di pianificare job EDP in sahara" - -msgid "" -"Add ability to automaticaly generate better configurations for Ambari " -"cluster by using 'ALWAYS_APPLY' strategy" -msgstr "" -"Aggiunta la capacità di generare automaticamente configurazioni migliori per " -"cluster Ambari usando a strategia 'ALWAYS_APPLY'" - -msgid "Add impala 2.2 to MapR plugin" -msgstr "Aggiunto Impala 2.2 al plugin MapR" - -msgid "" -"Add regular expression matching on search values for certain string fields " -"of sahara objects. This applies to list operations through the REST API and " -"therefore applies to the dashboard and sahara client as well. Closes bug " -"1503345." -msgstr "" -"Aggiunta la corrispendenza in base ad un'espressione regolare per i valori " -"di ricerca su determinati campi degli oggetti di sahara. Questo si applica " -"alle operazioni di elenco (list) in tutte le API REST e si applica quindi " -"anche alla dashboard ed a saharaclient. Chiude il bug 1503345." - -msgid "Added additional filter to volume_type check, closed bug 1508017" -msgstr "" -"Aggiunto un ulteriore filtro al controllo volume_type, chiudendo il bug " -"1508017" - -msgid "Added event log for HDP plugin" -msgstr "Aggiunto il registro degli eventi per il plugin HDP" - -msgid "" -"Added integration of Designate for hostname resolution through dns servers" -msgstr "" -"Aggiunta l'integrazione con Designate per la risoluzione dei nomi degli host " -"tramite server DNS" - -msgid "Added new tool ``sahara-status upgrade check``." -msgstr "Aggiunto il nuovo strumento ``sahara-status upgrade check``." - -msgid "Added rack awareness feature for CDH 5.5 and CDH 5.7" -msgstr "Aggiunta la funzionalità di conoscenza del rack per CDH 5.5 e CDH 5.7" - -msgid "Added rack awareness feature for HDP plugin" -msgstr "Aggiunta la funzionalità di conoscenza del rack per il plugin HDP" - -msgid "" -"Added support of running sahara-api as wsgi application. Use 'sahara-wsgi-" -"api' command for use this feature." -msgstr "" -"Aggiunto il supporto per eseguire sahara-api come applicazione wsgi. La " -"nuova funzione si può usare tramite il comando 'sahara-wsgi-api'." - -msgid "Adding Spark 2.3 to supported plugins list." -msgstr "Aggiunto Spark 2.3 all'elenco dei plugin supportati." - -msgid "Adding Spark version 2.2 to Sahara." -msgstr "Aggiunto Spark versione 2.2 a Sahara." - -msgid "" -"Adding ability to create and validate MapR 5.2.0 images using the new image " -"gen tool." -msgstr "" -"Aggiunta la capacità di creare e validare immagini MapR 5.2.0 usando il " -"nuovo strumento di generazione delle immagini." - -msgid "" -"Adding new versions of Storm, 1.2.0 and 1.2.1. Both will exist under the " -"same tag 1.2." -msgstr "" -"Aggiunte nuove versioni di Storm, 1.2.0 e 1.2.1. Entrambe sono disponibili " -"tramite lo stesso tag 1.2." - -msgid "Adding support to CDH 5.13.0 in CDH plugin." -msgstr "Aggiunto il supporto per CDH 5.13.0 nel plugin CDH." - -msgid "" -"Adding the ability to boot a Sahara cluster from volumes instead of images." -msgstr "" -"Aggiunta la capacità di effettuare il boot di un cluster Sahara da volumi " -"invece che da immagini." - -msgid "" -"Adding the ability to change default timeout parameter for ambari agent " -"package installation" -msgstr "" -"Aggiunta la capacità di cambiare il parametro predefinito di timeout per " -"l'installazione del pacchetto dell'agente Ambari" - -msgid "Adding the ability to create Ambari 2.6 images on sahara-image-pack" -msgstr "Aggiunta a sahara-image-pack la capacità di creare immagini Ambari 2.6" - -msgid "" -"After decommissioning hosts all assoicated configs groups will be removed in " -"ambari plugin." -msgstr "" -"Dopo la dismissione di un host, tutti i gruppi di configurazione associati " -"saranno rimossi dal plugin Ambari" - -msgid "" -"An EDP data source may reference a file stored in a S3-like object store." -msgstr "" -"Una fonte dati EDP può fare riferimento ad un file memorizzato in un gestore " -"di oggetti con interfaccia S3." - -msgid "Bug Fixes" -msgstr "Correzione di bug" - -msgid "CDH 5.11.0 is supported in CDH plugin." -msgstr "CDH 5.11.0 è supportato nel plugin CDH." - -msgid "CDH 5.5.0 is supported in CDH plugin." -msgstr "CDH 5.5.0 è supportato nel plugin CDH." - -msgid "CDH 5.7 is supported in CDH plugin." -msgstr "CDH 5.7 è supportato nel plugin CDH." - -msgid "CDH 5.9.0 is supported in CDH plugin." -msgstr "CDH 5.9.0 è supportato nel plugin CDH." - -msgid "" -"Cluster with 'is_protected' field can be created now, closed bug 1510929" -msgstr "" -"Adesso possono essere creati dei cluster con il campo 'is_protected', " -"chiudendo il bug 1510929" - -msgid "" -"Convert to cluster template feature is no longer supported by all plugins." -msgstr "" -"La funzionalità di conversione in un modello di cluster non è più supportata " -"da tutti i plugin." - -msgid "Correctly configure Spark with Hive and HBase on different nodes." -msgstr "Configura correttamente Spark con Hive e HBase su nodi diversi." - -msgid "Current Series Release Notes" -msgstr "Note di rilascio per la serie attuale" - -msgid "Custom health check is added to MapR plugin" -msgstr "" -"Il controllo personalizzato dello stato di salute è stato aggiunto al plugin " -"MapR" - -msgid "Deprecation Notes" -msgstr "Note relative alle deprecazioni" - -msgid "" -"Enables the creation and validation of Ambari 2.4 images using the new image " -"generation process where libguestfs replaces the use of DIB." -msgstr "" -"Permette la creazione e la validazione di immagini Ambari 2.4 usando il " -"nuovo processo di generazione delle immagini in cui libguestfs sostituisce " -"l'uso di DIB." - -msgid "" -"Enables the creation and validation of CDH 5.11.0 images using the new image " -"generation process where libguestfs replaces the use of DIB." -msgstr "" -"Permette la creazione e la validazione di immagini CDH 5.11.0 usando il " -"nuovo processo di generazione delle immagini in cui libguestfs sostituisce " -"l'uso di DIB." - -msgid "" -"Enables the creation and validation of CDH 5.7.0 images using the new image " -"generation process where libguestfs replaces the use of DIB." -msgstr "" -"Permette la creazione e la validazione di immagini CDH 5.7.0 usando il nuovo " -"processo di generazione delle immagini in cui libguestfs sostituisce l'uso " -"di DIB." - -msgid "" -"Enables the creation and validation of CDH 5.9.0 images using the new image " -"generation process where libguestfs replaces the use of DIB." -msgstr "" -"Permette la creazione e la validazione di immagini CDH 5.9.0 usando il nuovo " -"processo di generazione delle immagini in cui libguestfs sostituisce l'uso " -"di DIB." - -msgid "Fix Hue intergation with Spark and Hive on different nodes" -msgstr "Corretta l'integrazione di Hue con Spark e Hive su nodi diversi" - -msgid "Fix creating Hive database schema automatically." -msgstr "Corretta la creazione automatica di schemi di database di Hive" - -msgid "Fix unavailable MCS link." -msgstr "Corretto il collegamento MCS non disponibile" - -msgid "Fix visualization of MapR versions when running on python 3" -msgstr "" -"Corretta la visualizzazione delle versioni di MapR quando viene usato python " -"3" - -msgid "Fixed api_insecure handling in sessions. Closed bug 1539498." -msgstr "" -"Corretta la gestione di api_insecure nelle sessioni. Risolve il bug 1539498." - -msgid "Fixed arguments list in latest cdh plugin" -msgstr "Corretto l'elenco degli argomenti nel plugin CDH più recente" - -msgid "Fixed client tempest tests" -msgstr "Corretti i test tempest per il client" - -msgid "Fixed issues with using Swift as an output datasource." -msgstr "Corretti alcuni problemi quando si usa Swift come fonte dati d'uscita." - -msgid "Fixed launching Hive jobs in Ambari plugin." -msgstr "Corretta l'esecuzione di job Hive nel plugin Ambari." - -msgid "Kafka was added in CDH 5.5 and CDH 5.7" -msgstr "Kafka è stato aggiunto a CDH 5.5 e CDH 5.7" - -msgid "Known Issues" -msgstr "Problemi noti" - -msgid "Liberty Series Release Notes" -msgstr "Note di rilascio per la serie Liberty" - -msgid "MaR 5.2.0 is supported in MapR plugin." -msgstr "MapR 5.2.0 è supportato nel plugin MapR" - -msgid "MapR 5.1.0.mrv2 is now Enabled." -msgstr "MapR 5.1.0.mrv2 è ora abilitato." - -msgid "" -"MapR repositories now can be configured in general section of cluster " -"template configs" -msgstr "" -"I repository MapR possono essere configurati nella sezione generale della " -"configurazione dei template di cluster." - -msgid "Migration from novaclient.v2.images to glanceclient" -msgstr "Migrazione da novaclient.v2.images a glanceclient" - -msgid "Mitaka Series Release Notes" -msgstr "Note di rilascio per la serie Mitaka" - -msgid "Move notifications options into oslo_messaging_notifications" -msgstr "Opzioni delle notifiche spostate in oslo_messaging_notifications" - -msgid "" -"Neutron is used by default now (use_neutron=True). Nova-network is not " -"functionaly for most use cases starting from Ocata." -msgstr "" -"Neutron viene ora usato in modo predefinito (use_neutron=True). Nova-network " -"non funziona per la maggior parte dei casi d'uso a partire da Ocata." - -msgid "New Features" -msgstr "Nuove funzionalità" - -msgid "" -"New framework for ``sahara-status upgrade check`` command is added. This " -"framework allows adding various checks which can be run before a Sahara " -"upgrade to ensure if the upgrade can be performed safely." -msgstr "" -"È stata aggiunta una nuova infrastruttura per supportare il comando ``sahara-" -"status upgrade check``. Questa infrastruttura permette l'aggiunta di vari " -"controlli che possono essere eseguiti prima di un aggiornamento di Sahara " -"per assicurarsi che l'aggiornamento possa essere eseguito in sicurezza." - -msgid "Newton Series Release Notes" -msgstr "Note di rilascio per la serie Newton" - -msgid "Ocata Series Release Notes" -msgstr "Note di rilascio per la serie Ocata" - -msgid "Open ports for Kafka in Ambari plugin, closed bug 1512661" -msgstr "Apertura delle porte per Kafka nel plugin Ambari, bug 1512661 chiuso" - -msgid "" -"Operator can now use new CLI tool ``sahara-status upgrade check`` to check " -"if Sahara deployment can be safely upgraded from N-1 to N release." -msgstr "" -"Gli operatori possono usare il nuovo strumento a riga di comando ``sahara-" -"status upgrade check`` per verificare che l'intallazione di Sahara può " -"essere aggiornata in sicurezza dalla versione N-1 alla N." - -msgid "Other Notes" -msgstr "Altre note" - -msgid "Pike Series Release Notes" -msgstr "Note di rilascio per la serie Pike" - -msgid "Prelude" -msgstr "Preludio" - -msgid "Queens Series Release Notes" -msgstr "Note di rilascio per la serie Queens" - -msgid "" -"Remove Impala 1.4.1, HBase 0.98.9, Hive 1.0, Hue 3.7 support in MapR 5.1.0 " -"plugin" -msgstr "" -"Rimozione del supporto di Impala 1.4.1, HBase 0.98.9, Hive 1.0, Hue 3.7 dal " -"plugin MapR 5.1.0." - -msgid "Removed support for the MapR 5.0.0 plugin." -msgstr "Rimosso il supporto per il plugin MapR 5.0.0." - -msgid "Removed support for the Spark 1.0.0 plugin." -msgstr "Rimosso il supporto per il plugin Spark 1.0.0." - -msgid "Removed support of Vanilla 2.6.0 plugin." -msgstr "Rimosso il supporto per il plugin Vanilla 2.6.0." - -msgid "Removed unneeded volume serialization" -msgstr "Rimossa la serializzazione non necessaria dei volumi" - -msgid "Rocky Series Release Notes" -msgstr "Note di rilascio per la serie Queens" - -msgid "Sahara Release Notes" -msgstr "Note di rilascio di Sahara" - -msgid "Sahara's APIv2 is now considered stable, and no longer experimental." -msgstr "L'APIv2 di Sahara è ora considerata stabile e non più sperimentale." - -msgid "" -"Sample configuration files previously installed in share/sahara will now be " -"installed into etc/sahara instead." -msgstr "" -"I file di configurazione di Sahara installati in precedenza in share/sahara " -"saranno installati invece in etc/sahara." - -msgid "Spark version 1.3.1 is deprecated." -msgstr "La versione 1.3.1 di Spark è deprecata." - -msgid "Spark workers are found by fqdn" -msgstr "I nodi worker di Spark sono individuati tramite FQDN" - -msgid "Start using reno to manage release notes." -msgstr "Inizio dell'uso di reno per gestire le note di rilascio." - -msgid "Starting Ambari clusters on Centos 7 is fixed." -msgstr "L'avvio di cluster Ambari su CentOS 7 è stato corretto." - -msgid "Stein Series Release Notes" -msgstr "Note di rilascio per la serie Stein" - -msgid "Storm 1.1.0 is supported in Storm plugin." -msgstr "Storm 1.1.0 è supportato dal plugin Storm." - -msgid "Support deploy hadoop 2.7.5 with vanilla plugin." -msgstr "" -"Supporto per la creazione di cluster con hadoop 2.7.5 nel plugin vanilla" - -msgid "Support deploy hadoop 2.8.2 with vanilla plugin." -msgstr "" -"Supporto per la creazione di cluster con hadoop 2.8.2 nel plugin vanilla" - -msgid "" -"Support for nova-network is removed, reflective of its removal from nova " -"itself and from python-novaclient. use_neutron=False is unsupported." -msgstr "" -"Il supporto a nova-network è stato rimosso a seguito della sua rimozione da " -"nova stesso e da python-novaclient. use_neutron=False non è più supportato." - -msgid "Support of HDP 2.0.6 plugin was removed. Use Ambari plugin instead." -msgstr "" -"È stato rimosso il supporto per il plugin HDP 2.0.6. Al suo posto va usato " -"il plugin Ambari." - -msgid "" -"The URL of an S3 data source may have `s3://` or `s3a://`, equivalently." -msgstr "" -"L'URL di una fonte dati S3 può contenere `s3://` o `s3a://`; sono " -"equivalenti." - -msgid "" -"The ability to force delete clusters is exposed in Sahara APIv2. The Heat " -"service must support Stack Abandon for force delete to function properly." -msgstr "" -"La possibilità di eliminare forzatamente i cluster è stata resa disponibile " -"nell'APIv2 di Sahara. Il servizio Heat deve supportare la funzione di " -"abbandono dello stack (Stack Abandon) affinché la rimozione forzata funzioni " -"correttamente." - -msgid "" -"The behavior of force deletion of clusters (APIv2) has changed. Stack-" -"abandon is no longer used. The response from the force-delete API call now " -"includes the name of the stack which had underlain that deleted cluster." -msgstr "" -"Il comportamento della rimozione forzata dei cluster (APIv2) è cambiato. La " -"funzione di abbandono dei cluster non è più usata. La risposta alla chiamata " -"dell'API force-delete adesso include il nome dello stack che era alla base " -"del cluster eliminato." - -msgid "" -"The experimental APIv2 supports simultaneous creation of multiple clusters " -"only through POST /v2/clusters (using the `count` parameter). The POST /v2/" -"clusters/multiple endpoint has been removed." -msgstr "" -"APIv2, la versione sperimentale delle API, supporta la creazione simultanea " -"di più cluster esclusivamente tramite POST /v2/clusters (usando il parametro " -"`count`). L'endpoint POST /v2/clusters/multiple endpoint è stato rimosso." - -msgid "" -"The following service versions were added to MapR 5.2.0 plugin - HBase 1.1 - " -"Drill 1.6 - Mahout 0.11 0.12 - Spark 1.6.1 - Impala 2.5" -msgstr "" -"Sono stati aggiunte le seguenti versioni di servizi al plugin MapR 5.2.0 - " -"HBase 1.1 - Drill 1.6 - Mahout 0.11 0.12 - Spark 1.6.1 - Impala 2.5" - -msgid "" -"The following service versions were added to MapR 5.2.0 plugin - Pig 0.16 - " -"Spark 2.0.1 - Hue 3.10 - Drill 1.8, 1.9" -msgstr "" -"Sono stati aggiunte le seguenti versioni di servizi al plugin MapR 5.2.0 - " -"Pig 0.16 - Spark 2.0.1 - Hue 3.10 - Drill 1.8, 1.9" - -msgid "The presence of project ID in Sahara APIv1 paths is now optional." -msgstr "" -"La presenza dell'ID del progetto nei percorsi della APIv1 di Sahara è ora " -"opzionale." - -msgid "This patch adds ability to work with swift by using Keystone API v3" -msgstr "Questa patch permette di usare swift usando l'API v3 di Keystone" - -msgid "Upgrade Notes" -msgstr "Note di aggiornamento" - -msgid "" -"Users of Sahara's APIv2 may request a microversion of that API, with " -"\"OpenStack-API-Version: data-processing [version]\" in the request headers." -msgstr "" -"Gli utenti dell'APIv2 di Sahara possono richiedere una specifica " -"microversione dell'API tramite \"OpenStack-API-Version: data-processing " -"[versione]\" nelle intestazioni della richiesta." - -msgid "Versions 5.0.0 5.3.0 and 5.4.0 of Cloudera plugin are removed." -msgstr "" -"Le versioni 5.0.0, 5.3.0 e 5.4.0 del plugin Cloudera sono state rimosse." - -msgid "Versions 5.5.0 and 5.7.0 of Cloudera plugin are declared as stable." -msgstr "" -"Le versioni 5.5.0 e 5.7.0 del plugin Cloudera sono state dichiarate stabili." - -msgid "" -"We are removing some plugins versions. Those are CDH 5.5.0, MapR 5.1.0, " -"Spark 1.3.1 and Storm 0.9.2." -msgstr "" -"Abbiamo rimosso alcune versioni di plugin. Si tratta di CDH 5.5.0, MapR " -"5.1.0, Spark 1.3.1 e Storm 0.9.2." - -msgid "" -"migration from keystoneclient to keystoneauth is done for using auth " -"features of keystone." -msgstr "" -"la migrazione da keystoneclient a keystoneauth è stata effettuata per usare " -"le funzionalità di autenticazione di keystone." diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/requirements.txt sahara-12.0.0/requirements.txt --- sahara-12.0.0~b3~git2020041014.0825bdde/requirements.txt 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/requirements.txt 2020-05-13 11:03:54.000000000 +0000 @@ -5,7 +5,6 @@ pbr!=2.1.0,>=2.0.0 # Apache-2.0 alembic>=0.8.10 # MIT -Babel!=2.4.0,>=2.3.4 # BSD botocore>=1.5.1 # Apache-2.0 castellan>=0.16.0 # Apache-2.0 eventlet!=0.18.3,!=0.20.1,>=0.18.2 # MIT diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/locale/de/LC_MESSAGES/sahara.po sahara-12.0.0/sahara/locale/de/LC_MESSAGES/sahara.po --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/locale/de/LC_MESSAGES/sahara.po 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/locale/de/LC_MESSAGES/sahara.po 2020-05-13 11:03:54.000000000 +0000 @@ -8,16 +8,17 @@ # Robert Simai, 2014 # Andreas Jaeger , 2016. #zanata # Frank Kloeker , 2018. #zanata +# Andreas Jaeger , 2020. #zanata msgid "" msgstr "" "Project-Id-Version: sahara VERSION\n" "Report-Msgid-Bugs-To: https://bugs.launchpad.net/openstack-i18n/\n" -"POT-Creation-Date: 2019-03-21 18:56+0000\n" +"POT-Creation-Date: 2020-04-23 21:26+0000\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"PO-Revision-Date: 2018-03-06 07:48+0000\n" -"Last-Translator: Copied by Zanata \n" +"PO-Revision-Date: 2020-04-25 10:36+0000\n" +"Last-Translator: Andreas Jaeger \n" "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "Generated-By: Babel 2.0\n" @@ -562,6 +563,9 @@ msgid "Failed to perform Oozie request" msgstr "Oozie-Anfrage konnte nicht ausgeführt werden" +msgid "Failed to suspend job execution {jid}" +msgstr "Die Ausführung des Jobs konnte nicht angehalten werden {jid}" + #, python-format msgid "Feature '%s' is not implemented" msgstr "Feature '%s' ist nicht implementiert" @@ -1138,6 +1142,9 @@ msgid "Response {response} is not unique for this query {query}." msgstr "Antwort {response} ist nicht eindeutig für diese Abfrage {query}." +msgid "S3 url must not be empty" +msgstr "S3 URL darf nicht leer sein" + #, python-format msgid "Sahara doesn't contain plugin with name '%s'" msgstr "Sahara enthält kein Plugin mit dem Namen '%s'" @@ -1255,6 +1262,13 @@ msgid "The configuration has failed" msgstr "Die Konfiguration ist fehlgeschlagen" +msgid "" +"The filesystem to mount as the root volume on the image. No value is " +"required if only one filesystem is detected." +msgstr "" +"Das Dateisystem, das als Root-Volume im Abbild bereitgestellt werden soll. " +"Kein Wert wird benötigt, wenn nur ein Dateisystem gefunden wird." + msgid "The following argument names are reserved: {names}" msgstr "Die folgenden Argumentnamen sind reserviert: {names}" @@ -1317,6 +1331,9 @@ msgid "URL scheme must be 'maprfs'" msgstr "Das URL-Schema muss 'maprfs' lauten" +msgid "URL scheme must be 's3' or 's3a'" +msgstr "Das URL-Schema muss 's3' oder 's3a' sein" + msgid "URL scheme must be 'swift'" msgstr "Das URL-Schema muss 'swift' sein" diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/base.py sahara-12.0.0/sahara/tests/unit/base.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/base.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/base.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + from oslotest import base from sahara import context diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/cli/image_pack/test_image_pack_api.py sahara-12.0.0/sahara/tests/unit/cli/image_pack/test_image_pack_api.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/cli/image_pack/test_image_pack_api.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/cli/image_pack/test_image_pack_api.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock import sys guestfs = mock.Mock() diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/cli/test_sahara_cli.py sahara-12.0.0/sahara/tests/unit/cli/test_sahara_cli.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/cli/test_sahara_cli.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/cli/test_sahara_cli.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.cli import sahara_all from sahara.cli import sahara_api diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/conductor/manager/test_clusters.py sahara-12.0.0/sahara/tests/unit/conductor/manager/test_clusters.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/conductor/manager/test_clusters.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/conductor/manager/test_clusters.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,8 +14,8 @@ # limitations under the License. import copy +from unittest import mock -import mock from sqlalchemy import exc as sa_exc import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/conductor/manager/test_edp.py sahara-12.0.0/sahara/tests/unit/conductor/manager/test_edp.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/conductor/manager/test_edp.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/conductor/manager/test_edp.py 2020-05-13 11:03:54.000000000 +0000 @@ -15,8 +15,8 @@ import copy import datetime +from unittest import mock -import mock from sqlalchemy import exc as sa_exc import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/conductor/manager/test_templates.py sahara-12.0.0/sahara/tests/unit/conductor/manager/test_templates.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/conductor/manager/test_templates.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/conductor/manager/test_templates.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,8 +14,8 @@ # limitations under the License. import copy +from unittest import mock -import mock from oslo_utils import uuidutils import six from sqlalchemy import exc as sa_ex diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/db/migration/test_db_manage_cli.py sahara-12.0.0/sahara/tests/unit/db/migration/test_db_manage_cli.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/db/migration/test_db_manage_cli.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/db/migration/test_db_manage_cli.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,8 +14,8 @@ # under the License. import sys +from unittest import mock -import mock import testscenarios import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/db/sqlalchemy/test_types.py sahara-12.0.0/sahara/tests/unit/db/sqlalchemy/test_types.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/db/sqlalchemy/test_types.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/db/sqlalchemy/test_types.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock import sqlalchemy as sa import testtools +from unittest import mock from sahara.db.sqlalchemy import types diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/db/templates/test_update.py sahara-12.0.0/sahara/tests/unit/db/templates/test_update.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/db/templates/test_update.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/db/templates/test_update.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,9 +14,9 @@ import copy import tempfile +from unittest import mock import jsonschema -import mock from oslo_serialization import jsonutils as json from oslo_utils import uuidutils diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/db/test_utils.py sahara-12.0.0/sahara/tests/unit/db/test_utils.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/db/test_utils.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/db/test_utils.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock import testtools +from unittest import mock from sahara import context from sahara.db.sqlalchemy import api diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/plugins/test_images.py sahara-12.0.0/sahara/tests/unit/plugins/test_images.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/plugins/test_images.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/plugins/test_images.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils import yaml diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/plugins/test_kerberos.py sahara-12.0.0/sahara/tests/unit/plugins/test_kerberos.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/plugins/test_kerberos.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/plugins/test_kerberos.py 2020-05-13 11:03:54.000000000 +0000 @@ -11,7 +11,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara import context from sahara.plugins import kerberos as krb diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/plugins/test_labels.py sahara-12.0.0/sahara/tests/unit/plugins/test_labels.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/plugins/test_labels.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/plugins/test_labels.py 2020-05-13 11:03:54.000000000 +0000 @@ -12,8 +12,8 @@ # limitations under the License. import jsonschema.exceptions as json_exc -import mock import testtools +from unittest import mock from sahara import conductor as cond from sahara import context diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/plugins/test_provide_recommendations.py sahara-12.0.0/sahara/tests/unit/plugins/test_provide_recommendations.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/plugins/test_provide_recommendations.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/plugins/test_provide_recommendations.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + import six from sahara import conductor as cond diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/plugins/test_utils.py sahara-12.0.0/sahara/tests/unit/plugins/test_utils.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/plugins/test_utils.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/plugins/test_utils.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.plugins import exceptions as ex from sahara.plugins import utils as pu diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/api/test_v10.py sahara-12.0.0/sahara/tests/unit/service/api/test_v10.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/api/test_v10.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/api/test_v10.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + import oslo_messaging import six import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/api/v2/test_clusters.py sahara-12.0.0/sahara/tests/unit/service/api/v2/test_clusters.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/api/v2/test_clusters.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/api/v2/test_clusters.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + import oslo_messaging import six import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/api/v2/test_images.py sahara-12.0.0/sahara/tests/unit/service/api/v2/test_images.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/api/v2/test_images.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/api/v2/test_images.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.service.api.v2 import images from sahara.tests.unit import base diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/binary_retrievers/test_dispatch.py sahara-12.0.0/sahara/tests/unit/service/edp/binary_retrievers/test_dispatch.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/binary_retrievers/test_dispatch.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/binary_retrievers/test_dispatch.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.service.edp.binary_retrievers import dispatch from sahara.tests.unit import base diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/binary_retrievers/test_internal_swift.py sahara-12.0.0/sahara/tests/unit/service/edp/binary_retrievers/test_internal_swift.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/binary_retrievers/test_internal_swift.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/binary_retrievers/test_internal_swift.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock import sahara.exceptions as ex from sahara.service.castellan import config as castellan diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/binary_retrievers/test_manila.py sahara-12.0.0/sahara/tests/unit/service/edp/binary_retrievers/test_manila.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/binary_retrievers/test_manila.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/binary_retrievers/test_manila.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock import sahara.service.edp.binary_retrievers.manila_share as ms from sahara.tests.unit import base diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/data_sources/base_test.py sahara-12.0.0/sahara/tests/unit/service/edp/data_sources/base_test.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/data_sources/base_test.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/data_sources/base_test.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils from sahara.service.edp.data_sources.base import DataSourceType diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/data_sources/hdfs/test_hdfs_type.py sahara-12.0.0/sahara/tests/unit/service/edp/data_sources/hdfs/test_hdfs_type.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/data_sources/hdfs/test_hdfs_type.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/data_sources/hdfs/test_hdfs_type.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock import testtools +from unittest import mock import sahara.exceptions as ex from sahara.service.edp.data_sources.hdfs.implementation import HDFSType diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/data_sources/manila/test_manila_type.py sahara-12.0.0/sahara/tests/unit/service/edp/data_sources/manila/test_manila_type.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/data_sources/manila/test_manila_type.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/data_sources/manila/test_manila_type.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/data_sources/s3/test_s3_type.py sahara-12.0.0/sahara/tests/unit/service/edp/data_sources/s3/test_s3_type.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/data_sources/s3/test_s3_type.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/data_sources/s3/test_s3_type.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock import testtools +from unittest import mock import sahara.exceptions as ex from sahara.service.edp.data_sources.s3.implementation import S3Type diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/data_sources/swift/test_swift_type.py sahara-12.0.0/sahara/tests/unit/service/edp/data_sources/swift/test_swift_type.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/data_sources/swift/test_swift_type.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/data_sources/swift/test_swift_type.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,8 +14,8 @@ # limitations under the License. import copy +from unittest import mock -import mock from oslo_utils import uuidutils import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/edp_test_utils.py sahara-12.0.0/sahara/tests/unit/service/edp/edp_test_utils.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/edp_test_utils.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/edp_test_utils.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,7 +14,8 @@ # limitations under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils from sahara import conductor as cond diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/job_binaries/internal_db/test_internal_db_type.py sahara-12.0.0/sahara/tests/unit/service/edp/job_binaries/internal_db/test_internal_db_type.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/job_binaries/internal_db/test_internal_db_type.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/job_binaries/internal_db/test_internal_db_type.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/job_binaries/manila/test_manila_type.py sahara-12.0.0/sahara/tests/unit/service/edp/job_binaries/manila/test_manila_type.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/job_binaries/manila/test_manila_type.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/job_binaries/manila/test_manila_type.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/job_binaries/s3/test_s3_type.py sahara-12.0.0/sahara/tests/unit/service/edp/job_binaries/s3/test_s3_type.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/job_binaries/s3/test_s3_type.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/job_binaries/s3/test_s3_type.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock import testtools +from unittest import mock from sahara import exceptions as ex from sahara.service.edp.job_binaries.s3.implementation import S3Type diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/job_binaries/swift/test_swift_type.py sahara-12.0.0/sahara/tests/unit/service/edp/job_binaries/swift/test_swift_type.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/job_binaries/swift/test_swift_type.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/job_binaries/swift/test_swift_type.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock import testtools +from unittest import mock import sahara.exceptions as ex from sahara.service.castellan import config as castellan diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/job_binaries/test_base.py sahara-12.0.0/sahara/tests/unit/service/edp/job_binaries/test_base.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/job_binaries/test_base.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/job_binaries/test_base.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.service.edp.job_binaries import base as jb_base from sahara.tests.unit import base diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/oozie/test_oozie.py sahara-12.0.0/sahara/tests/unit/service/edp/oozie/test_oozie.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/oozie/test_oozie.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/oozie/test_oozie.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara import context as ctx from sahara.plugins import base as pb diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/spark/base.py sahara-12.0.0/sahara/tests/unit/service/edp/spark/base.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/spark/base.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/spark/base.py 2020-05-13 11:03:54.000000000 +0000 @@ -15,8 +15,8 @@ # limitations under the License. import os +from unittest import mock -import mock import sahara.exceptions as ex from sahara.service.edp.job_utils import ds_manager diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/storm/test_storm.py sahara-12.0.0/sahara/tests/unit/service/edp/storm/test_storm.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/storm/test_storm.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/storm/test_storm.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,8 +14,8 @@ # limitations under the License. import os +from unittest import mock -import mock import sahara.exceptions as ex from sahara.service.edp.job_utils import ds_manager diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/test_hdfs_helper.py sahara-12.0.0/sahara/tests/unit/service/edp/test_hdfs_helper.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/test_hdfs_helper.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/test_hdfs_helper.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.plugins import exceptions as ex from sahara.service.edp import hdfs_helper as helper diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/test_job_manager.py sahara-12.0.0/sahara/tests/unit/service/edp/test_job_manager.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/test_job_manager.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/test_job_manager.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,9 +14,9 @@ # limitations under the License. import copy +from unittest import mock import xml.dom.minidom as xml -import mock import testtools from sahara import conductor as cond diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/test_job_utils.py sahara-12.0.0/sahara/tests/unit/service/edp/test_job_utils.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/test_job_utils.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/test_job_utils.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,7 +14,8 @@ # limitations under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/test_s3_common.py sahara-12.0.0/sahara/tests/unit/service/edp/test_s3_common.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/test_s3_common.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/test_s3_common.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,8 +14,8 @@ # limitations under the License. -import mock import testtools +from unittest import mock from sahara import exceptions as ex from sahara.service.edp import s3_common diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/utils/test_shares.py sahara-12.0.0/sahara/tests/unit/service/edp/utils/test_shares.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/edp/utils/test_shares.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/edp/utils/test_shares.py 2020-05-13 11:03:54.000000000 +0000 @@ -18,7 +18,8 @@ from manilaclient.common.apiclient import exceptions as manila_ex except ImportError: from manilaclient.openstack.common.apiclient import exceptions as manila_ex -import mock +from unittest import mock + from oslo_utils import uuidutils import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/health/test_verification_base.py sahara-12.0.0/sahara/tests/unit/service/health/test_verification_base.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/health/test_verification_base.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/health/test_verification_base.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,8 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + import six +import testtools from sahara import conductor from sahara import context @@ -56,6 +58,7 @@ cluster = self.api.cluster_create(ctx, test_api.SAMPLE_CLUSTER) return cluster + @testtools.skip("Story 2007450 - http://sqlalche.me/e/bhk3") @mock.patch('sahara.plugins.health_check_base.get_health_checks') def test_verification_start(self, get_health_checks): cluster = self._cluster_sample() @@ -99,6 +102,7 @@ message = message.split('\n')[0] self.assertEqual(expected_message, message) + @testtools.skip("Story 2007450 - http://sqlalche.me/e/bhk3") def test_conductor_crud_verifications(self): ctx = context.ctx() try: @@ -134,6 +138,7 @@ self.assertIsNone(self.api.cluster_verification_get(ctx, ver['id'])) + @testtools.skip("Story 2007450 - http://sqlalche.me/e/bhk3") def test_conductor_crud_health_checks(self): ctx = context.ctx() try: diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/heat/test_templates.py sahara-12.0.0/sahara/tests/unit/service/heat/test_templates.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/heat/test_templates.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/heat/test_templates.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.conductor import resource as r from sahara.service.heat import templates as h diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_coordinator.py sahara-12.0.0/sahara/tests/unit/service/test_coordinator.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_coordinator.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/test_coordinator.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.service import coordinator from sahara.tests.unit import base diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_engine.py sahara-12.0.0/sahara/tests/unit/service/test_engine.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_engine.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/test_engine.py 2020-05-13 11:03:54.000000000 +0000 @@ -15,7 +15,7 @@ from heatclient import exc as heat_exc -import mock +from unittest import mock from sahara.service import engine from sahara.service.heat import heat_engine diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_networks.py sahara-12.0.0/sahara/tests/unit/service/test_networks.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_networks.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/test_networks.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.service import networks from sahara.tests.unit import base diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_ntp_service.py sahara-12.0.0/sahara/tests/unit/service/test_ntp_service.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_ntp_service.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/test_ntp_service.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.service import ntp_service as ntp from sahara.tests.unit import base as test_base diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_ops.py sahara-12.0.0/sahara/tests/unit/service/test_ops.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_ops.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/test_ops.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.plugins import base as base_plugins from sahara.service import ops diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_periodic.py sahara-12.0.0/sahara/tests/unit/service/test_periodic.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_periodic.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/test_periodic.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,8 +14,8 @@ # limitations under the License. import datetime +from unittest import mock -import mock from oslo_utils import timeutils from sahara.conductor import manager diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_quotas.py sahara-12.0.0/sahara/tests/unit/service/test_quotas.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_quotas.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/test_quotas.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,7 +14,8 @@ # limitations under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_sessions.py sahara-12.0.0/sahara/tests/unit/service/test_sessions.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_sessions.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/test_sessions.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,8 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +from unittest import mock + from keystoneauth1 import session as keystone -import mock from sahara import exceptions as ex from sahara.service import sessions diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_trusts.py sahara-12.0.0/sahara/tests/unit/service/test_trusts.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_trusts.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/test_trusts.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.service import trusts from sahara.tests.unit import base diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_volumes.py sahara-12.0.0/sahara/tests/unit/service/test_volumes.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/test_volumes.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/test_volumes.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,9 +13,10 @@ # See the License for the specific language governing permissions and # limitations under the License. +from unittest import mock + from cinderclient.v2 import volumes as vol_v2 from cinderclient.v3 import volumes as vol_v3 -import mock from sahara import exceptions as ex from sahara.service import volumes diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/edp/test_data_source.py sahara-12.0.0/sahara/tests/unit/service/validation/edp/test_data_source.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/edp/test_data_source.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/validation/edp/test_data_source.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,7 +14,8 @@ # limitations under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/edp/test_job_binary_internal.py sahara-12.0.0/sahara/tests/unit/service/validation/edp/test_job_binary_internal.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/edp/test_job_binary_internal.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/validation/edp/test_job_binary_internal.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.service.api import v10 as api from sahara.service.validations.edp import job_binary_internal as jb diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/edp/test_job_binary.py sahara-12.0.0/sahara/tests/unit/service/validation/edp/test_job_binary.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/edp/test_job_binary.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/validation/edp/test_job_binary.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.service.api import v10 as api from sahara.service.validations.edp import job_binary as b diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/edp/test_job_executor.py sahara-12.0.0/sahara/tests/unit/service/validation/edp/test_job_executor.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/edp/test_job_executor.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/validation/edp/test_job_executor.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,8 +14,8 @@ # limitations under the License. import time +from unittest import mock -import mock from oslo_utils import timeutils from oslo_utils import uuidutils import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/edp/test_job_interface.py sahara-12.0.0/sahara/tests/unit/service/validation/edp/test_job_interface.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/edp/test_job_interface.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/validation/edp/test_job_interface.py 2020-05-13 11:03:54.000000000 +0000 @@ -15,8 +15,8 @@ import collections import itertools +from unittest import mock -import mock from sahara.service.validations.edp import job as j from sahara.service.validations.edp import job_execution_schema as j_e_schema diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/edp/test_job.py sahara-12.0.0/sahara/tests/unit/service/validation/edp/test_job.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/edp/test_job.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/validation/edp/test_job.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara import exceptions as ex from sahara.service.validations.edp import job as j diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_cluster_create_validation.py sahara-12.0.0/sahara/tests/unit/service/validation/test_cluster_create_validation.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_cluster_create_validation.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/validation/test_cluster_create_validation.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + import six import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_cluster_delete_validation.py sahara-12.0.0/sahara/tests/unit/service/validation/test_cluster_delete_validation.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_cluster_delete_validation.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/validation/test_cluster_delete_validation.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock import testtools +from unittest import mock from sahara import exceptions as ex from sahara.service import validation as v diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_cluster_scaling_validation.py sahara-12.0.0/sahara/tests/unit/service/validation/test_cluster_scaling_validation.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_cluster_scaling_validation.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/validation/test_cluster_scaling_validation.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + import six import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_cluster_template_create_validation.py sahara-12.0.0/sahara/tests/unit/service/validation/test_cluster_template_create_validation.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_cluster_template_create_validation.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/validation/test_cluster_template_create_validation.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,7 +14,8 @@ # limitations under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils from sahara.service.api import v10 as api diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_cluster_template_update_validation.py sahara-12.0.0/sahara/tests/unit/service/validation/test_cluster_template_update_validation.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_cluster_template_update_validation.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/validation/test_cluster_template_update_validation.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,8 +14,8 @@ # limitations under the License. import copy +from unittest import mock -import mock from sahara.service.api import v10 as api from sahara.service.validations import cluster_template_schema as ct_schema diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_cluster_update_validation.py sahara-12.0.0/sahara/tests/unit/service/validation/test_cluster_update_validation.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_cluster_update_validation.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/validation/test_cluster_update_validation.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,8 +14,8 @@ # limitations under the License. -import mock import testtools +from unittest import mock from sahara import exceptions as ex from sahara.service.api import v10 as api diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_ng_template_validation_create.py sahara-12.0.0/sahara/tests/unit/service/validation/test_ng_template_validation_create.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_ng_template_validation_create.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/validation/test_ng_template_validation_create.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.service.api import v10 as api from sahara.service.validations import node_group_template_schema as ngt_schema diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_share_validations.py sahara-12.0.0/sahara/tests/unit/service/validation/test_share_validations.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_share_validations.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/validation/test_share_validations.py 2020-05-13 11:03:54.000000000 +0000 @@ -17,7 +17,7 @@ from manilaclient.common.apiclient import exceptions as manila_ex except ImportError: from manilaclient.openstack.common.apiclient import exceptions as manila_ex -import mock +from unittest import mock from sahara.service.validations import shares from sahara.tests.unit.service.validation import utils as u diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_validation.py sahara-12.0.0/sahara/tests/unit/service/validation/test_validation.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/test_validation.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/validation/test_validation.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara import exceptions from sahara.service import validation diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/utils.py sahara-12.0.0/sahara/tests/unit/service/validation/utils.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/service/validation/utils.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/service/validation/utils.py 2020-05-13 11:03:54.000000000 +0000 @@ -15,8 +15,8 @@ import ast import re +from unittest import mock -import mock from neutronclient.common import exceptions as neutron_ex import novaclient.exceptions as nova_ex import six diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/swift/test_swift_helper.py sahara-12.0.0/sahara/tests/unit/swift/test_swift_helper.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/swift/test_swift_helper.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/swift/test_swift_helper.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.swift import swift_helper as h from sahara.tests.unit import base diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/swift/test_utils.py sahara-12.0.0/sahara/tests/unit/swift/test_utils.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/swift/test_utils.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/swift/test_utils.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.swift import utils from sahara.tests.unit import base as testbase diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/test_context.py sahara-12.0.0/sahara/tests/unit/test_context.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/test_context.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/test_context.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,9 +14,9 @@ # limitations under the License. import random +from unittest import mock import fixtures -import mock import six import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/test_main.py sahara-12.0.0/sahara/tests/unit/test_main.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/test_main.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/test_main.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock import testtools +from unittest import mock from sahara import context from sahara import main diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/topology/test_topology.py sahara-12.0.0/sahara/tests/unit/topology/test_topology.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/topology/test_topology.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/topology/test_topology.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,8 +14,8 @@ # limitations under the License. import tempfile +from unittest import mock -import mock from sahara.conductor import objects as o from sahara import context diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/notification/test_sender.py sahara-12.0.0/sahara/tests/unit/utils/notification/test_sender.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/notification/test_sender.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/utils/notification/test_sender.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara import context from sahara.tests.unit import base diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/openstack/test_base.py sahara-12.0.0/sahara/tests/unit/utils/openstack/test_base.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/openstack/test_base.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/utils/openstack/test_base.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,10 +14,11 @@ # limitations under the License. +from unittest import mock + from cinderclient import exceptions as cinder_exc from heatclient import exc as heat_exc from keystoneauth1 import exceptions as keystone_exc -import mock from neutronclient.common import exceptions as neutron_exc from novaclient import exceptions as nova_exc diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/openstack/test_heat.py sahara-12.0.0/sahara/tests/unit/utils/openstack/test_heat.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/openstack/test_heat.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/utils/openstack/test_heat.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock import testtools +from unittest import mock from sahara.utils.openstack import heat as heat_u diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/openstack/test_images.py sahara-12.0.0/sahara/tests/unit/utils/openstack/test_images.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/openstack/test_images.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/utils/openstack/test_images.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.tests.unit import base from sahara.utils.openstack import images as sahara_images diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/openstack/test_swift.py sahara-12.0.0/sahara/tests/unit/utils/openstack/test_swift.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/openstack/test_swift.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/utils/openstack/test_swift.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.tests.unit import base as testbase from sahara.utils.openstack import swift diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_api.py sahara-12.0.0/sahara/tests/unit/utils/test_api.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_api.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/utils/test_api.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,8 +14,8 @@ # limitations under the License. import copy +from unittest import mock -import mock import testtools from sahara.utils import api diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_cinder.py sahara-12.0.0/sahara/tests/unit/utils/test_cinder.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_cinder.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/utils/test_cinder.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,8 +14,9 @@ # See the License for the specific language governing permissions and # limitations under the License. +from unittest import mock + from keystoneauth1 import exceptions as keystone_exceptions -import mock from oslo_config import cfg from sahara import main diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_cluster_progress_ops.py sahara-12.0.0/sahara/tests/unit/utils/test_cluster_progress_ops.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_cluster_progress_ops.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/utils/test_cluster_progress_ops.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,7 +14,8 @@ # limitations under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils from sahara import conductor diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_cluster.py sahara-12.0.0/sahara/tests/unit/utils/test_cluster.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_cluster.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/utils/test_cluster.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara import conductor from sahara import context diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_edp.py sahara-12.0.0/sahara/tests/unit/utils/test_edp.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_edp.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/utils/test_edp.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock import testtools +from unittest import mock from sahara.utils import edp diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_general.py sahara-12.0.0/sahara/tests/unit/utils/test_general.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_general.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/utils/test_general.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.tests.unit import base from sahara.utils import general diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_heat.py sahara-12.0.0/sahara/tests/unit/utils/test_heat.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_heat.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/utils/test_heat.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,8 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock import testtools +from unittest import mock from sahara import exceptions as ex from sahara.utils.openstack import heat as h diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_neutron.py sahara-12.0.0/sahara/tests/unit/utils/test_neutron.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_neutron.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/utils/test_neutron.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara.tests.unit import base from sahara.utils.openstack import neutron as neutron_client diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_poll_utils.py sahara-12.0.0/sahara/tests/unit/utils/test_poll_utils.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_poll_utils.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/utils/test_poll_utils.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock + import six import testtools diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_proxy.py sahara-12.0.0/sahara/tests/unit/utils/test_proxy.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_proxy.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/utils/test_proxy.py 2020-05-13 11:03:54.000000000 +0000 @@ -14,7 +14,8 @@ # limitations under the License. -import mock +from unittest import mock + from oslo_utils import uuidutils from sahara.service.edp import job_utils diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_rpc.py sahara-12.0.0/sahara/tests/unit/utils/test_rpc.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_rpc.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/utils/test_rpc.py 2020-05-13 11:03:54.000000000 +0000 @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import mock +from unittest import mock from sahara import main from sahara.tests.unit import base diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_ssh_remote.py sahara-12.0.0/sahara/tests/unit/utils/test_ssh_remote.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/tests/unit/utils/test_ssh_remote.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/tests/unit/utils/test_ssh_remote.py 2020-05-13 11:03:54.000000000 +0000 @@ -15,8 +15,8 @@ import shlex +from unittest import mock -import mock import testtools from sahara import exceptions as ex diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/utils/hacking/checks.py sahara-12.0.0/sahara/utils/hacking/checks.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/utils/hacking/checks.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/utils/hacking/checks.py 2020-05-13 11:03:54.000000000 +0000 @@ -18,9 +18,7 @@ import re import tokenize -from sahara.utils.hacking import commit_message -from sahara.utils.hacking import import_checks -from sahara.utils.hacking import logging_checks +from hacking import core RE_OSLO_IMPORTS = (re.compile(r"(((from)|(import))\s+oslo\.)"), @@ -45,6 +43,7 @@ return False +@core.flake8ext def import_db_only_in_conductor(logical_line, filename): """Check that db calls are only in conductor, plugins module and in tests. @@ -65,6 +64,7 @@ "sahara/conductor/*") +@core.flake8ext def hacking_no_author_attr(logical_line, tokens): """__author__ should not be used. @@ -76,6 +76,7 @@ "S362: __author__ should not be used") +@core.flake8ext def check_oslo_namespace_imports(logical_line): """Check to prevent old oslo namespace usage. @@ -92,6 +93,7 @@ logical_line)) +@core.flake8ext def dict_constructor_with_list_copy(logical_line): """Check to prevent dict constructor with a sequence of key-value pairs. @@ -102,6 +104,7 @@ 'constructor with a sequence of key-value pairs.') +@core.flake8ext def use_jsonutils(logical_line, filename): """Check to prevent importing json in sahara code. @@ -115,6 +118,7 @@ " of json") +@core.flake8ext def no_mutable_default_args(logical_line): """Check to prevent mutable default argument in sahara code. @@ -123,18 +127,3 @@ msg = "S360: Method's default argument shouldn't be mutable!" if RE_MUTABLE_DEFAULT_ARGS.match(logical_line): yield (0, msg) - - -def factory(register): - register(import_db_only_in_conductor) - register(hacking_no_author_attr) - register(check_oslo_namespace_imports) - register(commit_message.OnceGitCheckCommitTitleBug) - register(commit_message.OnceGitCheckCommitTitleLength) - register(import_checks.hacking_import_groups) - register(import_checks.hacking_import_groups_together) - register(dict_constructor_with_list_copy) - register(logging_checks.no_translate_logs) - register(logging_checks.accepted_log_levels) - register(use_jsonutils) - register(no_mutable_default_args) diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/utils/hacking/import_checks.py sahara-12.0.0/sahara/utils/hacking/import_checks.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/utils/hacking/import_checks.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/utils/hacking/import_checks.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,450 +0,0 @@ -# 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 imp - -from hacking import core - - -# NOTE(Kezar): This checks a good enough if we have only py2.7 supported. -# As soon as we'll get py3.x we need to drop it or rewrite. You can read more -# about it in dev-list archive, topic: "[hacking]proposed rules drop for 1.0" -def _find_module(module, path=None): - mod_base = module - parent_path = None - while '.' in mod_base: - first, _, mod_base = mod_base.partition('.') - parent_path = path - _, path, _ = imp.find_module(first, path) - path = [path] - try: - _, path, _ = imp.find_module(mod_base, path) - except ImportError: - # NOTE(bnemec): There are two reasons we might get here: 1) A - # non-module import and 2) an import of a namespace module that is - # in the same namespace as the current project, which caused us to - # recurse into the project namespace but fail to find the third-party - # module. For 1), we won't be able to import it as a module, so we - # return the parent module's path, but for 2) the import below should - # succeed, so we re-raise the ImportError because the module was - # legitimately not found in this path. - try: - __import__(module) - except ImportError: - # Non-module import, return the parent path if we have it - if parent_path: - return parent_path - raise - raise - return path - - -module_cache = dict() - -# List of all Python 2 stdlib modules - anything not in this list will be -# allowed in either the stdlib or third-party groups to allow for Python 3 -# stdlib additions. -# The list was generated via the following script, which is a variation on -# the one found here: -# http://stackoverflow.com/questions/6463918/how-can-i-get-a-list-of-all-the-python-standard-library-modules -""" -from distutils import sysconfig -import os -import sys - -std_lib = sysconfig.get_python_lib(standard_lib=True) -prefix_len = len(std_lib) + 1 -modules = '' -line = '[' -mod_list = [] -for top, dirs, files in os.walk(std_lib): - for name in files: - if 'site-packages' not in top: - if name == '__init__.py': - full_name = top[prefix_len:].replace('/', '.') - mod_list.append(full_name) - elif name.endswith('.py'): - full_name = top.replace('/', '.') + '.' - full_name += name[:-3] - full_name = full_name[prefix_len:] - mod_list.append(full_name) - elif name.endswith('.so') and top.endswith('lib-dynload'): - full_name = name[:-3] - if full_name.endswith('module'): - full_name = full_name[:-6] - mod_list.append(full_name) -for name in sys.builtin_module_names: - mod_list.append(name) -mod_list.sort() -for mod in mod_list: - if len(line + mod) + 8 > 79: - modules += '\n' + line - line = ' ' - line += "'%s', " % mod -print modules + ']' -""" -py2_stdlib = [ - 'BaseHTTPServer', 'Bastion', 'CGIHTTPServer', 'ConfigParser', 'Cookie', - 'DocXMLRPCServer', 'HTMLParser', 'MimeWriter', 'Queue', - 'SimpleHTTPServer', 'SimpleXMLRPCServer', 'SocketServer', 'StringIO', - 'UserDict', 'UserList', 'UserString', '_LWPCookieJar', - '_MozillaCookieJar', '__builtin__', '__future__', '__main__', - '__phello__.foo', '_abcoll', '_ast', '_bisect', '_bsddb', '_codecs', - '_codecs_cn', '_codecs_hk', '_codecs_iso2022', '_codecs_jp', - '_codecs_kr', '_codecs_tw', '_collections', '_crypt', '_csv', - '_ctypes', '_curses', '_curses_panel', '_elementtree', '_functools', - '_hashlib', '_heapq', '_hotshot', '_io', '_json', '_locale', - '_lsprof', '_multibytecodec', '_multiprocessing', '_osx_support', - '_pyio', '_random', '_socket', '_sqlite3', '_sre', '_ssl', - '_strptime', '_struct', '_symtable', '_sysconfigdata', - '_threading_local', '_warnings', '_weakref', '_weakrefset', 'abc', - 'aifc', 'antigravity', 'anydbm', 'argparse', 'array', 'ast', - 'asynchat', 'asyncore', 'atexit', 'audiodev', 'audioop', 'base64', - 'bdb', 'binascii', 'binhex', 'bisect', 'bsddb', 'bsddb.db', - 'bsddb.dbobj', 'bsddb.dbrecio', 'bsddb.dbshelve', 'bsddb.dbtables', - 'bsddb.dbutils', 'bz2', 'cPickle', 'cProfile', 'cStringIO', - 'calendar', 'cgi', 'cgitb', 'chunk', 'cmath', 'cmd', 'code', 'codecs', - 'codeop', 'collections', 'colorsys', 'commands', 'compileall', - 'compiler', 'compiler.ast', 'compiler.consts', 'compiler.future', - 'compiler.misc', 'compiler.pyassem', 'compiler.pycodegen', - 'compiler.symbols', 'compiler.syntax', 'compiler.transformer', - 'compiler.visitor', 'contextlib', 'cookielib', 'copy', 'copy_reg', - 'crypt', 'csv', 'ctypes', 'ctypes._endian', 'ctypes.macholib', - 'ctypes.macholib.dyld', 'ctypes.macholib.dylib', - 'ctypes.macholib.framework', 'ctypes.util', 'ctypes.wintypes', - 'curses', 'curses.ascii', 'curses.has_key', 'curses.panel', - 'curses.textpad', 'curses.wrapper', 'datetime', 'dbhash', 'dbm', - 'decimal', 'difflib', 'dircache', 'dis', 'distutils', - 'distutils.archive_util', 'distutils.bcppcompiler', - 'distutils.ccompiler', 'distutils.cmd', 'distutils.command', - 'distutils.command.bdist', 'distutils.command.bdist_dumb', - 'distutils.command.bdist_msi', 'distutils.command.bdist_rpm', - 'distutils.command.bdist_wininst', 'distutils.command.build', - 'distutils.command.build_clib', 'distutils.command.build_ext', - 'distutils.command.build_py', 'distutils.command.build_scripts', - 'distutils.command.check', 'distutils.command.clean', - 'distutils.command.config', 'distutils.command.install', - 'distutils.command.install_data', - 'distutils.command.install_egg_info', - 'distutils.command.install_headers', 'distutils.command.install_lib', - 'distutils.command.install_scripts', 'distutils.command.register', - 'distutils.command.sdist', 'distutils.command.upload', - 'distutils.config', 'distutils.core', 'distutils.cygwinccompiler', - 'distutils.debug', 'distutils.dep_util', 'distutils.dir_util', - 'distutils.dist', 'distutils.emxccompiler', 'distutils.errors', - 'distutils.extension', 'distutils.fancy_getopt', - 'distutils.file_util', 'distutils.filelist', 'distutils.log', - 'distutils.msvc9compiler', 'distutils.msvccompiler', - 'distutils.spawn', 'distutils.sysconfig', 'distutils.text_file', - 'distutils.unixccompiler', 'distutils.util', 'distutils.version', - 'distutils.versionpredicate', 'dl', 'doctest', 'dumbdbm', - 'dummy_thread', 'dummy_threading', 'email', 'email._parseaddr', - 'email.base64mime', 'email.charset', 'email.encoders', 'email.errors', - 'email.feedparser', 'email.generator', 'email.header', - 'email.iterators', 'email.message', 'email.mime', - 'email.mime.application', 'email.mime.audio', 'email.mime.base', - 'email.mime.image', 'email.mime.message', 'email.mime.multipart', - 'email.mime.nonmultipart', 'email.mime.text', 'email.parser', - 'email.quoprimime', 'email.utils', 'encodings', 'encodings.aliases', - 'encodings.ascii', 'encodings.base64_codec', 'encodings.big5', - 'encodings.big5hkscs', 'encodings.bz2_codec', 'encodings.charmap', - 'encodings.cp037', 'encodings.cp1006', 'encodings.cp1026', - 'encodings.cp1140', 'encodings.cp1250', 'encodings.cp1251', - 'encodings.cp1252', 'encodings.cp1253', 'encodings.cp1254', - 'encodings.cp1255', 'encodings.cp1256', 'encodings.cp1257', - 'encodings.cp1258', 'encodings.cp424', 'encodings.cp437', - 'encodings.cp500', 'encodings.cp720', 'encodings.cp737', - 'encodings.cp775', 'encodings.cp850', 'encodings.cp852', - 'encodings.cp855', 'encodings.cp856', 'encodings.cp857', - 'encodings.cp858', 'encodings.cp860', 'encodings.cp861', - 'encodings.cp862', 'encodings.cp863', 'encodings.cp864', - 'encodings.cp865', 'encodings.cp866', 'encodings.cp869', - 'encodings.cp874', 'encodings.cp875', 'encodings.cp932', - 'encodings.cp949', 'encodings.cp950', 'encodings.euc_jis_2004', - 'encodings.euc_jisx0213', 'encodings.euc_jp', 'encodings.euc_kr', - 'encodings.gb18030', 'encodings.gb2312', 'encodings.gbk', - 'encodings.hex_codec', 'encodings.hp_roman8', 'encodings.hz', - 'encodings.idna', 'encodings.iso2022_jp', 'encodings.iso2022_jp_1', - 'encodings.iso2022_jp_2', 'encodings.iso2022_jp_2004', - 'encodings.iso2022_jp_3', 'encodings.iso2022_jp_ext', - 'encodings.iso2022_kr', 'encodings.iso8859_1', 'encodings.iso8859_10', - 'encodings.iso8859_11', 'encodings.iso8859_13', - 'encodings.iso8859_14', 'encodings.iso8859_15', - 'encodings.iso8859_16', 'encodings.iso8859_2', 'encodings.iso8859_3', - 'encodings.iso8859_4', 'encodings.iso8859_5', 'encodings.iso8859_6', - 'encodings.iso8859_7', 'encodings.iso8859_8', 'encodings.iso8859_9', - 'encodings.johab', 'encodings.koi8_r', 'encodings.koi8_u', - 'encodings.latin_1', 'encodings.mac_arabic', 'encodings.mac_centeuro', - 'encodings.mac_croatian', 'encodings.mac_cyrillic', - 'encodings.mac_farsi', 'encodings.mac_greek', 'encodings.mac_iceland', - 'encodings.mac_latin2', 'encodings.mac_roman', - 'encodings.mac_romanian', 'encodings.mac_turkish', 'encodings.mbcs', - 'encodings.palmos', 'encodings.ptcp154', 'encodings.punycode', - 'encodings.quopri_codec', 'encodings.raw_unicode_escape', - 'encodings.rot_13', 'encodings.shift_jis', 'encodings.shift_jis_2004', - 'encodings.shift_jisx0213', 'encodings.string_escape', - 'encodings.tis_620', 'encodings.undefined', - 'encodings.unicode_escape', 'encodings.unicode_internal', - 'encodings.utf_16', 'encodings.utf_16_be', 'encodings.utf_16_le', - 'encodings.utf_32', 'encodings.utf_32_be', 'encodings.utf_32_le', - 'encodings.utf_7', 'encodings.utf_8', 'encodings.utf_8_sig', - 'encodings.uu_codec', 'encodings.zlib_codec', 'errno', 'exceptions', - 'fcntl', 'filecmp', 'fileinput', 'fnmatch', 'formatter', 'fpformat', - 'fractions', 'ftplib', 'functools', 'future_builtins', 'gc', 'gdbm', - 'genericpath', 'getopt', 'getpass', 'gettext', 'glob', 'grp', 'gzip', - 'hashlib', 'heapq', 'hmac', 'hotshot', 'hotshot.log', 'hotshot.stats', - 'hotshot.stones', 'htmlentitydefs', 'htmllib', 'httplib', 'idlelib', - 'idlelib.AutoComplete', 'idlelib.AutoCompleteWindow', - 'idlelib.AutoExpand', 'idlelib.Bindings', 'idlelib.CallTipWindow', - 'idlelib.CallTips', 'idlelib.ClassBrowser', 'idlelib.CodeContext', - 'idlelib.ColorDelegator', 'idlelib.Debugger', 'idlelib.Delegator', - 'idlelib.EditorWindow', 'idlelib.FileList', 'idlelib.FormatParagraph', - 'idlelib.GrepDialog', 'idlelib.HyperParser', 'idlelib.IOBinding', - 'idlelib.IdleHistory', 'idlelib.MultiCall', 'idlelib.MultiStatusBar', - 'idlelib.ObjectBrowser', 'idlelib.OutputWindow', 'idlelib.ParenMatch', - 'idlelib.PathBrowser', 'idlelib.Percolator', 'idlelib.PyParse', - 'idlelib.PyShell', 'idlelib.RemoteDebugger', - 'idlelib.RemoteObjectBrowser', 'idlelib.ReplaceDialog', - 'idlelib.RstripExtension', 'idlelib.ScriptBinding', - 'idlelib.ScrolledList', 'idlelib.SearchDialog', - 'idlelib.SearchDialogBase', 'idlelib.SearchEngine', - 'idlelib.StackViewer', 'idlelib.ToolTip', 'idlelib.TreeWidget', - 'idlelib.UndoDelegator', 'idlelib.WidgetRedirector', - 'idlelib.WindowList', 'idlelib.ZoomHeight', 'idlelib.aboutDialog', - 'idlelib.configDialog', 'idlelib.configHandler', - 'idlelib.configHelpSourceEdit', 'idlelib.configSectionNameDialog', - 'idlelib.dynOptionMenuWidget', 'idlelib.idle', 'idlelib.idlever', - 'idlelib.keybindingDialog', 'idlelib.macosxSupport', 'idlelib.rpc', - 'idlelib.run', 'idlelib.tabbedpages', 'idlelib.textView', 'ihooks', - 'imageop', 'imaplib', 'imghdr', 'imp', 'importlib', 'imputil', - 'inspect', 'io', 'itertools', 'json', 'json.decoder', 'json.encoder', - 'json.scanner', 'json.tool', 'keyword', 'lib2to3', 'lib2to3.__main__', - 'lib2to3.btm_matcher', 'lib2to3.btm_utils', 'lib2to3.fixer_base', - 'lib2to3.fixer_util', 'lib2to3.fixes', 'lib2to3.fixes.fix_apply', - 'lib2to3.fixes.fix_basestring', 'lib2to3.fixes.fix_buffer', - 'lib2to3.fixes.fix_callable', 'lib2to3.fixes.fix_dict', - 'lib2to3.fixes.fix_except', 'lib2to3.fixes.fix_exec', - 'lib2to3.fixes.fix_execfile', 'lib2to3.fixes.fix_exitfunc', - 'lib2to3.fixes.fix_filter', 'lib2to3.fixes.fix_funcattrs', - 'lib2to3.fixes.fix_future', 'lib2to3.fixes.fix_getcwdu', - 'lib2to3.fixes.fix_has_key', 'lib2to3.fixes.fix_idioms', - 'lib2to3.fixes.fix_import', 'lib2to3.fixes.fix_imports', - 'lib2to3.fixes.fix_imports2', 'lib2to3.fixes.fix_input', - 'lib2to3.fixes.fix_intern', 'lib2to3.fixes.fix_isinstance', - 'lib2to3.fixes.fix_itertools', 'lib2to3.fixes.fix_itertools_imports', - 'lib2to3.fixes.fix_long', 'lib2to3.fixes.fix_map', - 'lib2to3.fixes.fix_metaclass', 'lib2to3.fixes.fix_methodattrs', - 'lib2to3.fixes.fix_ne', 'lib2to3.fixes.fix_next', - 'lib2to3.fixes.fix_nonzero', 'lib2to3.fixes.fix_numliterals', - 'lib2to3.fixes.fix_operator', 'lib2to3.fixes.fix_paren', - 'lib2to3.fixes.fix_print', 'lib2to3.fixes.fix_raise', - 'lib2to3.fixes.fix_raw_input', 'lib2to3.fixes.fix_reduce', - 'lib2to3.fixes.fix_renames', 'lib2to3.fixes.fix_repr', - 'lib2to3.fixes.fix_set_literal', 'lib2to3.fixes.fix_standarderror', - 'lib2to3.fixes.fix_sys_exc', 'lib2to3.fixes.fix_throw', - 'lib2to3.fixes.fix_tuple_params', 'lib2to3.fixes.fix_types', - 'lib2to3.fixes.fix_unicode', 'lib2to3.fixes.fix_urllib', - 'lib2to3.fixes.fix_ws_comma', 'lib2to3.fixes.fix_xrange', - 'lib2to3.fixes.fix_xreadlines', 'lib2to3.fixes.fix_zip', - 'lib2to3.main', 'lib2to3.patcomp', 'lib2to3.pgen2', - 'lib2to3.pgen2.conv', 'lib2to3.pgen2.driver', 'lib2to3.pgen2.grammar', - 'lib2to3.pgen2.literals', 'lib2to3.pgen2.parse', 'lib2to3.pgen2.pgen', - 'lib2to3.pgen2.token', 'lib2to3.pgen2.tokenize', 'lib2to3.pygram', - 'lib2to3.pytree', 'lib2to3.refactor', 'linecache', 'linuxaudiodev', - 'locale', 'logging', 'logging.config', 'logging.handlers', 'macpath', - 'macurl2path', 'mailbox', 'mailcap', 'markupbase', 'marshal', 'math', - 'md5', 'mhlib', 'mimetools', 'mimetypes', 'mimify', 'mmap', - 'modulefinder', 'multifile', 'multiprocessing', - 'multiprocessing.connection', 'multiprocessing.dummy', - 'multiprocessing.dummy.connection', 'multiprocessing.forking', - 'multiprocessing.heap', 'multiprocessing.managers', - 'multiprocessing.pool', 'multiprocessing.process', - 'multiprocessing.queues', 'multiprocessing.reduction', - 'multiprocessing.sharedctypes', 'multiprocessing.synchronize', - 'multiprocessing.util', 'mutex', 'netrc', 'new', 'nis', 'nntplib', - 'ntpath', 'nturl2path', 'numbers', 'opcode', 'operator', 'optparse', - 'os', 'os2emxpath', 'ossaudiodev', 'parser', 'pdb', 'pickle', - 'pickletools', 'pipes', 'pkgutil', 'plat-linux2.CDROM', - 'plat-linux2.DLFCN', 'plat-linux2.IN', 'plat-linux2.TYPES', - 'platform', 'plistlib', 'popen2', 'poplib', 'posix', 'posixfile', - 'posixpath', 'pprint', 'profile', 'pstats', 'pty', 'pwd', - 'py_compile', 'pyclbr', 'pydoc', 'pydoc_data', 'pydoc_data.topics', - 'pyexpat', 'quopri', 'random', 're', 'readline', 'repr', 'resource', - 'rexec', 'rfc822', 'rlcompleter', 'robotparser', 'runpy', 'sched', - 'select', 'sets', 'sgmllib', 'sha', 'shelve', 'shlex', 'shutil', - 'signal', 'site', 'smtpd', 'smtplib', 'sndhdr', 'socket', 'spwd', - 'sqlite3', 'sqlite3.dbapi2', 'sqlite3.dump', 'sre', 'sre_compile', - 'sre_constants', 'sre_parse', 'ssl', 'stat', 'statvfs', 'string', - 'stringold', 'stringprep', 'strop', 'struct', 'subprocess', 'sunau', - 'sunaudio', 'symbol', 'symtable', 'sys', 'sysconfig', 'syslog', - 'tabnanny', 'tarfile', 'telnetlib', 'tempfile', 'termios', 'test', - 'test.test_support', 'textwrap', 'this', 'thread', 'threading', - 'time', 'timeit', 'timing', 'toaiff', 'token', 'tokenize', 'trace', - 'traceback', 'tty', 'types', 'unicodedata', 'unittest', - 'unittest.__main__', 'unittest.case', 'unittest.loader', - 'unittest.main', 'unittest.result', 'unittest.runner', - 'unittest.signals', 'unittest.suite', 'unittest.test', - 'unittest.test.dummy', 'unittest.test.support', - 'unittest.test.test_assertions', 'unittest.test.test_break', - 'unittest.test.test_case', 'unittest.test.test_discovery', - 'unittest.test.test_functiontestcase', 'unittest.test.test_loader', - 'unittest.test.test_program', 'unittest.test.test_result', - 'unittest.test.test_runner', 'unittest.test.test_setups', - 'unittest.test.test_skipping', 'unittest.test.test_suite', - 'unittest.util', 'urllib', 'urllib2', 'urlparse', 'user', 'uu', - 'uuid', 'warnings', 'wave', 'weakref', 'webbrowser', 'whichdb', - 'wsgiref', 'wsgiref.handlers', 'wsgiref.headers', - 'wsgiref.simple_server', 'wsgiref.util', 'wsgiref.validate', 'xdrlib', - 'xml', 'xml.dom', 'xml.dom.NodeFilter', 'xml.dom.domreg', - 'xml.dom.expatbuilder', 'xml.dom.minicompat', 'xml.dom.minidom', - 'xml.dom.pulldom', 'xml.dom.xmlbuilder', 'xml.etree', - 'xml.etree.ElementInclude', 'xml.etree.ElementPath', - 'xml.etree.ElementTree', 'xml.etree.cElementTree', 'xml.parsers', - 'xml.parsers.expat', 'xml.sax', 'xml.sax._exceptions', - 'xml.sax.expatreader', 'xml.sax.handler', 'xml.sax.saxutils', - 'xml.sax.xmlreader', 'xmllib', 'xmlrpclib', 'xxsubtype', 'zipfile', ] -# Dynamic modules that can't be auto-discovered by the script above -manual_stdlib = ['os.path', ] -py2_stdlib.extend(manual_stdlib) - - -def _get_import_type(module): - if module in module_cache: - return module_cache[module] - - def cache_type(module_type): - module_cache[module] = module_type - return module_type - - # Check static stdlib list - if module in py2_stdlib: - return cache_type('stdlib') - - # Check if the module is local - try: - _find_module(module, ['.']) - # If the previous line succeeded then it must be a project module - return cache_type('project') - except ImportError: - pass - - # Otherwise treat it as third-party - this means we may treat some stdlib - # modules as third-party, but that's okay because we are allowing - # third-party libs in the stdlib section. - return cache_type('third-party') - - -@core.flake8ext -def hacking_import_groups(logical_line, blank_before, previous_logical, - indent_level, previous_indent_level, physical_line, - noqa): - r"""Check that imports are grouped correctly. - - OpenStack HACKING guide recommendation for imports: - imports grouped such that Python standard library imports are together, - third party library imports are together, and project imports are - together - - Okay: import os\nimport sys\n\nimport six\n\nimport hacking - Okay: import six\nimport znon_existent_package - Okay: import os\nimport threading - S366: import mock\nimport os - S366: import hacking\nimport os - S366: import hacking\nimport nonexistent - S366: import hacking\nimport mock - """ - if (noqa or blank_before > 0 or - indent_level != previous_indent_level): - return - - normalized_line = core.import_normalize(logical_line.strip()).split() - normalized_previous = core.import_normalize(previous_logical. - strip()).split() - - def compatible(previous, current): - if previous == current: - return True - - if normalized_line and normalized_line[0] == 'import': - current_type = _get_import_type(normalized_line[1]) - if normalized_previous and normalized_previous[0] == 'import': - previous_type = _get_import_type(normalized_previous[1]) - if not compatible(previous_type, current_type): - yield(0, 'S366: imports not grouped correctly ' - '(%s: %s, %s: %s)' % - (normalized_previous[1], previous_type, - normalized_line[1], current_type)) - - -class ImportGroupData(object): - """A class to hold persistent state data for import group checks. - - To verify import grouping, it is necessary to know the current group - for the current file. This can not always be known solely from the - current and previous line, so this class can be used to keep track. - """ - - # NOTE(bnemec): *args is needed because the test code tries to run this - # as a flake8 check and passes an argument to it. - def __init__(self, *args): - self.current_group = None - self.current_filename = None - self.current_import = None - - -together_data = ImportGroupData() - - -@core.flake8ext -def hacking_import_groups_together(logical_line, blank_lines, indent_level, - previous_indent_level, line_number, - physical_line, filename, noqa): - r"""Check that like imports are grouped together. - - OpenStack HACKING guide recommendation for imports: - Imports should be grouped together by type. - - Okay: import os\nimport sys - Okay: try:\n import foo\nexcept ImportError:\n pass\n\nimport six - Okay: import abc\nimport mock\n\nimport six - Okay: import eventlet\neventlet.monkey_patch()\n\nimport copy - S367: import mock\n\nimport six - S367: import os\n\nimport sys - S367: import mock\nimport os\n\nimport sys - """ - if line_number == 1 or filename != together_data.current_filename: - together_data.current_group = None - together_data.current_filename = filename - - if noqa: - return - - def update_current_group(current): - together_data.current_group = current - - normalized_line = core.import_normalize(logical_line.strip()).split() - if normalized_line: - if normalized_line[0] == 'import': - current_type = _get_import_type(normalized_line[1]) - previous_import = together_data.current_import - together_data.current_import = normalized_line[1] - matched = current_type == together_data.current_group - update_current_group(current_type) - if (matched and indent_level == previous_indent_level and - blank_lines >= 1): - yield(0, 'S367: like imports should be grouped together (%s ' - 'and %s from %s are separated by whitespace)' % - (previous_import, - together_data.current_import, - current_type)) - else: - # Reset on non-import code - together_data.current_group = None diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/utils/hacking/logging_checks.py sahara-12.0.0/sahara/utils/hacking/logging_checks.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/utils/hacking/logging_checks.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/utils/hacking/logging_checks.py 2020-05-13 11:03:54.000000000 +0000 @@ -12,6 +12,7 @@ import re +from hacking import core ALL_LOG_LEVELS = "info|exception|warning|critical|error|debug" @@ -23,6 +24,7 @@ r"(.)*LOG\.(%(levels)s)\(\s*_\(" % {'levels': ALL_LOG_LEVELS}) +@core.flake8ext def no_translate_logs(logical_line, filename): """Check for 'LOG.*(_(' @@ -40,6 +42,7 @@ yield (0, msg) +@core.flake8ext def accepted_log_levels(logical_line, filename): """In Sahara we use only 5 log levels. diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara/utils/patches.py sahara-12.0.0/sahara/utils/patches.py --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara/utils/patches.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/sahara/utils/patches.py 2020-05-13 11:03:54.000000000 +0000 @@ -40,6 +40,12 @@ monkey_patch multiple times. """ eventlet.monkey_patch(**EVENTLET_MONKEY_PATCH_MODULES) + # Monkey patch the original current_thread to use the up-to-date _active + # global variable. See https://bugs.launchpad.net/bugs/1863021 and + # https://github.com/eventlet/eventlet/issues/592 + import __original_module_threading as orig_threading + import threading # noqa + orig_threading.current_thread.__globals__['_active'] = threading._active def eventlet_import_monkey_patched(module): diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara.egg-info/pbr.json sahara-12.0.0/sahara.egg-info/pbr.json --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara.egg-info/pbr.json 2020-04-10 18:12:52.000000000 +0000 +++ sahara-12.0.0/sahara.egg-info/pbr.json 2020-05-13 11:05:58.000000000 +0000 @@ -1 +1 @@ -{"git_version": "0825bdde", "is_release": false} \ No newline at end of file +{"git_version": "a6ee5223", "is_release": true} \ No newline at end of file diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara.egg-info/PKG-INFO sahara-12.0.0/sahara.egg-info/PKG-INFO --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara.egg-info/PKG-INFO 2020-04-10 18:12:52.000000000 +0000 +++ sahara-12.0.0/sahara.egg-info/PKG-INFO 2020-05-13 11:05:58.000000000 +0000 @@ -1,6 +1,6 @@ -Metadata-Version: 1.1 +Metadata-Version: 1.2 Name: sahara -Version: 11.1.0.dev13 +Version: 12.0.0 Summary: Sahara project Home-page: https://docs.openstack.org/sahara/latest/ Author: OpenStack @@ -52,3 +52,4 @@ Classifier: Intended Audience :: System Administrators Classifier: License :: OSI Approved :: Apache Software License Classifier: Operating System :: POSIX :: Linux +Requires-Python: >=3.6 diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara.egg-info/requires.txt sahara-12.0.0/sahara.egg-info/requires.txt --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara.egg-info/requires.txt 2020-04-10 18:12:52.000000000 +0000 +++ sahara-12.0.0/sahara.egg-info/requires.txt 2020-05-13 11:05:58.000000000 +0000 @@ -1,19 +1,17 @@ -Babel!=2.4.0,>=2.3.4 -Flask>=1.0.2 -Jinja2>=2.10 -SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 -WebOb>=1.7.1 +pbr!=2.1.0,>=2.0.0 alembic>=0.8.10 botocore>=1.5.1 castellan>=0.16.0 eventlet!=0.18.3,!=0.20.1,>=0.18.2 +Flask>=1.0.2 iso8601>=0.1.11 +Jinja2>=2.10 jsonschema>=2.6.0 keystoneauth1>=3.4.0 keystonemiddleware>=4.17.0 microversion-parse>=0.2.1 -oslo.concurrency>=3.26.0 oslo.config>=5.2.0 +oslo.concurrency>=3.26.0 oslo.context>=2.19.2 oslo.db>=4.27.0 oslo.i18n>=3.15.3 @@ -27,16 +25,17 @@ oslo.upgradecheck>=0.1.0 oslo.utils>=3.33.0 paramiko>=2.0.0 -pbr!=2.1.0,>=2.0.0 +requests>=2.14.2 python-cinderclient!=4.0.0,>=3.3.0 -python-glanceclient>=2.8.0 -python-heatclient>=1.10.0 python-keystoneclient>=3.8.0 python-manilaclient>=1.16.0 -python-neutronclient>=6.7.0 python-novaclient>=9.1.0 python-swiftclient>=3.2.0 -requests>=2.14.2 +python-neutronclient>=6.7.0 +python-heatclient>=1.10.0 +python-glanceclient>=2.8.0 six>=1.10.0 stevedore>=1.20.0 +SQLAlchemy!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8,>=1.0.10 tooz>=1.58.0 +WebOb>=1.7.1 diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/sahara.egg-info/SOURCES.txt sahara-12.0.0/sahara.egg-info/SOURCES.txt --- sahara-12.0.0~b3~git2020041014.0825bdde/sahara.egg-info/SOURCES.txt 2020-04-10 18:12:52.000000000 +0000 +++ sahara-12.0.0/sahara.egg-info/SOURCES.txt 2020-05-13 11:05:58.000000000 +0000 @@ -213,18 +213,17 @@ doc/source/configuration/sampleconfig.rst doc/source/contributor/adding-database-migrations.rst doc/source/contributor/apiv2.rst +doc/source/contributor/contributing.rst doc/source/contributor/dashboard-dev-environment-guide.rst doc/source/contributor/development-environment.rst doc/source/contributor/development-guidelines.rst doc/source/contributor/devstack.rst doc/source/contributor/gerrit.rst doc/source/contributor/how-to-build-oozie.rst -doc/source/contributor/how-to-participate.rst doc/source/contributor/image-gen.rst doc/source/contributor/index.rst doc/source/contributor/jenkins.rst doc/source/contributor/log-guidelines.rst -doc/source/contributor/project.rst doc/source/contributor/testing.rst doc/source/images/hadoop-cluster-example.jpg doc/source/images/openstack-interop.png @@ -394,9 +393,6 @@ releasenotes/source/unreleased.rst releasenotes/source/_static/.placeholder releasenotes/source/_templates/.placeholder -releasenotes/source/locale/en_GB/LC_MESSAGES/releasenotes.po -releasenotes/source/locale/fr/LC_MESSAGES/releasenotes.po -releasenotes/source/locale/it/LC_MESSAGES/releasenotes.po roles/build-sahara-images-cli/README.rst roles/build-sahara-images-cli/defaults/main.yaml roles/build-sahara-images-cli/tasks/main.yaml @@ -956,7 +952,6 @@ sahara/utils/hacking/__init__.py sahara/utils/hacking/checks.py sahara/utils/hacking/commit_message.py -sahara/utils/hacking/import_checks.py sahara/utils/hacking/logging_checks.py sahara/utils/notification/__init__.py sahara/utils/notification/sender.py diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/setup.cfg sahara-12.0.0/setup.cfg --- sahara-12.0.0~b3~git2020041014.0825bdde/setup.cfg 2020-04-10 18:12:52.957682100 +0000 +++ sahara-12.0.0/setup.cfg 2020-05-13 11:05:59.000000000 +0000 @@ -3,6 +3,7 @@ summary = Sahara project description-file = README.rst license = Apache Software License +python-requires = >=3.6 classifiers = Programming Language :: Python Programming Language :: Python :: 3 @@ -17,9 +18,6 @@ author-email = openstack-discuss@lists.openstack.org home-page = https://docs.openstack.org/sahara/latest/ -[global] -setup-hooks = pbr.hooks.setup_hook - [files] packages = sahara diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/setup.py sahara-12.0.0/setup.py --- sahara-12.0.0~b3~git2020041014.0825bdde/setup.py 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/setup.py 2020-05-13 11:03:54.000000000 +0000 @@ -16,14 +16,6 @@ # THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools -# In python < 2.7.4, a lazy loading of package `pbr` will break -# setuptools if some other modules registered functions in `atexit`. -# solution from: http://bugs.python.org/issue15881#msg170215 -try: - import multiprocessing # noqa -except ImportError: - pass - setuptools.setup( setup_requires=['pbr>=2.0.0'], pbr=True) diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/test-requirements.txt sahara-12.0.0/test-requirements.txt --- sahara-12.0.0~b3~git2020041014.0825bdde/test-requirements.txt 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/test-requirements.txt 2020-05-13 11:03:54.000000000 +0000 @@ -2,7 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -hacking>=1.1.0 # Apache-2.0 +hacking>=3.0,<3.1.0 # Apache-2.0 PyMySQL>=0.7.6 # MIT License bandit>=1.1.0,<1.6.0 # Apache-2.0 @@ -10,7 +10,6 @@ coverage!=4.4,>=4.0 # Apache-2.0 doc8>=0.6.0 # Apache-2.0 fixtures>=3.0.0 # Apache-2.0/BSD -mock>=2.0.0 # BSD oslotest>=3.2.0 # Apache-2.0 stestr>=1.0.0 # Apache-2.0 psycopg2>=2.7.3 # LGPL/ZPL diff -Nru sahara-12.0.0~b3~git2020041014.0825bdde/tox.ini sahara-12.0.0/tox.ini --- sahara-12.0.0~b3~git2020041014.0825bdde/tox.ini 2020-04-10 18:12:48.000000000 +0000 +++ sahara-12.0.0/tox.ini 2020-05-13 11:03:54.000000000 +0000 @@ -14,7 +14,7 @@ VIRTUAL_ENV={envdir} DISCOVER_DIRECTORY=sahara/tests/unit deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt commands = stestr run {posargs} @@ -35,7 +35,7 @@ [testenv:pep8] deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -r{toxinidir}/doc/requirements.txt @@ -59,7 +59,7 @@ [testenv:docs] deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri} -r{toxinidir}/doc/requirements.txt commands = rm -rf doc/html doc/build @@ -72,7 +72,7 @@ [testenv:api-ref] deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri} -r{toxinidir}/doc/requirements.txt install_command = pip install -U --force-reinstall {opts} {packages} commands = @@ -92,7 +92,7 @@ [testenv:releasenotes] deps = - -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/ussuri} -r{toxinidir}/doc/requirements.txt commands = rm -rf releasenotes/build releasenotes/html @@ -131,7 +131,21 @@ [hacking] import_exceptions = sahara.i18n -local-check-factory = sahara.utils.hacking.checks.factory + +[flake8:local-plugins] +extension = + S361 = checks:import_db_only_in_conductor + S362 = checks:hacking_no_author_attr + S363 = checks:check_oslo_namespace_imports + S364 = commit_message:OnceGitCheckCommitTitleBug + S365 = commit_message:OnceGitCheckCommitTitleLength + S368 = checks:dict_constructor_with_list_copy + S373 = logging_checks:no_translate_logs + S374 = logging_checks:accepted_log_levels + S375 = checks:use_jsonutils + S360 = checks:no_mutable_default_args +paths = + ./sahara/utils/hacking [testenv:bindep] # Do not install any requirements. We want this to be fast and work even if