python-watcher 12.0.0.0rc1__py3-none-any.whl → 13.0.0__py3-none-any.whl

{python_watcher-12.0.0.0rc1.dist-info → python_watcher-13.0.0.dist-info}/AUTHORS

@@ -47,6 +47,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>
@@ -87,6 +88,7 @@ Steve Wilkerson <sw5822@att.com>
 Sumit Jamgade <sjamgade@suse.com>
 Susanne Balle <sleipnir012@gmail.com>
 Swapnil Kulkarni (coolsvap) <me@coolsvap.net>
+Takashi Kajinami <kajinamit@oss.nttdata.com>
 Takashi Kajinami <tkajinam@redhat.com>
 Tatiana Kholkina <holkina@selectel.ru>
 Taylor Peoples <tpeoples@us.ibm.com>

{python_watcher-12.0.0.0rc1.dist-info → python_watcher-13.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-watcher
-Version: 12.0.0.0rc1
+Version: 13.0.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

{python_watcher-12.0.0.0rc1.dist-info → python_watcher-13.0.0.dist-info}/RECORD

@@ -1,8 +1,8 @@
-python_watcher-12.0.0.0rc1.data/data/etc/apache2/watcher,sha256=urybYUTb0kAVIvbm4WK5oDfXR82QSK2lyMl4Z9dCz4Q,1190
-python_watcher-12.0.0.0rc1.data/data/etc/watcher/README-watcher.conf.txt,sha256=EIa_sjXDyl1XSg0ovsFwUjqw0euS0N2PYn4HtyBGJME,131
-python_watcher-12.0.0.0rc1.data/data/etc/watcher/oslo-config-generator/watcher.conf,sha256=O7g1DZqgXvbQgkBfot0dR1ar1d-3SBkOU_ZK4Dz7SFc,406
-python_watcher-12.0.0.0rc1.data/data/etc/watcher/oslo-policy-generator/watcher-policy-generator.conf,sha256=ZfIuVdtrj7IZm2BrRQvAW3JOL_kqCiILf-vBmwX3ufw,76
-python_watcher-12.0.0.0rc1.data/scripts/watcher-api-wsgi,sha256=YcIpUO3iRVW6Fu3Md_ooAeHkmJJasG031naMdf8cv2A,1829
+python_watcher-13.0.0.data/data/etc/apache2/watcher,sha256=urybYUTb0kAVIvbm4WK5oDfXR82QSK2lyMl4Z9dCz4Q,1190
+python_watcher-13.0.0.data/data/etc/watcher/README-watcher.conf.txt,sha256=EIa_sjXDyl1XSg0ovsFwUjqw0euS0N2PYn4HtyBGJME,131
+python_watcher-13.0.0.data/data/etc/watcher/oslo-config-generator/watcher.conf,sha256=O7g1DZqgXvbQgkBfot0dR1ar1d-3SBkOU_ZK4Dz7SFc,406
+python_watcher-13.0.0.data/data/etc/watcher/oslo-policy-generator/watcher-policy-generator.conf,sha256=ZfIuVdtrj7IZm2BrRQvAW3JOL_kqCiILf-vBmwX3ufw,76
+python_watcher-13.0.0.data/scripts/watcher-api-wsgi,sha256=YcIpUO3iRVW6Fu3Md_ooAeHkmJJasG031naMdf8cv2A,1829
 watcher/__init__.py,sha256=Vs2olXPZ_IAV1rukHYRl3ITzYFBNXX9mIUtFXkMWYwg,640
 watcher/_i18n.py,sha256=-25OcpwjDCiYdFIUJh86S7Sg0fs3wMIIjEreaGUyCyY,1295
 watcher/version.py,sha256=3bUsLHmwjNgOJ9hfzy5yQ67UGFOriUNFJqyh8lGQazE,760
@@ -142,15 +142,15 @@ watcher/db/migration.py,sha256=luOV_QnQp1XvtKFrgIMmrn7NFPbOgIcDxOBDQt5wVzE,1636
 watcher/db/purge.py,sha256=cqC37xAcb18pEAdneQUcHdLMv8ZpC6FCS2iKr-CNmAQ,16858
 watcher/db/sqlalchemy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 watcher/db/sqlalchemy/alembic.ini,sha256=LzCgKVKhFQctG7OUdDzWHGKnwA7WkTCLame3foHscuE,975
-watcher/db/sqlalchemy/api.py,sha256=IHrOaf_2nZsurEJfv9YukPzBKmvQIMMJ8g6Q2TmOPfk,44322
-watcher/db/sqlalchemy/job_store.py,sha256=_pNekgw3AEdmd7ZIJ0avTae04Zxhq2UcGa90vvXvWeI,4441
+watcher/db/sqlalchemy/api.py,sha256=oFTonnHfPQ38NIRqoBgPs1J7OB1BW1qdjFrrMNJz_KE,44371
+watcher/db/sqlalchemy/job_store.py,sha256=LTRYP2pq5Lhkpuk9Bl20QZlxdaddA-GicEOT8uW-IPo,5407
 watcher/db/sqlalchemy/migration.py,sha256=VNPXd-8i3ib5Cqq43uAQegwYiuWREZnHvmJCEmnErAo,3676
 watcher/db/sqlalchemy/models.py,sha256=738iG47Amlb-QXpJhrNwpquQmjxIC-lqhOPaWa1ZTq8,10945
 watcher/db/sqlalchemy/alembic/README.rst,sha256=iME9Yux4ZAcstexKFPsv_g4fpdaarKcvtscInoAvKTU,1942
 watcher/db/sqlalchemy/alembic/env.py,sha256=D3nplgyG_dO0ikfBWhdDyBDZAYSY43kB-B88CcgeRMI,1769
 watcher/db/sqlalchemy/alembic/script.py.mako,sha256=D8kFI44_9vBJZrAYSkZxDTX2-S5Y-oEetEd9BKlo9S8,412
 watcher/db/sqlalchemy/alembic/versions/001_ocata.py,sha256=8ulT2iVUMn95fwLzeSrLfOYkwxaEOiBK26DVNMiUOM0,9500
-watcher/db/sqlalchemy/alembic/versions/0f6042416884_add_apscheduler_jobs.py,sha256=-9ukYV-DhSmAzq6Z72nk0sREtywmFVi0CqTf3FqTEgU,1172
+watcher/db/sqlalchemy/alembic/versions/0f6042416884_add_apscheduler_jobs.py,sha256=El0qEzHBFJVUKffmBnj84OPRdrh2dfT036Z9LBGzQ1s,1145
 watcher/db/sqlalchemy/alembic/versions/3cfc94cecf4e_add_name_for_audit.py,sha256=tCxWHYRSj9tOKG50WD8ok-lBmMavl_aPyoRKqL6dDnc,420
 watcher/db/sqlalchemy/alembic/versions/4b16194c56bc_add_start_end_time.py,sha256=ZIjX__JLBpxGpsPEAvqDSjxmdNH0M9Fj_sLyQ1sOdV0,547
 watcher/db/sqlalchemy/alembic/versions/52804f2498c4_add_hostname.py,sha256=W4iK-NtGb4Ku6jErsDYrUispfUGQLnGy9lHBje3DzP0,583
@@ -543,11 +543,11 @@ watcher/tests/objects/test_scoring_engine.py,sha256=y_crleFQFOUKrqT9tSI1NIP7eEMs
 watcher/tests/objects/test_service.py,sha256=w8r6qgLJd0Vp3B774BInkWij4qUbMiykisIRSaxiqaA,5100
 watcher/tests/objects/test_strategy.py,sha256=WoJYFQD0LU7vkUT2MMy1bx3S6eY458aTICjoGRiPccI,7364
 watcher/tests/objects/utils.py,sha256=WtBFlXWIBRvl1keAjz1GtrkUWppil2pFIA-RngcqA5c,8058
-python_watcher-12.0.0.0rc1.dist-info/AUTHORS,sha256=gYRreEvkTWbr4fksqrJEGcezpWZQYUY9Lq26sj1ptw4,7523
-python_watcher-12.0.0.0rc1.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
-python_watcher-12.0.0.0rc1.dist-info/METADATA,sha256=gZ9o8LXojGrfc9XW_JLZjdt2oY47rbJptpYFM4g5kpI,3933
-python_watcher-12.0.0.0rc1.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-python_watcher-12.0.0.0rc1.dist-info/entry_points.txt,sha256=FCdhj8D9hluy9jjmwnwmFVumvMeOCv6n_IoOCHF8-WU,4397
-python_watcher-12.0.0.0rc1.dist-info/pbr.json,sha256=_CHwyny91S779rt6EvXu7mgYOxMSJcJoA0C7KuJd7to,47
-python_watcher-12.0.0.0rc1.dist-info/top_level.txt,sha256=O2B7Sbzshq5s-tZxb2a7VETvMDiJItSYieAiJ6Jm5yY,8
-python_watcher-12.0.0.0rc1.dist-info/RECORD,,
+python_watcher-13.0.0.dist-info/AUTHORS,sha256=8KbNuzGx0Rz8hCG-A51vIMwOP1sgVLnnjfkNo9B2R7I,7606
+python_watcher-13.0.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
+python_watcher-13.0.0.dist-info/METADATA,sha256=3Hwq_SDSurkCVRSq59geMA6ohByFAYHboXP5K_E154s,3928
+python_watcher-13.0.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
+python_watcher-13.0.0.dist-info/entry_points.txt,sha256=FCdhj8D9hluy9jjmwnwmFVumvMeOCv6n_IoOCHF8-WU,4397
+python_watcher-13.0.0.dist-info/pbr.json,sha256=_JP02CG21G2RH9wiiwMxaUNwaAiW-AzdgEUq2QlEvQk,47
+python_watcher-13.0.0.dist-info/top_level.txt,sha256=O2B7Sbzshq5s-tZxb2a7VETvMDiJItSYieAiJ6Jm5yY,8
+python_watcher-13.0.0.dist-info/RECORD,,

python_watcher-13.0.0.dist-info/pbr.json

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

watcher/db/sqlalchemy/alembic/versions/0f6042416884_add_apscheduler_jobs.py

@@ -28,7 +28,7 @@ def upgrade():
 
     op.create_table(
         'apscheduler_jobs',
-        sa.Column('id', sa.Unicode(191, _warn_on_bytestring=False),
+        sa.Column('id', sa.Unicode(191),
                   nullable=False),
         sa.Column('next_run_time', sa.Float(25), index=True),
         sa.Column('job_state', sa.LargeBinary, nullable=False),

watcher/db/sqlalchemy/api.py

@@ -44,11 +44,7 @@ _FACADE = None
 def _create_facade_lazily():
     global _FACADE
     if _FACADE is None:
-        # FIXME(amoralej): Remove autocommit=True (and ideally use of
-        # LegacyEngineFacade) asap since it's not compatible with SQLAlchemy
-        # 2.0.
-        _FACADE = db_session.EngineFacade.from_config(CONF,
-                                                      autocommit=True)
+        _FACADE = db_session.EngineFacade.from_config(CONF)
     return _FACADE
 
 
@@ -248,30 +244,36 @@ class Connection(api.BaseConnection):
         for relationship in relationships:
             if not relationship.uselist:
                 # We have a One-to-X relationship
-                query = query.options(joinedload(relationship.key))
+                query = query.options(joinedload(
+                    getattr(model, relationship.key)))
         return query
 
     def _create(self, model, values):
-        obj = model()
-        cleaned_values = {k: v for k, v in values.items()
-                          if k not in self._get_relationships(model)}
-        obj.update(cleaned_values)
-        obj.save()
+        session = get_session()
+        with session.begin():
+            obj = model()
+            cleaned_values = {k: v for k, v in values.items()
+                              if k not in self._get_relationships(model)}
+            obj.update(cleaned_values)
+            obj.save(session=session)
+            session.commit()
         return obj
 
     def _get(self, context, model, fieldname, value, eager):
-        query = model_query(model)
-        if eager:
-            query = self._set_eager_options(model, query)
+        session = get_session()
+        with session.begin():
+            query = model_query(model, session=session)
+            if eager:
+                query = self._set_eager_options(model, query)
 
-        query = query.filter(getattr(model, fieldname) == value)
-        if not context.show_deleted:
-            query = query.filter(model.deleted_at.is_(None))
+            query = query.filter(getattr(model, fieldname) == value)
+            if not context.show_deleted:
+                query = query.filter(model.deleted_at.is_(None))
 
-        try:
-            obj = query.one()
-        except exc.NoResultFound:
-            raise exception.ResourceNotFound(name=model.__name__, id=value)
+            try:
+                obj = query.one()
+            except exc.NoResultFound:
+                raise exception.ResourceNotFound(name=model.__name__, id=value)
 
         return obj
 

watcher/db/sqlalchemy/job_store.py

@@ -22,6 +22,7 @@ from apscheduler.jobstores.base import ConflictingIdError
 from apscheduler.jobstores import sqlalchemy
 from apscheduler.util import datetime_to_utc_timestamp
 from apscheduler.util import maybe_ref
+from apscheduler.util import utc_timestamp_to_datetime
 
 from watcher.common import context
 from watcher.common import service
@@ -32,7 +33,7 @@ try:
 except ImportError:  # pragma: nocover
     import pickle
 
-from sqlalchemy import Table, MetaData, select, and_
+from sqlalchemy import Table, MetaData, select, and_, null
 from sqlalchemy.exc import IntegrityError
 
 
@@ -58,8 +59,7 @@ class WatcherJobStore(sqlalchemy.SQLAlchemyJobStore):
         super(WatcherJobStore, self).__init__(url, engine, tablename,
                                               metadata, pickle_protocol)
         metadata = maybe_ref(metadata) or MetaData()
-        self.jobs_t = Table(tablename, metadata, autoload=True,
-                            autoload_with=engine)
+        self.jobs_t = Table(tablename, metadata, autoload_with=engine)
         service_ident = service.ServiceHeartbeat.get_service_name()
         self.tag = tag or {'host': service_ident[0], 'name': service_ident[1]}
         self.service_id = objects.Service.list(context=context.make_context(),
@@ -79,7 +79,8 @@ class WatcherJobStore(sqlalchemy.SQLAlchemyJobStore):
             'tag': jsonutils.dumps(self.tag)
         })
         try:
-            self.engine.execute(insert)
+            with self.engine.begin() as conn:
+                conn.execute(insert)
         except IntegrityError:
             raise ConflictingIdError(job.id)
 
@@ -88,20 +89,36 @@ class WatcherJobStore(sqlalchemy.SQLAlchemyJobStore):
         self._fix_paused_jobs_sorting(jobs)
         return jobs
 
+    def get_next_run_time(self):
+        selectable = select(self.jobs_t.c.next_run_time).\
+            where(self.jobs_t.c.next_run_time != null()).\
+            order_by(self.jobs_t.c.next_run_time).limit(1)
+        with self.engine.begin() as connection:
+            # NOTE(danms): The apscheduler implementation of this gets a
+            # decimal.Decimal back from scalar() which causes
+            # utc_timestamp_to_datetime() to choke since it is expecting a
+            # python float. Assume this is SQLAlchemy 2.0 stuff, so just
+            # coerce to a float here.
+            next_run_time = connection.execute(selectable).scalar()
+            return utc_timestamp_to_datetime(float(next_run_time)
+                                             if next_run_time is not None
+                                             else None)
+
     def _get_jobs(self, *conditions):
         jobs = []
         conditions += (self.jobs_t.c.service_id == self.service_id,)
         selectable = select(
-            [self.jobs_t.c.id, self.jobs_t.c.job_state, self.jobs_t.c.tag]
+            self.jobs_t.c.id, self.jobs_t.c.job_state, self.jobs_t.c.tag
         ).order_by(self.jobs_t.c.next_run_time).where(and_(*conditions))
         failed_job_ids = set()
-        for row in self.engine.execute(selectable):
-            try:
-                jobs.append(self._reconstitute_job(row.job_state))
-            except Exception:
-                self._logger.exception(
-                    'Unable to restore job "%s" -- removing it', row.id)
-                failed_job_ids.add(row.id)
+        with self.engine.begin() as conn:
+            for row in conn.execute(selectable):
+                try:
+                    jobs.append(self._reconstitute_job(row.job_state))
+                except Exception:
+                    self._logger.exception(
+                        'Unable to restore job "%s" -- removing it', row.id)
+                    failed_job_ids.add(row.id)
 
         # Remove all the jobs we failed to restore
         if failed_job_ids:

python_watcher-12.0.0.0rc1.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "9d58a6d4", "is_release": true}