watcher-tempest-plugin 3.2.0__tar.gz → 3.4.0__tar.gz

{watcher-tempest-plugin-3.2.0 → watcher_tempest_plugin-3.4.0}/.zuul.yaml

@@ -3,33 +3,35 @@
     templates:
       - check-requirements
       - tempest-plugin-jobs
+      - publish-openstack-docs-pti
+      - release-notes-jobs-python3
     check:
       jobs:
         - watcherclient-tempest-functional
         - watcher-tempest-functional
         - watcher-tempest-actuator
         - watcher-tempest-strategies
+        - watcher-tempest-functional-2024-2
         - watcher-tempest-functional-2024-1
         - watcher-tempest-functional-2023-2
-        - watcher-tempest-functional-2023-1
     gate:
       jobs:
         - watcher-tempest-functional
 
 - job:
-    name: watcher-tempest-functional-2024-1
+    name: watcher-tempest-functional-2024-2
     parent: watcher-tempest-functional
     nodeset: openstack-single-node-jammy
-    override-checkout: stable/2024.1
+    override-checkout: stable/2024.2
 
 - job:
-    name: watcher-tempest-functional-2023-2
+    name: watcher-tempest-functional-2024-1
     parent: watcher-tempest-functional
     nodeset: openstack-single-node-jammy
-    override-checkout: stable/2023.2
+    override-checkout: stable/2024.1
 
 - job:
-    name: watcher-tempest-functional-2023-1
+    name: watcher-tempest-functional-2023-2
     parent: watcher-tempest-functional
     nodeset: openstack-single-node-jammy
-    override-checkout: stable/2023.1
+    override-checkout: stable/2023.2

{watcher-tempest-plugin-3.2.0 → watcher_tempest_plugin-3.4.0}/AUTHORS

@@ -2,9 +2,11 @@
 Alexander Chadin <a.chadin@servionica.ru>
 Andrea Frittoli <andrea.frittoli@gmail.com>
 Andreas Jaeger <aj@suse.com>
+Chandan Kumar (raukadah) <chkumar@redhat.com>
 Chandan Kumar <chkumar@redhat.com>
 Dantali0n <info@dantalion.nl>
 David TARDIVEL <David.TARDIVEL@b-com.com>
+Douglas Viroel <viroel@gmail.com>
 Drew Thorstensen <thorst@us.ibm.com>
 Ghanshyam Mann <gmann@ghanshyammann.com>
 Gábor Antal <antal@inf.u-szeged.hu>
@@ -13,12 +15,15 @@ Hidekazu Nakamura <hid-nakamura@vf.jp.nec.com>
 Jaewoo Park <jp655p@att.com>
 Ken'ichi Ohmichi <ken-oomichi@wx.jp.nec.com>
 Larry Rensing <lr699s@att.com>
+Martin Kopec <mkopec@redhat.com>
 Michael Gugino <michael.gugino@walmart.com>
 Ngo Quoc Cuong <cuongnq@vn.fujitsu.com>
 Nguyen Hai <nguyentrihai93@gmail.com>
 Nishant Kumar <nishant.e.kumar@ericsson.com>
+Roman Popelka <rpopelka@redhat.com>
 ShangXiao <shangxiaobj@inspur.com>
 Sumit Jamgade <sjamgade@suse.com>
+Takashi Kajinami <kajinamit@oss.nttdata.com>
 Tin Lam <tl3438@att.com>
 Vieri <15050873171@163.com>
 Vincent Françoise <Vincent.FRANCOISE@b-com.com>
@@ -36,6 +41,7 @@ licanwei <li.canwei2@zte.com.cn>
 limin.lc <limin.lc@inspur.com>
 liyou01 <liyou01@inspur.com>
 maaoyu <maaoyu@inspur.com>
+malinga tembo <mtembo@redhat.com>
 qinchunhua <qin.chunhua@zte.com.cn>
 qingszhao <zhao.daqing@99cloud.net>
 rajat29 <rajat.sharma@nectechnologies.in>

{watcher-tempest-plugin-3.2.0 → watcher_tempest_plugin-3.4.0}/CONTRIBUTING.rst

@@ -1,17 +1,17 @@
 If you would like to contribute to the development of OpenStack, you must
-follow the steps in this page:
+follow the steps on this page:
 
-   https://docs.openstack.org/infra/manual/developers.html
+   https://docs.opendev.org/opendev/infra-manual/latest/developers.html
 
 If you already have a good understanding of how the system works and your
 OpenStack accounts are set up, you can skip to the development workflow
 section of this documentation to learn how changes to OpenStack should be
 submitted for review via the Gerrit tool:
 
-   https://docs.openstack.org/infra/manual/developers.html#development-workflow
+   https://docs.opendev.org/opendev/infra-manual/latest/developers.html#development-workflow
 
 Pull requests submitted through GitHub will be ignored.
 
 Bugs should be filed on Launchpad, not GitHub:
 
-   https://bugs.launchpad.net/Tempest plugin watcher-tempest-plugin
+   https://bugs.launchpad.net/watcher-tempest-plugin

{watcher-tempest-plugin-3.2.0 → watcher_tempest_plugin-3.4.0}/ChangeLog

@@ -1,6 +1,33 @@
 CHANGES
 =======
 
+3.4.0
+-----
+
+* Move make\_host\_statistic to the correct strategy
+* Small improvements to prometheus\_client and zone migration test
+* Add a check for instances in the compute model
+* Add support to run promtool in a podified deployment
+* Add support for prometheus datasource in scenario tests
+* tox: Drop envdir
+* Add new config option optimize.datasource
+* Drop bandit B320 profile to fix pep8 job
+* Update documentation and add a job to publish it
+* Remove stable/2023.1 job from master gate
+* Drop translation sections
+* Support py3.12 and drop py3.8
+* Remove scenario manager
+* Remove create\_volume & create\_volume\_type
+* Remove create\_server method
+* Remove \_create\_port and create\_keypair methods
+* Bump tempest minimal version to 27.0.0 or higher
+
+3.3.0
+-----
+
+* Add stable/2024.2 jobs on master gate
+* Drop unnecessary 'x' bit from doc config file
+
 3.2.0
 -----
 

watcher_tempest_plugin-3.4.0/PKG-INFO

@@ -0,0 +1,47 @@
+Metadata-Version: 2.1
+Name: watcher-tempest-plugin
+Version: 3.4.0
+Summary: Tempest plugin watcher-tempest-plugin
+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.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.9
+License-File: LICENSE
+Requires-Dist: pbr>=3.1.1
+Requires-Dist: oslo.log>=3.36.0
+Requires-Dist: oslo.utils>=3.33.0
+Requires-Dist: tempest>=27.0.0
+Requires-Dist: os-traits>=0.15.0
+
+======================
+watcher-tempest-plugin
+======================
+
+This repository contains a `Tempest`_ `test plugin`_ to verify the
+functionality of the `Watcher`_ service.
+
+See the following docs to learn more:
+
+* Free software: Apache license
+* Documentation: https://docs.openstack.org/watcher-tempest-plugin/latest/
+* Release notes: https://docs.openstack.org/releasenotes/watcher-tempest-plugin/
+* Source: https://opendev.org/openstack/watcher-tempest-plugin
+* Bugs: https://bugs.launchpad.net/watcher plugin watcher-tempest-plugin
+
+.. _Tempest: https://docs.openstack.org/tempest
+.. _test plugin: https://docs.openstack.org/tempest/latest/plugin.html
+.. _Watcher: https://docs.openstack.org/watcher/latest/
+

watcher_tempest_plugin-3.4.0/README.rst

@@ -0,0 +1,19 @@
+======================
+watcher-tempest-plugin
+======================
+
+This repository contains a `Tempest`_ `test plugin`_ to verify the
+functionality of the `Watcher`_ service.
+
+See the following docs to learn more:
+
+* Free software: Apache license
+* Documentation: https://docs.openstack.org/watcher-tempest-plugin/latest/
+* Release notes: https://docs.openstack.org/releasenotes/watcher-tempest-plugin/
+* Source: https://opendev.org/openstack/watcher-tempest-plugin
+* Bugs: https://bugs.launchpad.net/watcher plugin watcher-tempest-plugin
+
+.. _Tempest: https://docs.openstack.org/tempest
+.. _test plugin: https://docs.openstack.org/tempest/latest/plugin.html
+.. _Watcher: https://docs.openstack.org/watcher/latest/
+

{watcher-tempest-plugin-3.2.0 → watcher_tempest_plugin-3.4.0}/doc/source/readme.rst

@@ -20,14 +20,15 @@ Tempest installation
 
 To install Tempest you can issue the following commands::
 
-    $ git clone https://github.com/openstack/tempest/
+    $ git clone https://opendev.org/openstack/tempest
     $ cd tempest/
     $ pip install .
 
-The folder you are into now will be called ``<TEMPEST_DIR>`` from now onwards.
+The folder's path you are now in will be called ``<TEMPEST_DIR>`` from now
+onwards.
 
-Please note that although it is fully working outside a virtual environment, it
-is recommended to install within a `venv`.
+Please note that although it is fully working outside a `virtual environment`_,
+it is recommended to install within a `venv`.
 
 
 Watcher Tempest testing setup
@@ -38,7 +39,7 @@ following command::
 
     $  pip install -e <WATCHER_SRC_DIR>
 
-Then setup a local working environment (here ``watcher-cloud``) for running
+Then set up a local working environment (here ``watcher-cloud``) for running
 Tempest for Watcher which shall contain the configuration for your OpenStack
 integration platform.
 
@@ -58,7 +59,7 @@ issue the following commands::
     $ cd <TEMPEST_DIR>/watcher-cloud/etc
     $ cp tempest.conf.sample tempest.conf
 
-At this point you need to edit the ``watcher-cloud/etc/tempest.conf``
+At this point, you need to edit the ``watcher-cloud/etc/tempest.conf``
 file as described in the `Tempest configuration guide`_.
 Shown below is a minimal configuration you need to set within your
 ``tempest.conf`` configuration file which can get you started.
@@ -85,8 +86,8 @@ You now have the minimum configuration for running Watcher Tempest tests on a
 single node.
 
 Since deploying Watcher with only a single compute node is not very useful, a
-few more configuration have to be set in your ``tempest.conf`` file in order to
-enable the execution of multi-node scenarios::
+few more configurations have to be set in your ``tempest.conf`` file in order
+to enable the execution of multi-node scenarios::
 
     [compute]
     # To indicate Tempest test that you have provided enough compute nodes
@@ -117,13 +118,13 @@ To run only these tests in Tempest, you can then issue these commands::
 
     $ tempest run --config-file watcher-cloud/etc/tempest.conf --regex watcher_tempest_plugin
 
-Or alternatively the following commands if you are::
+Alternatively, the following commands if you are in the Tempest directory::
 
     $ cd <TEMPEST_DIR>/watcher-cloud
     $ tempest run --regex watcher_tempest_plugin
 
-To run a single test case, go to Tempest directory, then run with test case
-name, e.g.::
+To run a single test case, go to the Tempest directory, then run with the test
+case name, e.g.::
 
     $ cd <TEMPEST_DIR>
     $ tempest run --config-file watcher-cloud/etc/tempest.conf --regex \
@@ -136,9 +137,20 @@ before you can do so, you need to follow the Tempest explanation on running
     $ export TEMPEST_CONFIG_DIR=<TEMPEST_DIR>/watcher-cloud/etc/
     $ tox -eall-plugin watcher
 
-.. _tox with plugins: https://docs.openstack.org/tempest/latest/plugin.html#notes-for-using-plugins-with-virtualenvs
+.. _tox with plugins: https://docs.openstack.org/tempest/latest/plugins/plugin.html#notes-for-using-plugins-with-virtualenvs
 
 And, to run a specific test::
 
     $ export TEMPEST_CONFIG_DIR=<TEMPEST_DIR>/watcher-cloud/etc/
     $ tox -eall-plugin watcher_tempest_plugin.tests.api.admin.test_audit_template.TestCreateDeleteAuditTemplate.test_create_audit_template
+
+Watcherclient Tempest tests execution
+-------------------------------------
+
+To run Watcherclient functional tests you need to execute ``tempest run`` command::
+
+    $ tempest run --regex watcher_tempest_plugin.tests.client_functional
+
+You can run specified test(s) by using a regular expression::
+
+    $ tempest run --regex watcher_tempest_plugin.tests.client_functional.v1.test_action.ActionTests.test_action_list

watcher_tempest_plugin-3.4.0/releasenotes/notes/drop-python38-support-eeb09a8bc0170ce2.yaml

@@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    Python 3.8 support has been dropped. Last release of
+    watcher-tempest-plugin to support python 3.8 is 3.2.0.
+    The minimum version of Python now supported is Python 3.9.

{watcher-tempest-plugin-3.2.0 → watcher_tempest_plugin-3.4.0}/requirements.txt

@@ -5,5 +5,5 @@
 pbr>=3.1.1 # Apache-2.0
 oslo.log>=3.36.0 # Apache-2.0
 oslo.utils>=3.33.0 # Apache-2.0
-tempest>=17.1.0 # Apache-2.0
+tempest>=27.0.0 # Apache-2.0
 os-traits>=0.15.0 # Apache-2.0

{watcher-tempest-plugin-3.2.0 → watcher_tempest_plugin-3.4.0}/setup.cfg

@@ -6,7 +6,7 @@ description_file =
 author = OpenStack
 author_email = openstack-discuss@lists.openstack.org
 home_page = https://docs.openstack.org/watcher/latest/
-python_requires = >=3.6
+python_requires = >=3.9
 classifier = 
 	Environment :: OpenStack
 	Intended Audience :: Information Technology
@@ -17,27 +17,15 @@ classifier =
 	Programming Language :: Python :: Implementation :: CPython
 	Programming Language :: Python :: 3 :: Only
 	Programming Language :: Python :: 3
-	Programming Language :: Python :: 3.6
-	Programming Language :: Python :: 3.7
+	Programming Language :: Python :: 3.9
+	Programming Language :: Python :: 3.10
+	Programming Language :: Python :: 3.11
+	Programming Language :: Python :: 3.12
 
 [files]
 packages = 
 	watcher_tempest_plugin
 
-[compile_catalog]
-directory = watcher-tempest-plugin/locale
-domain = watcher-tempest-plugin
-
-[update_catalog]
-domain = watcher-tempest-plugin
-output_dir = watcher-tempest-plugin/locale
-input_file = watcher-tempest-plugin/locale/watcher-tempest-plugin.pot
-
-[extract_messages]
-keywords = _ gettext ngettext l_ lazy_gettext
-mapping_file = babel.cfg
-output_file = watcher-tempest-plugin/locale/watcher-tempest-plugin.pot
-
 [entry_points]
 tempest.test_plugins = 
 	watcher_tests = watcher_tempest_plugin.plugin:WatcherTempestPlugin

{watcher-tempest-plugin-3.2.0 → watcher_tempest_plugin-3.4.0}/tox.ini

@@ -9,7 +9,6 @@ basepython = python3
 usedevelop = True
 install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} {opts} {packages}
 setenv =
-   VIRTUAL_ENV={envdir}
    PYTHONWARNINGS=default::DeprecationWarning
 deps =
     -r{toxinidir}/test-requirements.txt
@@ -19,7 +18,7 @@ commands = stestr run --slowest {posargs}
 commands =
     doc8 doc/source/ CONTRIBUTING.rst HACKING.rst README.rst
     flake8
-    bandit -r watcher_tempest_plugin -x tests -n5 -ll -s B320
+    bandit -r watcher_tempest_plugin -x tests -n5 -ll
 
 [testenv:cover]
 setenv =
@@ -41,7 +40,6 @@ deps =
 commands = sphinx-build -W -b html doc/source doc/build/html
 
 [testenv:pdf-docs]
-envdir = {toxworkdir}/docs
 deps = {[testenv:docs]deps}
 allowlist_externals =
   rm
@@ -60,7 +58,7 @@ commands = oslo_debug_helper {posargs}
 
 [testenv:bandit]
 deps = -r{toxinidir}/test-requirements.txt
-commands = bandit -r watcher_tempest_plugin -x tests -n5 -ll -s B320
+commands = bandit -r watcher_tempest_plugin -x tests -n5 -ll
 
 show-source = True
 ignore = E123,E125

watcher_tempest_plugin-3.4.0/watcher_tempest_plugin/config.py

@@ -0,0 +1,112 @@
+# -*- encoding: utf-8 -*-
+# Copyright (c) 2016 b<>com
+#
+# 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.
+
+from oslo_config import cfg
+
+
+service_option = cfg.BoolOpt("watcher",
+                             default=True,
+                             help="Whether or not watcher is expected to be "
+                                  "available")
+
+optimization_group = cfg.OptGroup(name="optimize",
+                                  title="Watcher Service Options")
+
+OptimizationGroup = [
+    cfg.StrOpt(
+        "datasource",
+        default="gnocchi",
+        choices=["gnocchi", "prometheus", ""],
+        help="Name of the data source used with the Watcher Service. "
+             "Tempest will retrieve and add metrics from/to this data "
+             "source when running Strategy tests. When running "
+             "tests that do not require instance or host metrics, "
+             "you can define this option to an empty string."),
+    cfg.StrOpt(
+        "openstack_type",
+        default="devstack",
+        choices=["devstack", "podified"],
+        help="Type of OpenStack deployment.",
+    ),
+    # Proxy host configuration
+    cfg.StrOpt(
+        "proxy_host_address",
+        default="",
+        help="A proxy host to run extra commands for some datasources.",
+    ),
+    cfg.StrOpt(
+        "proxy_host_user",
+        default="",
+        help="User of the proxy host to run extra commands for "
+             "some datasources.",
+    ),
+    cfg.StrOpt(
+        "proxy_host_pkey",
+        default="",
+        help="Path to a private key to access the proxy host.",
+    ),
+    cfg.StrOpt(
+        "proxy_host_pkey_type",
+        default="rsa",
+        help="Private key type to be used to access the proxy host.",
+    ),
+    # Prometheus datasource configuration
+    cfg.StrOpt(
+        "prometheus_host",
+        default="127.0.0.1",
+        help="The hostname or IP address for the prometheus server.",
+    ),
+    cfg.StrOpt(
+        "prometheus_port",
+        default="9090",
+        help="The port number used by the prometheus server.",
+    ),
+    cfg.StrOpt(
+        "prometheus_promtool",
+        default="promtool",
+        help="The promtool binary path in the host.",
+    ),
+    cfg.BoolOpt(
+        "prometheus_ssl_enabled",
+        default=False,
+        help="Whether or not SSL is enabled in prometheus server.",
+    ),
+    cfg.StrOpt(
+        "prometheus_ssl_cert_dir",
+        default="",
+        help="Path to directory that constains certificates needed to "
+             "interact with the Prometheus server.",
+    ),
+    cfg.StrOpt(
+        "prometheus_fqdn_label",
+        default="fqdn",
+        help="The label that Prometheus uses to store the fqdn of "
+             "exporters.",
+    ),
+    # Podified control plane configuration
+    cfg.StrOpt(
+        "podified_kubeconfig_path",
+        default="",
+        help="Path to a kubeconfig file, to run 'oc' commands in a "
+             "podified control plane environment."
+    ),
+    cfg.StrOpt(
+        "podified_namespace",
+        default="openstack",
+        help="Namespace where OpenStack is deployed in a podified "
+             "control plane environment."
+    ),
+]

{watcher-tempest-plugin-3.2.0 → watcher_tempest_plugin-3.4.0}/watcher_tempest_plugin/infra_optim_clients.py

@@ -24,6 +24,7 @@ from tempest.lib.common import rest_client
 from tempest.lib.services.placement import placement_client
 
 from watcher_tempest_plugin.services.infra_optim.v1.json import client as ioc
+from watcher_tempest_plugin.services.metric import prometheus_client as pc
 from watcher_tempest_plugin.services.metric.v1.json import client as gc
 
 CONF = config.CONF
@@ -39,6 +40,22 @@ class BaseManager(clients.Manager, metaclass=abc.ABCMeta):
             self.auth_provider, 'metric', CONF.identity.region)
         self.placement_client = ExtendPlacementClient(
             self.auth_provider, 'placement', CONF.identity.region)
+        prom_ssl = "s" if CONF.optimize.prometheus_ssl_enabled else ""
+        self.prometheus_client = pc.PromtoolClient(
+            "http{}://{}:{}".format(prom_ssl,
+                                    CONF.optimize.prometheus_host,
+                                    CONF.optimize.prometheus_port),
+            promtool_path=CONF.optimize.prometheus_promtool,
+            openstack_type=CONF.optimize.openstack_type,
+            proxy_host_address=CONF.optimize.proxy_host_address,
+            proxy_host_user=CONF.optimize.proxy_host_user,
+            proxy_host_pkey=CONF.optimize.proxy_host_pkey,
+            proxy_host_pkey_type=CONF.optimize.proxy_host_pkey_type,
+            podified_ns=CONF.optimize.podified_namespace,
+            podified_kubeconfig=CONF.optimize.podified_kubeconfig_path,
+            prometheus_ssl_cert=CONF.optimize.prometheus_ssl_cert_dir,
+            prometheus_fqdn_label=CONF.optimize.prometheus_fqdn_label,
+        )
 
 
 class AdminManager(BaseManager):

{watcher-tempest-plugin-3.2.0 → watcher_tempest_plugin-3.4.0}/watcher_tempest_plugin/plugin.py

@@ -30,5 +30,12 @@ class WatcherTempestPlugin(plugins.TempestPlugin):
         conf.register_opt(watcher_config.service_option,
                           group='service_available')
 
+        conf.register_group(watcher_config.optimization_group)
+        conf.register_opts(watcher_config.OptimizationGroup,
+                           watcher_config.optimization_group)
+
     def get_opt_lists(self):
-        return [('service_available', [watcher_config.service_option])]
+        return [('service_available', [watcher_config.service_option]),
+                (watcher_config.optimization_group.name,
+                watcher_config.OptimizationGroup)
+                ]