OpenDev Migration Patch

This commit was bulk generated and pushed by the OpenDev sysadmins as a part of the Git hosting and code review systems migration detailed in these mailing list posts: http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html Attempts have been made to correct repository namespaces and hostnames based on simple pattern matching, but it's possible some were updated incorrectly or missed entirely. Please reach out to us via the contact information listed at https://opendev.org/ with any questions you may have.
import zuul job settings from project-config
2019-04-19 19:41:49 +00:00 · 2018-08-22 15:08:59 +09:00 · 2018-02-13 01:59:44 +00:00 · 2018-01-26 14:07:26 +00:00 · 2018-01-26 14:07:23 +00:00
21 changed files with 58 additions and 423 deletions
--- a/.gitreview
+++ b/.gitreview
@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/python-karborclient.git
-defaultbranch=stable/stein
+defaultbranch=stable/queens
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,10 +1,12 @@
 - project:
    templates:
-      - check-requirements
-      - openstack-cover-jobs
-      - openstack-lower-constraints-jobs
      - openstack-python-jobs
      - openstack-python35-jobs
-      - openstack-python36-jobs
+      - check-requirements
+      - publish-openstack-sphinx-docs
      - openstackclient-plugin-jobs
-      - publish-openstack-docs-pti
+    check:
+      jobs:
+        - openstack-tox-cover:
+            voting: false
+
--- a/README.rst
+++ b/README.rst
@@ -2,8 +2,8 @@
 Team and repository tags
 ========================

-.. image:: https://governance.openstack.org/tc/badges/python-karborclient.svg
-    :target: https://governance.openstack.org/tc/reference/tags/index.html
+.. image:: https://governance.openstack.org/badges/python-karborclient.svg
+    :target: https://governance.openstack.org/reference/tags/index.html

 .. Change things from this point on

@@ -12,9 +12,13 @@ Karbor
 ======

 .. image:: https://img.shields.io/pypi/v/python-karborclient.svg
-    :target: https://pypi.org/project/python-karborclient/
+    :target: https://pypi.python.org/pypi/python-karborclient/
    :alt: Latest Version

+.. image:: https://img.shields.io/pypi/dm/python-karborclient.svg
+    :target: https://pypi.python.org/pypi/python-karborclient/
+    :alt: Downloads
+

 Karbor Mission Statement

@@ -31,8 +35,7 @@ Karbor Mission Statement
 * `Specs`_
 * `How to Contribute`_

-.. _PyPi: https://pypi.org/project/python-karborclient
-
+.. _PyPi: https://pypi.python.org/pypi/python-karborclient
 .. _Launchpad project: https://launchpad.net/python-karborclient
 .. _Blueprints: https://blueprints.launchpad.net/python-karborclient
 .. _Bugs: https://bugs.launchpad.net/python-karborclient
--- a/doc/requirements.txt
+++ b/doc/requirements.txt
@@ -1,5 +0,0 @@
-# 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.
-sphinx!=1.6.6,!=1.6.7,>=1.6.2 # BSD
-openstackdocstheme>=1.18.1 # Apache-2.0
--- a/doc/source/contributor/index.rst
+++ b/doc/source/contributor/index.rst
@@ -3,12 +3,12 @@ Contributing
 ============

 General Info
------------
+============

 .. include:: ../../../CONTRIBUTING.rst

 Approved Specs
--------------
+==============

 .. toctree::
   :maxdepth: 1
--- a/doc/source/index.rst
+++ b/doc/source/index.rst
@@ -1,8 +1,7 @@
 Welcome to karborclient's documentation!
-========================================
+========================================================

-Contents
--------
+Contents:

 .. toctree::
   :maxdepth: 1
@@ -13,8 +12,9 @@ Contents
   contributor/index

 Indices and tables
------------------
+==================

 * :ref:`genindex`
+* :ref:`modindex`
 * :ref:`search`

--- a/doc/source/readme.rst
+++ b/doc/source/readme.rst
@@ -1,5 +1,5 @@
-============
+############
 Introduction
-============
+############

 .. include:: ../../README.rst
--- a/doc/source/user/index.rst
+++ b/doc/source/user/index.rst
@@ -1,6 +1,6 @@
-=====
+========
 Usage
-=====
+========

 To use karborclient in a project::

--- a/karborclient/osc/v1/checkpoints.py
+++ b/karborclient/osc/v1/checkpoints.py
@@ -45,12 +45,6 @@ class ListCheckpoints(command.Lister):
            metavar='<provider_id>',
            help=_('ID of provider.'),
        )
-        parser.add_argument(
-            '--all-projects',
-            action='store_true',
-            default=False,
-            help=_('Include all projects (admin only)'),
-        )
        parser.add_argument(
            '--plan_id',
            metavar='<plan_id>',
@@ -101,13 +95,12 @@ class ListCheckpoints(command.Lister):
    def take_action(self, parsed_args):
        self.log.debug("take_action(%s)", parsed_args)
        data_protection_client = self.app.client_manager.data_protection
-        all_projects = bool(parsed_args.project_id) or parsed_args.all_projects
+
        search_opts = {
            'plan_id': parsed_args.plan_id,
            'start_date': parsed_args.start_date,
            'end_date': parsed_args.end_date,
            'project_id': parsed_args.project_id,
-            'all_tenants': all_projects
        }

        data = data_protection_client.checkpoints.list(
@@ -226,58 +219,3 @@ class DeleteCheckpoint(command.Command):
            raise exceptions.CommandError(
                "Unable to find and delete any of the "
                "specified checkpoint.")
-
-
-class ResetCheckpointState(command.Command):
-    _description = "Reset checkpoint state"
-
-    log = logging.getLogger(__name__ + ".ResetCheckpointState")
-
-    def get_parser(self, prog_name):
-        parser = super(ResetCheckpointState, self).get_parser(prog_name)
-        parser.add_argument(
-            'provider_id',
-            metavar='<provider_id>',
-            help=_('Id of provider.')
-        )
-        parser.add_argument(
-            'checkpoint',
-            metavar='<checkpoint>',
-            nargs="+",
-            help=_('Id of checkpoint.')
-        )
-        parser.add_argument(
-            '--available',
-            action='store_const', dest='state',
-            default='error', const='available',
-            help=_('Request the checkpoint be reset to "available" state '
-                   'instead of "error" state(the default).'),
-        )
-        return parser
-
-    def take_action(self, parsed_args):
-        client = self.app.client_manager.data_protection
-        failure_count = 0
-        for checkpoint_id in parsed_args.checkpoint:
-            try:
-                client.checkpoints.reset_state(
-                    parsed_args.provider_id, checkpoint_id, parsed_args.state)
-            except exceptions.NotFound:
-                failure_count += 1
-                self.log.error(
-                    "Failed to reset state of '{0}'; checkpoint "
-                    "not found".format(checkpoint_id))
-            except exceptions.Forbidden:
-                failure_count += 1
-                self.log.error(
-                    "Failed to reset state of '{0}'; not "
-                    "allowed".format(checkpoint_id))
-            except exceptions.BadRequest:
-                failure_count += 1
-                self.log.error(
-                    "Failed to reset state of '{0}'; invalid input or "
-                    "current checkpoint state".format(checkpoint_id))
-        if failure_count == len(parsed_args.checkpoint):
-            raise exceptions.CommandError(
-                "Unable to find or reset any of the specified "
-                "checkpoint's state.")
--- a/karborclient/osc/v1/plans.py
+++ b/karborclient/osc/v1/plans.py
@@ -210,11 +210,6 @@ class UpdatePlan(command.ShowOne):
            metavar="<name>",
            help=_("A name to which the plan will be renamed.")
        )
-        parser.add_argument(
-            "--description",
-            metavar="<description>",
-            help=_("Description to which the plan will be updated.")
-        )
        parser.add_argument(
            "--resources",
            metavar="<id=type=name,id=type=name>",
@@ -232,8 +227,6 @@ class UpdatePlan(command.ShowOne):
        data = {}
        if parsed_args.name is not None:
            data['name'] = parsed_args.name
-        if parsed_args.description is not None:
-            data['description'] = parsed_args.description
        if parsed_args.resources is not None:
            plan_resources = utils.extract_resources(parsed_args)
            data['resources'] = plan_resources
--- a/karborclient/tests/unit/osc/v1/test_checkpoints.py
+++ b/karborclient/tests/unit/osc/v1/test_checkpoints.py
@@ -39,26 +39,6 @@ CHECKPOINT_INFO = {
    ),
 }

-CHECKPOINT_INFO_2 = {
-    "id": "a6fd95fe-0892-43b2-ad3c-e56f3a1b86b8",
-    "project_id": "79b35e99a6a541b3bcede40f590d6878",
-    "status": "available",
-    "protection_plan": {
-        "id": "3b47fd5d-21f9-4e63-8409-0acb1bffc038",
-        "name": "My application",
-        "provider_id": "cf56bd3e-97a7-4078-b6d5-f36246333fd9",
-        "resources": [{
-            "id": "99777fdd-8a5b-45ab-ba2c-52420008103f",
-            "type": "OS::Glance::Image",
-            "name": "cirros-0.3.4-x86_64-uec"}]
-    },
-    "resource_graph": json.dumps(
-        "[{'0x0': ['OS::Glance::Image', "
-        "'99777fdd-8a5b-45ab-ba2c-52420008103f', "
-        "'cirros-0.3.4-x86_64-uec']}, [[['0x0']]]]"
-    ),
-}
-

 class TestCheckpoints(fakes.TestDataProtection):
    def setUp(self):
@@ -71,13 +51,13 @@ class TestCheckpoints(fakes.TestDataProtection):
 class TestListCheckpoints(TestCheckpoints):
    def setUp(self):
        super(TestListCheckpoints, self).setUp()
+        self.checkpoints_mock.list.return_value = [checkpoints.Checkpoint(
+            None, copy.deepcopy(CHECKPOINT_INFO))]

        # Command to test
        self.cmd = osc_checkpoints.ListCheckpoints(self.app, None)

    def test_checkpoints_list(self):
-        self.checkpoints_mock.list.return_value = [checkpoints.Checkpoint(
-            None, copy.deepcopy(CHECKPOINT_INFO))]
        arglist = ['cf56bd3e-97a7-4078-b6d5-f36246333fd9']
        verifylist = [('provider_id', 'cf56bd3e-97a7-4078-b6d5-f36246333fd9')]

@@ -104,44 +84,6 @@ class TestListCheckpoints(TestCheckpoints):
            '')]
        self.assertEqual(expected_data, list(data))

-    def test_checkpoints_list_with_all_projects(self):
-        self.checkpoints_mock.list.return_value = [checkpoints.Checkpoint(
-            None, copy.deepcopy(CHECKPOINT_INFO)), checkpoints.Checkpoint(
-            None, copy.deepcopy(CHECKPOINT_INFO_2))]
-        arglist = ['cf56bd3e-97a7-4078-b6d5-f36246333fd9', '--all-projects']
-        verifylist = [('provider_id', 'cf56bd3e-97a7-4078-b6d5-f36246333fd9'),
-                      ('all_projects', True)]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-
-        columns, data = self.cmd.take_action(parsed_args)
-
-        expected_columns = (
-            ['Id', 'Project id', 'Status', 'Protection plan', 'Metadata',
-             'Created at'])
-        self.assertEqual(expected_columns, columns)
-
-        expected_data = [(
-            "dcb20606-ad71-40a3-80e4-ef0fafdad0c3",
-            "e486a2f49695423ca9c47e589b948108",
-            "available",
-            "Name: %(name)s\nId: %(id)s" % {
-                "id": "3523a271-68aa-42f5-b9ba-56e5200a2ebb",
-                "name": "My application",
-            },
-            '',
-            ''), (
-            "a6fd95fe-0892-43b2-ad3c-e56f3a1b86b8",
-            "79b35e99a6a541b3bcede40f590d6878",
-            "available",
-            "Name: %(name)s\nId: %(id)s" % {
-                "id": "3b47fd5d-21f9-4e63-8409-0acb1bffc038",
-                "name": "My application",
-            },
-            '',
-            '')
-        ]
-        self.assertEqual(expected_data, list(data))
-

 class TestCreateCheckpoint(TestCheckpoints):
    def setUp(self):
@@ -216,38 +158,3 @@ class TestDeleteCheckpoint(TestCheckpoints):
        self.checkpoints_mock.delete.assert_called_once_with(
            'cf56bd3e-97a7-4078-b6d5-f36246333fd9',
            'dcb20606-ad71-40a3-80e4-ef0fafdad0c3')
-
-
-class TestResetCheckpointState(TestCheckpoints):
-    def setUp(self):
-        super(TestResetCheckpointState, self).setUp()
-        self.cmd = osc_checkpoints.ResetCheckpointState(self.app, None)
-
-    def test_reset_checkpoint_with_default_state(self):
-        arglist = ['cf56bd3e-97a7-4078-b6d5-f36246333fd9',
-                   'dcb20606-ad71-40a3-80e4-ef0fafdad0c3']
-        verifylist = [('provider_id', 'cf56bd3e-97a7-4078-b6d5-f36246333fd9'),
-                      ('checkpoint',
-                       ['dcb20606-ad71-40a3-80e4-ef0fafdad0c3']),
-                      ('state', 'error')]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.cmd.take_action(parsed_args)
-        self.checkpoints_mock.reset_state.assert_called_once_with(
-            'cf56bd3e-97a7-4078-b6d5-f36246333fd9',
-            'dcb20606-ad71-40a3-80e4-ef0fafdad0c3',
-            'error')
-
-    def test_reset_checkpoint(self):
-        arglist = ['cf56bd3e-97a7-4078-b6d5-f36246333fd9',
-                   'dcb20606-ad71-40a3-80e4-ef0fafdad0c3',
-                   '--available']
-        verifylist = [('provider_id', 'cf56bd3e-97a7-4078-b6d5-f36246333fd9'),
-                      ('checkpoint',
-                       ['dcb20606-ad71-40a3-80e4-ef0fafdad0c3']),
-                      ('state', 'available')]
-        parsed_args = self.check_parser(self.cmd, arglist, verifylist)
-        self.cmd.take_action(parsed_args)
-        self.checkpoints_mock.reset_state.assert_called_once_with(
-            'cf56bd3e-97a7-4078-b6d5-f36246333fd9',
-            'dcb20606-ad71-40a3-80e4-ef0fafdad0c3',
-            'available')
--- a/karborclient/tests/unit/v1/test_checkpoints.py
+++ b/karborclient/tests/unit/v1/test_checkpoints.py
@@ -20,7 +20,6 @@ mock_request_return = ({}, {'checkpoint': {}})

 FAKE_PROVIDER_ID = "2220f8b1-975d-4621-a872-fa9afb43cb6c"
 FAKE_PLAN_ID = "3330f8b1-975d-4621-a872-fa9afb43cb6c"
-FAKE_CHECKPOINT_ID = "e4381b1a-905e-4fec-8104-b4419ccaf963"


 class CheckpointsTest(base.TestCaseShell):
@@ -34,16 +33,6 @@ class CheckpointsTest(base.TestCaseShell):
            '/providers/{provider_id}/checkpoints'.format(
                provider_id=FAKE_PROVIDER_ID), headers={})

-    @mock.patch('karborclient.common.http.HTTPClient.json_request')
-    def test_list_checkpoints_with_all_tenants(self, mock_request):
-        mock_request.return_value = mock_request_return
-        cs.checkpoints.list(provider_id=FAKE_PROVIDER_ID,
-                            search_opts={'all_tenants': 1})
-        mock_request.assert_called_with(
-            'GET',
-            '/providers/{provider_id}/checkpoints?all_tenants=1'.format(
-                provider_id=FAKE_PROVIDER_ID), headers={})
-
    @mock.patch('karborclient.common.http.HTTPClient.json_request')
    def test_get_checkpoint(self, mock_request):
        mock_request.return_value = mock_request_return
@@ -101,17 +90,3 @@ class CheckpointsTest(base.TestCaseShell):
            data={
                'checkpoint': {'plan_id': FAKE_PLAN_ID, 'extra-info': None}},
            headers={})
-
-    @mock.patch('karborclient.common.http.HTTPClient.json_request')
-    def test_reset_checkpoint_state(self, mock_request):
-        mock_request.return_value = ({}, {})
-        cs.checkpoints.reset_state(
-            FAKE_PROVIDER_ID, FAKE_CHECKPOINT_ID, 'error')
-        mock_request.assert_called_with(
-            'PUT',
-            '/providers/{provider_id}/checkpoints/{checkpoint_id}'.format(
-                provider_id=FAKE_PROVIDER_ID,
-                checkpoint_id=FAKE_CHECKPOINT_ID
-            ),
-            data={'os-resetState': {'state': 'error'}},
-            headers={})
--- a/karborclient/tests/unit/v1/test_triggers.py
+++ b/karborclient/tests/unit/v1/test_triggers.py
@@ -12,7 +12,6 @@

 import mock

-from karborclient.common.apiclient import exceptions
 from karborclient.tests.unit import base
 from karborclient.tests.unit.v1 import fakes

@@ -47,21 +46,16 @@ class TriggersTest(base.TestCaseShell):
    @mock.patch('karborclient.common.http.HTTPClient.json_request')
    def test_create_trigger(self, mock_request):
        mock_request.return_value = mock_request_return
-        cs.triggers.create('name', 'time', {})
+        cs.triggers.create('name', 'time', 'properties')
        mock_request.assert_called_with(
            'POST',
            '/triggers',
            data={
                'trigger_info': {'name': 'name',
                                 'type': 'time',
-                                 'properties': {}}},
+                                 'properties': 'properties'}},
            headers={})

-    def test_create_trigger_with_invalid_window(self):
-        self.assertRaises(exceptions.CommandError,
-                          cs.triggers.create,
-                          'name', 'time', {'window': 'fake'})
-
    @mock.patch('karborclient.common.http.HTTPClient.raw_request')
    def test_delete_trigger(self, mock_request):
        mock_request.return_value = mock_request_return
--- a/karborclient/v1/checkpoints.py
+++ b/karborclient/v1/checkpoints.py
@@ -43,15 +43,6 @@ class CheckpointManager(base.ManagerWithFind):
              "checkpoints" .format(provider_id=provider_id)
        return self._create(url, body, 'checkpoint')

-    def reset_state(self, provider_id, checkpoint_id, state):
-        body = {'os-resetState': {'state': state}}
-        return self.update(provider_id, checkpoint_id, body)
-
-    def update(self, provider_id, checkpoint_id, values):
-        url = '/providers/{provider_id}/checkpoints/{checkpoint_id}'.format(
-            provider_id=provider_id, checkpoint_id=checkpoint_id)
-        return self._update(url, values)
-
    def delete(self, provider_id, checkpoint_id):
        path = '/providers/{provider_id}/checkpoints/' \
               '{checkpoint_id}'.format(provider_id=provider_id,
--- a/karborclient/v1/shell.py
+++ b/karborclient/v1/shell.py
@@ -188,8 +188,6 @@ def do_plan_delete(cs, args):
           help="Id of plan to update.")
@utils.arg("--name", metavar="<name>",
           help="A name to which the plan will be renamed.")
-@utils.arg("--description", metavar="<description>",
-           help="Description to which the plan will be updated.")
@utils.arg("--resources", metavar="<id=type=name,id=type=name>",
           help="Resources to which the plan will be updated.")
@utils.arg("--status", metavar="<suspended|started>",
@@ -199,8 +197,6 @@ def do_plan_update(cs, args):
    data = {}
    if args.name is not None:
        data['name'] = args.name
-    if args.description is not None:
-            data['description'] = args.description
    if args.resources is not None:
        plan_resources = arg_utils.extract_resources(args)
        data['resources'] = plan_resources
@@ -716,19 +712,6 @@ def do_checkpoint_create(cs, args):
                     json_format_list=json_format_list)


-@utils.arg('--all-tenants',
-           dest='all_tenants',
-           metavar='<0|1>',
-           nargs='?',
-           type=int,
-           const=1,
-           default=0,
-           help='Shows details for all tenants. Admin only.')
-@utils.arg('--all_tenants',
-           nargs='?',
-           type=int,
-           const=1,
-           help=argparse.SUPPRESS)
@utils.arg('provider_id',
           metavar='<provider_id>',
           help='ID of provider.')
@@ -802,7 +785,6 @@ def do_checkpoint_list(cs, args):
        'start_date': args.start_date,
        'end_date': args.end_date,
        'project_id': args.project_id,
-        'all_tenants': args.all_tenants
    }

    if args.sort and (args.sort_key or args.sort_dir):
@@ -870,45 +852,6 @@ def do_checkpoint_delete(cs, args):
                                      "specified checkpoint.")


-@utils.arg('provider_id',
-           metavar='<provider_id>',
-           help='Id of provider.')
-@utils.arg('checkpoint',
-           metavar='<checkpoint>',
-           nargs="+",
-           help='ID of checkpoint.')
-@utils.arg('--available',
-           action='store_const',
-           dest='state',
-           default='error',
-           const='available',
-           help='Request the checkpoint be reset to "available" state instead '
-                'of "error" state(the default).')
-def do_checkpoint_reset_state(cs, args):
-    """Reset state of a checkpoint."""
-    failure_count = 0
-
-    for checkpoint_id in args.checkpoint:
-        try:
-            cs.checkpoints.reset_state(args.provider_id, checkpoint_id,
-                                       args.state)
-        except exceptions.NotFound:
-            failure_count += 1
-            print("Failed to reset state of '{0}'; checkpoint not found".
-                  format(checkpoint_id))
-        except exceptions.Forbidden:
-            failure_count += 1
-            print("Failed to reset state of '{0}'; not allowed".
-                  format(checkpoint_id))
-        except exceptions.BadRequest:
-            failure_count += 1
-            print("Failed to reset state of '{0}'; invalid input or "
-                  "current checkpoint state".format(checkpoint_id))
-    if failure_count == len(args.checkpoint):
-        raise exceptions.CommandError("Unable to find or reset any of the "
-                                      "specified checkpoint's state.")
-
-
@utils.arg('--all-tenants',
           dest='all_tenants',
           metavar='<0|1>',
@@ -1027,8 +970,7 @@ def do_trigger_update(cs, args):
    """Update a trigger."""
    trigger_info = {}
    trigger_properties = arg_utils.extract_properties(args)
-    if args.name:
-        trigger_info['name'] = args.name
+    trigger_info['name'] = args.name
    trigger_info['properties'] = trigger_properties
    trigger = cs.triggers.update(args.trigger_id, trigger_info)
    dict_format_list = {"properties"}
@@ -1164,9 +1106,7 @@ def do_scheduledoperation_list(cs, args):
           help='Trigger name.')
@utils.arg('operation_type',
           metavar='<operation_type>',
-           choices=['protect', 'retention_protect'],
-           help='Operation Type of scheduled operation. Valid values are '
-                '"protect" or "retention_protect."')
+           help='Operation Type of scheduled operation.')
@utils.arg('trigger_id',
           metavar='<trigger_id>',
           help='Trigger id of scheduled operation.')
--- a/karborclient/v1/triggers.py
+++ b/karborclient/v1/triggers.py
@@ -10,7 +10,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.

-from karborclient.common.apiclient import exceptions
 from karborclient.common import base


@@ -23,12 +22,6 @@ class TriggerManager(base.ManagerWithFind):
    resource_class = Trigger

    def create(self, name, type, properties):
-        if properties.get('window', None):
-            try:
-                properties['window'] = int(properties['window'])
-            except Exception:
-                msg = 'The trigger window is not integer'
-                raise exceptions.CommandError(msg)
        body = {'trigger_info': {'name': name,
                                 'type': type,
                                 'properties': properties,
@@ -52,14 +45,8 @@ class TriggerManager(base.ManagerWithFind):

    def update(self, trigger_id, data):

-        if data['properties'].get('window', None):
-            try:
-                data['properties']['window'] = int(
-                    data['properties']['window'])
-            except Exception:
-                msg = 'The trigger window is not integer'
-                raise exceptions.CommandError(msg)
        body = {"trigger_info": data}
+
        return self._update('/triggers/{trigger_id}'
                            .format(trigger_id=trigger_id),
                            body, "trigger_info")
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -1,88 +0,0 @@
-alabaster==0.7.10
-appdirs==1.3.0
-asn1crypto==0.23.0
-Babel==2.3.4
-cffi==1.7.0
-cliff==2.8.0
-cmd2==0.8.0
-coverage==4.0
-cryptography==2.1
-debtcollector==1.2.0
-decorator==3.4.0
-deprecation==1.0
-docutils==0.11
-dogpile.cache==0.6.2
-dulwich==0.15.0
-extras==1.0.0
-fixtures==3.0.0
-flake8==2.5.5
-hacking==0.12.0
-idna==2.6
-imagesize==0.7.1
-iso8601==0.1.11
-Jinja2==2.10
-jmespath==0.9.0
-jsonpatch==1.16
-jsonpointer==1.13
-jsonschema==2.6.0
-keystoneauth1==3.4.0
-linecache2==1.0.0
-MarkupSafe==1.0
-mccabe==0.2.1
-mock==2.0.0
-monotonic==0.6
-mox3==0.20.0
-msgpack-python==0.4.0
-munch==2.1.0
-netaddr==0.7.18
-netifaces==0.10.4
-openstackdocstheme==1.18.1
-openstacksdk==0.11.2
-os-client-config==1.28.0
-os-service-types==1.2.0
-osc-lib==1.8.0
-oslo.config==5.2.0
-oslo.context==2.19.2
-oslo.i18n==3.15.3
-oslo.log==3.36.0
-oslo.serialization==2.18.0
-oslo.utils==3.33.0
-oslotest==3.2.0
-pbr==2.0.0
-pep8==1.5.7
-positional==1.2.1
-prettytable==0.7.1
-pycparser==2.18
-pyflakes==0.8.1
-Pygments==2.2.0
-pyinotify==0.9.6
-pyOpenSSL==17.1.0
-pyparsing==2.1.0
-pyperclip==1.5.27
-python-cinderclient==3.3.0
-python-dateutil==2.5.3
-python-glanceclient==2.8.0
-python-keystoneclient==3.8.0
-python-mimeparse==1.6.0
-python-novaclient==9.1.0
-python-openstackclient==3.12.0
-python-subunit==1.0.0
-pytz==2013.6
-PyYAML==3.12
-requests-mock==1.2.0
-requests==2.14.2
-requestsexceptions==1.2.0
-rfc3986==0.3.1
-simplejson==3.5.1
-six==1.10.0
-snowballstemmer==1.2.1
-Sphinx==1.6.2
-sphinxcontrib-websupport==1.0.1
-stevedore==1.20.0
-testrepository==0.0.18
-testscenarios==0.4
-testtools==2.2.0
-traceback2==1.4.0
-unittest2==1.1.0
-warlock==1.2.0
-wrapt==1.7.0
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@
 # process, which may cause wedges in the gate later.
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
 PrettyTable<0.8,>=0.7.1 # BSD
-keystoneauth1>=3.4.0 # Apache-2.0
+keystoneauth1>=3.3.0 # Apache-2.0
 requests>=2.14.2 # Apache-2.0
 simplejson>=3.5.1 # MIT
 Babel!=2.4.0,>=2.3.4 # BSD
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,8 +4,8 @@ summary = Python client library for Karbor API
 description-file =
    README.rst
 author = OpenStack
-author-email = openstack-discuss@lists.openstack.org
-home-page = https://docs.openstack.org/python-karborclient/latest/
+author-email = openstack-dev@lists.openstack.org
+home-page = https://docs.openstack.org/karbor/latest
 classifier =
    Environment :: OpenStack
    Intended Audience :: Information Technology
@@ -17,7 +17,6 @@ classifier =
    Programming Language :: Python :: 2.7
    Programming Language :: Python :: 3
    Programming Language :: Python :: 3.5
-    Programming Language :: Python :: 3.6

 [global]
 setup-hooks =
@@ -58,7 +57,6 @@ openstack.data_protection.v1 =
    data_protection_checkpoint_show = karborclient.osc.v1.checkpoints:ShowCheckpoint
    data_protection_checkpoint_create = karborclient.osc.v1.checkpoints:CreateCheckpoint
    data_protection_checkpoint_delete = karborclient.osc.v1.checkpoints:DeleteCheckpoint
-    data_protection_checkpoint_reset_state = karborclient.osc.v1.checkpoints:ResetCheckpointState
    data_protection_scheduledoperation_list = karborclient.osc.v1.scheduled_operations:ListScheduledOperations
    data_protection_scheduledoperation_show = karborclient.osc.v1.scheduled_operations:ShowScheduledOperation
    data_protection_scheduledoperation_create = karborclient.osc.v1.scheduled_operations:CreateScheduledOperation
@@ -91,5 +89,14 @@ keywords = _ gettext ngettext l_ lazy_gettext
 mapping_file = babel.cfg
 output_file = karborclient/locale/karborclient.pot

+[build_sphinx]
+source-dir = doc/source
+build-dir = doc/build
+all_files = 1
+warning-is-error = 1
+
+[upload_sphinx]
+upload-dir = doc/build/html
+
 [wheel]
 universal = 1
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -7,9 +7,11 @@ hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
 coverage!=4.4,>=4.0 # Apache-2.0
 python-subunit>=1.0.0 # Apache-2.0/BSD
 docutils>=0.11 # OSI-Approved Open Source, Public Domain
+sphinx!=1.6.6,>=1.6.2 # BSD
+openstackdocstheme>=1.18.1 # Apache-2.0
 oslotest>=3.2.0 # Apache-2.0
 python-openstackclient>=3.12.0 # Apache-2.0
-requests-mock>=1.2.0 # Apache-2.0
+requests-mock>=1.1.0 # Apache-2.0
 testrepository>=0.0.18 # Apache-2.0/BSD
 testscenarios>=0.4 # Apache-2.0/BSD
 testtools>=2.2.0 # MIT
--- a/tox.ini
+++ b/tox.ini
@@ -10,47 +10,36 @@ setenv =
   VIRTUAL_ENV={envdir}
   PYTHONWARNINGS=default::DeprecationWarning
 deps =
-       -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/stein}
+       -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=stable/queens}
       -r{toxinidir}/requirements.txt
       -r{toxinidir}/test-requirements.txt
-whitelist_externals = rm
-commands =
-  rm -f .testrepository/times.dbm
-  python setup.py test --slowest --testr-args='{posargs}'
+commands = python setup.py test --slowest --testr-args='{posargs}'

 [testenv:pep8]
-basepython = python3
 commands = flake8

 [testenv:venv]
-basepython = python3
 commands = {posargs}

+[testenv:functional]
+setenv =
+  {[testenv]setenv}
+  OS_TEST_PATH = ./karborclient/tests/functional
+passenv = OS_*
 [testenv:cover]
-basepython = python3
 commands =
  python setup.py test --coverage --testr-args='{posargs}'
  coverage report

 [testenv:docs]
-basepython = python3
-deps = -r{toxinidir}/doc/requirements.txt
-commands = sphinx-build -W -b html doc/source doc/build/html
+commands = python setup.py build_sphinx

 [testenv:debug]
-basepython = python3
 commands = oslo_debug_helper -t karborclient/tests {posargs}

 [flake8]

 show-source = True
-ignore =
+ignore = 
 builtins = _
 exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,tools
-
-[testenv:lower-constraints]
-basepython = python3
-deps =
-  -c{toxinidir}/lower-constraints.txt
-  -r{toxinidir}/test-requirements.txt
-  -r{toxinidir}/requirements.txt
Author	SHA1	Message	Date
OpenDev Sysadmins	6da5073a05	OpenDev Migration Patch This commit was bulk generated and pushed by the OpenDev sysadmins as a part of the Git hosting and code review systems migration detailed in these mailing list posts: http://lists.openstack.org/pipermail/openstack-discuss/2019-March/003603.html http://lists.openstack.org/pipermail/openstack-discuss/2019-April/004920.html Attempts have been made to correct repository namespaces and hostnames based on simple pattern matching, but it's possible some were updated incorrectly or missed entirely. Please reach out to us via the contact information listed at https://opendev.org/ with any questions you may have.	2019-04-19 19:41:49 +00:00
Nguyen Hai	1f6c6f6c5e	import zuul job settings from project-config This is a mechanically generated patch to complete step 1 of moving the zuul job settings out of project-config and into each project repository. Because there will be a separate patch on each branch, the branch specifiers for branch-specific jobs have been removed. Because this patch is generated by a script, there may be some cosmetic changes to the layout of the YAML file(s) as the contents are normalized. See the python3-first goal document for details: https://governance.openstack.org/tc/goals/stein/python3-first.html Change-Id: If7e23cf13f9c51b9eaeb1ac0e4db2c0756c87698 Story: #2002586 Task: #24303	2018-08-22 15:08:59 +09:00
OpenStack Proposal Bot	b575caed1b	Updated from global requirements Change-Id: Id6563592ff977657729e5edd615850db49de135f	2018-02-13 01:59:44 +00:00
OpenStack Release Bot	3473b2ac08	Update UPPER_CONSTRAINTS_FILE for stable/queens Change-Id: If19229c8b1d6d14573249e0fd46bef23bb3f8767	2018-01-26 14:07:26 +00:00
OpenStack Release Bot	f48e4946b6	Update .gitreview for stable/queens Change-Id: I4f854372552888461ba3cf106b311dba96fb6f5c	2018-01-26 14:07:23 +00:00