python-watcher 12.0.0.0rc1__tar.gz → 12.1.0__tar.gz

{python-watcher-12.0.0.0rc1 → python_watcher-12.1.0}/.zuul.yaml

@@ -85,6 +85,7 @@
     vars:
       tempest_concurrency: 1
       tempest_test_regex: watcher_tempest_plugin.tests.scenario.test_execute_strategies
+      tempest_exclude_regex: .*\[.*\breal_load\b.*\].*
 
 - job:
     name: watcher-tempest-multinode

{python-watcher-12.0.0.0rc1 → python_watcher-12.1.0}/AUTHORS

@@ -28,6 +28,7 @@ Dao Cong Tien <tiendc@vn.fujitsu.com>
 Darren Shaw <ds354m@att.com>
 David TARDIVEL <David.TARDIVEL@b-com.com>
 Doug Hellmann <doug@doughellmann.com>
+Douglas Viroel <viroel@gmail.com>
 Drew Thorstensen <thorst@us.ibm.com>
 Edwin Zhai <edwin.zhai@intel.com>
 Egor Panfilov <erakli00@gmail.com>
@@ -47,6 +48,7 @@ Ian Wienand <iwienand@redhat.com>
 Iswarya_Vakati <v.iswarya@nectechnologies.in>
 Jaewoo Park <jp655p@att.com>
 James E. Blair <jeblair@redhat.com>
+James Page <james.page@canonical.com>
 Jean-Emile DARTOIS <jean-emile.dartois@b-com.com>
 Jeremy Liu <liujiong@gohighsec.com>
 Joe Cropper <jwcroppe@us.ibm.com>
@@ -81,6 +83,7 @@ Ralf Rantzau <rrantzau@cisco.com>
 Sampath Priyankara <sam47priya@gmail.com>
 Santhosh Fernandes <santhosh.fernandes@gmail.com>
 Sean McGinnis <sean.mcginnis@gmail.com>
+Sean Mooney <work@seanmooney.info>
 ShangXiao <shangxiaobj@inspur.com>
 Steve Kowalik <steven@wedontsleep.org>
 Steve Wilkerson <sw5822@att.com>
@@ -92,6 +95,7 @@ Tatiana Kholkina <holkina@selectel.ru>
 Taylor Peoples <tpeoples@us.ibm.com>
 Thierry Carrez <thierry@openstack.org>
 Tin Lam <tl3438@att.com>
+Tobias Urdin <tobias.urdin@binero.com>
 Tobias Urdin <tobias.urdin@binero.se>
 Tomasz Kaczynski <tomasz.kaczynski@intel.com>
 Tomasz Trębski <tomasz.trebski@ts.fujitsu.com>

{python-watcher-12.0.0.0rc1 → python_watcher-12.1.0}/ChangeLog

@@ -1,6 +1,22 @@
 CHANGES
 =======
 
+12.1.0
+------
+
+* Configure watcher tempest's microversion in devstack
+* use cinder migrate for swap volume
+* Further database refactoring
+* Replace deprecated LegacyEngineFacade
+* Skip real-data tests in non-real-data jobs
+* Update TOX\_CONSTRAINTS\_FILE for stable/2024.1
+* Update .gitreview for stable/2024.1
+
+12.0.0
+------
+
+* Fix oslo.db >= 15.0.0 compatibility
+
 12.0.0.0rc1
 -----------
 

python_watcher-12.1.0/PKG-INFO

@@ -0,0 +1,97 @@
+Metadata-Version: 2.1
+Name: python-watcher
+Version: 12.1.0
+Summary: OpenStack Watcher provides a flexible and scalable resource optimization service for multi-tenant OpenStack-based clouds.
+Home-page: https://docs.openstack.org/watcher/latest/
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+Classifier: Environment :: OpenStack
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Requires-Python: >=3.8
+License-File: LICENSE
+Requires-Dist: apscheduler>=3.5.1
+Requires-Dist: jsonpatch>=1.21
+Requires-Dist: keystoneauth1>=3.4.0
+Requires-Dist: jsonschema>=3.2.0
+Requires-Dist: keystonemiddleware>=4.21.0
+Requires-Dist: lxml>=4.5.1
+Requires-Dist: croniter>=0.3.20
+Requires-Dist: os-resource-classes>=0.4.0
+Requires-Dist: oslo.concurrency>=3.26.0
+Requires-Dist: oslo.cache>=1.29.0
+Requires-Dist: oslo.config>=6.8.0
+Requires-Dist: oslo.context>=2.21.0
+Requires-Dist: oslo.db>=4.44.0
+Requires-Dist: oslo.i18n>=3.20.0
+Requires-Dist: oslo.log>=3.37.0
+Requires-Dist: oslo.messaging>=14.1.0
+Requires-Dist: oslo.policy>=3.6.0
+Requires-Dist: oslo.reports>=1.27.0
+Requires-Dist: oslo.serialization>=2.25.0
+Requires-Dist: oslo.service>=1.30.0
+Requires-Dist: oslo.upgradecheck>=1.3.0
+Requires-Dist: oslo.utils>=3.36.0
+Requires-Dist: oslo.versionedobjects>=1.32.0
+Requires-Dist: PasteDeploy>=1.5.2
+Requires-Dist: pbr>=3.1.1
+Requires-Dist: pecan>=1.3.2
+Requires-Dist: PrettyTable>=0.7.2
+Requires-Dist: gnocchiclient>=7.0.1
+Requires-Dist: python-cinderclient>=3.5.0
+Requires-Dist: python-glanceclient>=2.9.1
+Requires-Dist: python-keystoneclient>=3.15.0
+Requires-Dist: python-monascaclient>=1.12.0
+Requires-Dist: python-neutronclient>=6.7.0
+Requires-Dist: python-novaclient>=14.1.0
+Requires-Dist: python-openstackclient>=3.14.0
+Requires-Dist: python-ironicclient>=2.5.0
+Requires-Dist: SQLAlchemy>=1.2.5
+Requires-Dist: stevedore>=1.28.0
+Requires-Dist: taskflow>=3.8.0
+Requires-Dist: WebOb>=1.8.5
+Requires-Dist: WSME>=0.9.2
+Requires-Dist: networkx>=2.4
+Requires-Dist: microversion_parse>=0.2.1
+Requires-Dist: futurist>=1.8.0
+
+=======
+Watcher
+=======
+
+.. image:: https://governance.openstack.org/tc/badges/watcher.svg
+    :target: https://governance.openstack.org/tc/reference/tags/index.html
+
+.. Change things from this point on
+
+..
+      Except where otherwise noted, this document is licensed under Creative
+      Commons Attribution 3.0 License.  You can view the license at:
+
+          https://creativecommons.org/licenses/by/3.0/
+
+OpenStack Watcher provides a flexible and scalable resource optimization
+service for multi-tenant OpenStack-based clouds.
+Watcher provides a robust framework to realize a wide range of cloud
+optimization goals, including the reduction of data center
+operating costs, increased system performance via intelligent virtual machine
+migration, increased energy efficiency and more!
+
+* Free software: Apache license
+* Wiki: https://wiki.openstack.org/wiki/Watcher
+* Source: https://opendev.org/openstack/watcher
+* Bugs: https://bugs.launchpad.net/watcher
+* Documentation: https://docs.openstack.org/watcher/latest/
+* Release notes: https://docs.openstack.org/releasenotes/watcher/
+* Design specifications: https://specs.openstack.org/openstack/watcher-specs/
+

{python-watcher-12.0.0.0rc1 → python_watcher-12.1.0}/devstack/lib/watcher

@@ -338,6 +338,19 @@ function stop_watcher {
     done
 }
 
+# configure_tempest_for_watcher() - Configure Tempest for watcher
+function configure_tempest_for_watcher {
+    # Set default microversion for watcher-tempest-plugin
+    # Please make sure to update this when the microversion is updated, otherwise
+    # new tests may be skipped.
+    TEMPEST_WATCHER_MIN_MICROVERSION=${TEMPEST_WATCHER_MIN_MICROVERSION:-"1.0"}
+    TEMPEST_WATCHER_MAX_MICROVERSION=${TEMPEST_WATCHER_MAX_MICROVERSION:-"1.4"}
+
+    # Set microversion options in tempest.conf
+    iniset $TEMPEST_CONFIG optimize min_microversion $TEMPEST_WATCHER_MIN_MICROVERSION
+    iniset $TEMPEST_CONFIG optimize max_microversion $TEMPEST_WATCHER_MAX_MICROVERSION
+}
+
 # Restore xtrace
 $_XTRACE_WATCHER
 

{python-watcher-12.0.0.0rc1 → python_watcher-12.1.0}/devstack/plugin.sh

@@ -38,6 +38,9 @@ if is_service_enabled watcher-api watcher-decision-engine watcher-applier; then
         # Start the watcher components
         echo_summary "Starting watcher"
         start_watcher
+    elif [[ "$1" == "stack" && "$2" == "test-config" ]]; then
+        echo_summary "Configuring tempest for watcher"
+        configure_tempest_for_watcher
     fi
 
     if [[ "$1" == "unstack" ]]; then

python_watcher-12.1.0/python_watcher.egg-info/PKG-INFO

@@ -0,0 +1,97 @@
+Metadata-Version: 2.1
+Name: python-watcher
+Version: 12.1.0
+Summary: OpenStack Watcher provides a flexible and scalable resource optimization service for multi-tenant OpenStack-based clouds.
+Home-page: https://docs.openstack.org/watcher/latest/
+Author: OpenStack
+Author-email: openstack-discuss@lists.openstack.org
+Classifier: Environment :: OpenStack
+Classifier: Intended Audience :: Information Technology
+Classifier: Intended Audience :: System Administrators
+Classifier: License :: OSI Approved :: Apache Software License
+Classifier: Operating System :: POSIX :: Linux
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: Implementation :: CPython
+Classifier: Programming Language :: Python :: 3 :: Only
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Requires-Python: >=3.8
+License-File: LICENSE
+Requires-Dist: apscheduler>=3.5.1
+Requires-Dist: jsonpatch>=1.21
+Requires-Dist: keystoneauth1>=3.4.0
+Requires-Dist: jsonschema>=3.2.0
+Requires-Dist: keystonemiddleware>=4.21.0
+Requires-Dist: lxml>=4.5.1
+Requires-Dist: croniter>=0.3.20
+Requires-Dist: os-resource-classes>=0.4.0
+Requires-Dist: oslo.concurrency>=3.26.0
+Requires-Dist: oslo.cache>=1.29.0
+Requires-Dist: oslo.config>=6.8.0
+Requires-Dist: oslo.context>=2.21.0
+Requires-Dist: oslo.db>=4.44.0
+Requires-Dist: oslo.i18n>=3.20.0
+Requires-Dist: oslo.log>=3.37.0
+Requires-Dist: oslo.messaging>=14.1.0
+Requires-Dist: oslo.policy>=3.6.0
+Requires-Dist: oslo.reports>=1.27.0
+Requires-Dist: oslo.serialization>=2.25.0
+Requires-Dist: oslo.service>=1.30.0
+Requires-Dist: oslo.upgradecheck>=1.3.0
+Requires-Dist: oslo.utils>=3.36.0
+Requires-Dist: oslo.versionedobjects>=1.32.0
+Requires-Dist: PasteDeploy>=1.5.2
+Requires-Dist: pbr>=3.1.1
+Requires-Dist: pecan>=1.3.2
+Requires-Dist: PrettyTable>=0.7.2
+Requires-Dist: gnocchiclient>=7.0.1
+Requires-Dist: python-cinderclient>=3.5.0
+Requires-Dist: python-glanceclient>=2.9.1
+Requires-Dist: python-keystoneclient>=3.15.0
+Requires-Dist: python-monascaclient>=1.12.0
+Requires-Dist: python-neutronclient>=6.7.0
+Requires-Dist: python-novaclient>=14.1.0
+Requires-Dist: python-openstackclient>=3.14.0
+Requires-Dist: python-ironicclient>=2.5.0
+Requires-Dist: SQLAlchemy>=1.2.5
+Requires-Dist: stevedore>=1.28.0
+Requires-Dist: taskflow>=3.8.0
+Requires-Dist: WebOb>=1.8.5
+Requires-Dist: WSME>=0.9.2
+Requires-Dist: networkx>=2.4
+Requires-Dist: microversion_parse>=0.2.1
+Requires-Dist: futurist>=1.8.0
+
+=======
+Watcher
+=======
+
+.. image:: https://governance.openstack.org/tc/badges/watcher.svg
+    :target: https://governance.openstack.org/tc/reference/tags/index.html
+
+.. Change things from this point on
+
+..
+      Except where otherwise noted, this document is licensed under Creative
+      Commons Attribution 3.0 License.  You can view the license at:
+
+          https://creativecommons.org/licenses/by/3.0/
+
+OpenStack Watcher provides a flexible and scalable resource optimization
+service for multi-tenant OpenStack-based clouds.
+Watcher provides a robust framework to realize a wide range of cloud
+optimization goals, including the reduction of data center
+operating costs, increased system performance via intelligent virtual machine
+migration, increased energy efficiency and more!
+
+* Free software: Apache license
+* Wiki: https://wiki.openstack.org/wiki/Watcher
+* Source: https://opendev.org/openstack/watcher
+* Bugs: https://bugs.launchpad.net/watcher
+* Documentation: https://docs.openstack.org/watcher/latest/
+* Release notes: https://docs.openstack.org/releasenotes/watcher/
+* Design specifications: https://specs.openstack.org/openstack/watcher-specs/
+

{python-watcher-12.0.0.0rc1 → python_watcher-12.1.0}/python_watcher.egg-info/SOURCES.txt

@@ -244,6 +244,7 @@ releasenotes/notes/audit-versioned-notifications-api-bca7738e16954bad.yaml
 releasenotes/notes/automatic-triggering-audit-8a9b0540d547db60.yaml
 releasenotes/notes/background-jobs-ha-9d3cf3fe356f4705.yaml
 releasenotes/notes/bp-audit-scope-exclude-project-511a7720aac00dff.yaml
+releasenotes/notes/bug-2112187-763bae283e0b736d.yaml
 releasenotes/notes/build-baremetal-data-model-in-watcher-3023453a47b61dab.yaml
 releasenotes/notes/cdm-scoping-8d9c307bad46bfa1.yaml
 releasenotes/notes/centralise-config-opts-95670987dfbdb0e7.yaml

{python-watcher-12.0.0.0rc1 → python_watcher-12.1.0}/python_watcher.egg-info/entry_points.txt

@@ -78,4 +78,3 @@ taskflow = watcher.applier.workflow_engine.default:DefaultWorkFlowEngine
 
 [wsgi_scripts]
 watcher-api-wsgi = watcher.api.wsgi:initialize_wsgi_app
-

python_watcher-12.1.0/python_watcher.egg-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "8f8d5373", "is_release": true}

python_watcher-12.1.0/releasenotes/notes/bug-2112187-763bae283e0b736d.yaml

@@ -0,0 +1,47 @@
+---
+security:
+  - |
+    Watchers no longer forges requests on behalf of a tenant when
+    swapping volumes. Prior to this release watcher had 2 implementations
+    of moving a volume, it could use cinders volume migrate api or its own
+    internal implementation that directly calls nova volume attachment update
+    api. The former is safe and the recommend way to move volumes between
+    cinder storage backend the internal implementation was insecure, fragile
+    due to a lack of error handling and capable of deleting user data.
+
+    Insecure: the internal volume migration operation created a new keystone
+    user with a weak name and password and added it to the tenants project
+    with the admin role. It then used that user to forge request on behalf
+    of the tenant with admin right to swap the volume. if the applier was
+    restarted during the execution of this operation it would never be cleaned
+    up.
+
+    Fragile: the error handling was minimal, the swap volume api is async
+    so watcher has to poll for completion, there was no support to resume
+    that if interrupted of the time out was exceeded.
+
+    Data-loss: while the internal polling logic returned success or failure
+    watcher did not check the result, once the function returned it
+    unconditionally deleted the source volume. For larger volumes this
+    could result in irretrievable data loss.
+
+    Finally if a volume was swapped using the internal workflow it put
+    the nova instance in an out of sync state. If the VM was live migrated
+    after the swap volume completed successfully prior to a hard reboot
+    then the migration would fail or succeed and break tenant isolation.
+
+    see: https://bugs.launchpad.net/nova/+bug/2112187 for details.
+fixes:
+  - |
+    All code related to creating keystone user and granting roles has been
+    removed. The internal swap volume implementation has been removed and
+    replaced by cinders volume migrate api. Note as part of this change
+    Watcher will no longer attempt volume migrations or retypes if the
+    instance is in the `Verify Resize` task state. This resolves several
+    issues related to volume migration in the zone migration and
+    Storage capacity balance strategies. While efforts have been made
+    to maintain backward compatibility these changes are required to
+    address a security weakness in watcher's prior approach.
+
+    see: https://bugs.launchpad.net/nova/+bug/2112187 for more context.
+

{python-watcher-12.0.0.0rc1 → python_watcher-12.1.0}/tox.ini

@@ -8,7 +8,7 @@ basepython = python3
 usedevelop = True
 allowlist_externals = find
                       rm
-install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
+install_command = pip install -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1} {opts} {packages}
 setenv =
    VIRTUAL_ENV={envdir}
 deps =

{python-watcher-12.0.0.0rc1 → python_watcher-12.1.0}/watcher/applier/actions/volume_migration.py

@@ -17,14 +17,11 @@ import jsonschema
 
 from oslo_log import log
 
-from cinderclient import client as cinder_client
 from watcher._i18n import _
 from watcher.applier.actions import base
 from watcher.common import cinder_helper
 from watcher.common import exception
-from watcher.common import keystone_helper
 from watcher.common import nova_helper
-from watcher.common import utils
 from watcher import conf
 
 CONF = conf.CONF
@@ -70,8 +67,6 @@ class VolumeMigrate(base.BaseAction):
 
     def __init__(self, config, osc=None):
         super(VolumeMigrate, self).__init__(config)
-        self.temp_username = utils.random_string(10)
-        self.temp_password = utils.random_string(10)
         self.cinder_util = cinder_helper.CinderHelper(osc=self.osc)
         self.nova_util = nova_helper.NovaHelper(osc=self.osc)
 
@@ -134,83 +129,42 @@ class VolumeMigrate(base.BaseAction):
 
     def _can_swap(self, volume):
         """Judge volume can be swapped"""
+        # TODO(sean-k-mooney): rename this to _can_migrate and update
+        # tests to reflect that.
 
+        # cinder volume migration can migrate volumes that are not
+        # attached to instances or nova can migrate the data for cinder
+        # if the volume is in-use. If the volume has no attachments
+        # allow cinder to decided if it can be migrated.
         if not volume.attachments:
-            return False
-        instance_id = volume.attachments[0]['server_id']
-        instance_status = self.nova_util.find_instance(instance_id).status
-
-        if (volume.status == 'in-use' and
-                instance_status in ('ACTIVE', 'PAUSED', 'RESIZED')):
+            LOG.debug(f"volume: {volume.id} has no attachments")
             return True
 
-        return False
-
-    def _create_user(self, volume, user):
-        """Create user with volume attribute and user information"""
-        keystone_util = keystone_helper.KeystoneHelper(osc=self.osc)
-        project_id = getattr(volume, 'os-vol-tenant-attr:tenant_id')
-        user['project'] = project_id
-        user['domain'] = keystone_util.get_project(project_id).domain_id
-        user['roles'] = ['admin']
-        return keystone_util.create_user(user)
-
-    def _get_cinder_client(self, session):
-        """Get cinder client by session"""
-        return cinder_client.Client(
-            CONF.cinder_client.api_version,
-            session=session,
-            endpoint_type=CONF.cinder_client.endpoint_type)
-
-    def _swap_volume(self, volume, dest_type):
-        """Swap volume to dest_type
-
-           Limitation note: only for compute libvirt driver
-        """
-        if not dest_type:
-            raise exception.Invalid(
-                message=(_("destination type is required when "
-                           "migration type is swap")))
-
-        if not self._can_swap(volume):
-            raise exception.Invalid(
-                message=(_("Invalid state for swapping volume")))
-
-        user_info = {
-            'name': self.temp_username,
-            'password': self.temp_password}
-        user = self._create_user(volume, user_info)
-        keystone_util = keystone_helper.KeystoneHelper(osc=self.osc)
-        try:
-            session = keystone_util.create_session(
-                user.id, self.temp_password)
-            temp_cinder = self._get_cinder_client(session)
-
-            # swap volume
-            new_volume = self.cinder_util.create_volume(
-                temp_cinder, volume, dest_type)
-            self.nova_util.swap_volume(volume, new_volume)
-
-            # delete old volume
-            self.cinder_util.delete_volume(volume)
-
-        finally:
-            keystone_util.delete_user(user)
-
-        return True
+        # since it has attachments we need to validate nova's constraints
+        instance_id = volume.attachments[0]['server_id']
+        instance_status = self.nova_util.find_instance(instance_id).status
+        LOG.debug(
+            f"volume: {volume.id} is attached to instance: {instance_id} "
+            f"in instance status: {instance_status}")
+        # NOTE(sean-k-mooney): This used to allow RESIZED which
+        # is the resize_verify task state, that is not an acceptable time
+        # to migrate volumes, if nova does not block this in the API
+        # today that is probably a bug. PAUSED is also questionable but
+        # it should generally be safe.
+        return (volume.status == 'in-use' and
+                instance_status in ('ACTIVE', 'PAUSED'))
 
     def _migrate(self, volume_id, dest_node, dest_type):
-
         try:
             volume = self.cinder_util.get_volume(volume_id)
-            if self.migration_type == self.SWAP:
-                if dest_node:
-                    LOG.warning("dest_node is ignored")
-                return self._swap_volume(volume, dest_type)
+            # for backward compatibility map swap to migrate.
+            if self.migration_type in (self.SWAP, self.MIGRATE):
+                if not self._can_swap(volume):
+                    raise exception.Invalid(
+                        message=(_("Invalid state for swapping volume")))
+                return self.cinder_util.migrate(volume, dest_node)
             elif self.migration_type == self.RETYPE:
                 return self.cinder_util.retype(volume, dest_type)
-            elif self.migration_type == self.MIGRATE:
-                return self.cinder_util.migrate(volume, dest_node)
             else:
                 raise exception.Invalid(
                     message=(_("Migration of type '%(migration_type)s' is not "

{python-watcher-12.0.0.0rc1 → python_watcher-12.1.0}/watcher/common/context.py

@@ -11,12 +11,15 @@
 # under the License.
 
 from oslo_context import context
+from oslo_db.sqlalchemy import enginefacade
 from oslo_log import log
 from oslo_utils import timeutils
 
+
 LOG = log.getLogger(__name__)
 
 
+@enginefacade.transaction_context_provider
 class RequestContext(context.RequestContext):
     """Extends security contexts from the OpenStack common library."""
 

{python-watcher-12.0.0.0rc1 → python_watcher-12.1.0}/watcher/common/keystone_helper.py

@@ -15,8 +15,6 @@
 from oslo_log import log
 
 from keystoneauth1.exceptions import http as ks_exceptions
-from keystoneauth1 import loading
-from keystoneauth1 import session
 from watcher._i18n import _
 from watcher.common import clients
 from watcher.common import exception
@@ -90,35 +88,3 @@ class KeystoneHelper(object):
                     message=(_("Domain name seems ambiguous: %s") %
                              name_or_id))
             return domains[0]
-
-    def create_session(self, user_id, password):
-        user = self.get_user(user_id)
-        loader = loading.get_plugin_loader('password')
-        auth = loader.load_from_options(
-            auth_url=CONF.watcher_clients_auth.auth_url,
-            password=password,
-            user_id=user_id,
-            project_id=user.default_project_id)
-        return session.Session(auth=auth)
-
-    def create_user(self, user):
-        project = self.get_project(user['project'])
-        domain = self.get_domain(user['domain'])
-        _user = self.keystone.users.create(
-            user['name'],
-            password=user['password'],
-            domain=domain,
-            project=project,
-        )
-        for role in user['roles']:
-            role = self.get_role(role)
-            self.keystone.roles.grant(
-                role.id, user=_user.id, project=project.id)
-        return _user
-
-    def delete_user(self, user):
-        try:
-            user = self.get_user(user)
-            self.keystone.users.delete(user)
-        except exception.Invalid:
-            pass

{python-watcher-12.0.0.0rc1 → python_watcher-12.1.0}/watcher/common/utils.py

@@ -19,9 +19,7 @@
 import asyncio
 import datetime
 import inspect
-import random
 import re
-import string
 
 from croniter import croniter
 import eventlet
@@ -160,12 +158,8 @@ def extend_with_strict_schema(validator_class):
 StrictDefaultValidatingDraft4Validator = extend_with_default(
     extend_with_strict_schema(validators.Draft4Validator))
 
-Draft4Validator = validators.Draft4Validator
-
 
-def random_string(n):
-    return ''.join([random.choice(
-        string.ascii_letters + string.digits) for i in range(n)])
+Draft4Validator = validators.Draft4Validator
 
 
 # Some clients (e.g. MAAS) use asyncio, which isn't compatible with Eventlet.

{python-watcher-12.0.0.0rc1 → python_watcher-12.1.0}/watcher/db/sqlalchemy/alembic/env.py

@@ -13,8 +13,8 @@
 from logging import config as log_config
 
 from alembic import context
+from oslo_db.sqlalchemy import enginefacade
 
-from watcher.db.sqlalchemy import api as sqla_api
 from watcher.db.sqlalchemy import models
 
 # this is the Alembic Config object, which provides
@@ -43,7 +43,7 @@ def run_migrations_online():
     and associate a connection with the context.
 
     """
-    engine = sqla_api.get_engine()
+    engine = enginefacade.writer.get_engine()
     with engine.connect() as connection:
         context.configure(connection=connection,
                           target_metadata=target_metadata)