From a8b484780df0de74ba7ac381ca19c3713f790268 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Mon, 23 Sep 2024 21:02:42 +0200
Subject: [PATCH 1/2] python311Packages.osc-placement: init at 4.5.0

https://opendev.org/openstack/osc-placement
---
 .../python-modules/osc-placement/default.nix  | 73 +++++++++++++++++++
 .../python-openstackclient/default.nix        |  2 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 77 insertions(+)
 create mode 100644 pkgs/development/python-modules/osc-placement/default.nix

diff --git a/pkgs/development/python-modules/osc-placement/default.nix b/pkgs/development/python-modules/osc-placement/default.nix
new file mode 100644
index 000000000000..8165e098ddd3
--- /dev/null
+++ b/pkgs/development/python-modules/osc-placement/default.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  keystoneauth1,
+  openstackdocstheme,
+  osc-lib,
+  oslo-serialization,
+  oslo-utils,
+  oslotest,
+  pbr,
+  pythonOlder,
+  setuptools,
+  sphinxHook,
+  stestr,
+}:
+
+buildPythonPackage rec {
+  pname = "osc-placement";
+  version = "4.5.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "openstack";
+    repo = "osc-placement";
+    rev = "refs/tags/${version}";
+    hash = "sha256-PUwyYOg1dymlnnTr6TnxS42ISmbS00YfOdkL+5MbYFI=";
+  };
+
+  env.PBR_VERSION = version;
+
+  build-system = [
+    pbr
+    setuptools
+  ];
+
+  nativeBuildInputs = [
+    openstackdocstheme
+    sphinxHook
+  ];
+
+  sphinxBuilders = [ "man" ];
+
+  dependencies = [
+    keystoneauth1
+    osc-lib
+    oslo-utils
+    pbr
+  ];
+
+  nativeCheckInputs = [
+    oslo-serialization
+    oslotest
+    stestr
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+    stestr run
+    runHook postCheck
+  '';
+
+  pythonImportsCheck = [ "osc_placement" ];
+
+  meta = {
+    homepage = "https://opendev.org/openstack/osc-placement";
+    description = "OpenStackClient plugin for the Placement service";
+    license = lib.licenses.asl20;
+    maintainers = lib.teams.openstack.members;
+  };
+}
diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix
index 890fc02a1a88..3489b57aeefc 100644
--- a/pkgs/development/python-modules/python-openstackclient/default.nix
+++ b/pkgs/development/python-modules/python-openstackclient/default.nix
@@ -5,6 +5,7 @@
   ddt,
   openstackdocstheme,
   osc-lib,
+  osc-placement,
   pbr,
   python-barbicanclient,
   python-cinderclient,
@@ -74,6 +75,7 @@ buildPythonPackage rec {
     optional-dependencies = {
       # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst
       cli-plugins = [
+        osc-placement
         python-barbicanclient
         python-designateclient
         python-heatclient
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 091be094c5b2..56e148e7b4a1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9428,6 +9428,8 @@ self: super: with self; {
 
   osc-lib = callPackage ../development/python-modules/osc-lib { };
 
+  osc-placement = callPackage ../development/python-modules/osc-placement { };
+
   osc-sdk-python = callPackage ../development/python-modules/osc-sdk-python { };
 
   oschmod = callPackage ../development/python-modules/oschmod { };

From 19558c52e20139275af54d90e4ea7f1701201c44 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Mon, 23 Sep 2024 22:07:44 +0200
Subject: [PATCH 2/2] python311Packages.python-aodhclient: init at 3.6.0

https://docs.openstack.org/python-aodhclient/latest/
---
 .../python-aodhclient/default.nix             | 82 +++++++++++++++++++
 .../python-openstackclient/default.nix        |  2 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 86 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-aodhclient/default.nix

diff --git a/pkgs/development/python-modules/python-aodhclient/default.nix b/pkgs/development/python-modules/python-aodhclient/default.nix
new file mode 100644
index 000000000000..9c3b015a5374
--- /dev/null
+++ b/pkgs/development/python-modules/python-aodhclient/default.nix
@@ -0,0 +1,82 @@
+{
+  lib,
+  buildPythonPackage,
+  cliff,
+  fetchFromGitHub,
+  keystoneauth1,
+  openstackdocstheme,
+  osc-lib,
+  oslo-i18n,
+  oslo-serialization,
+  oslo-utils,
+  oslotest,
+  osprofiler,
+  pbr,
+  pyparsing,
+  pythonOlder,
+  setuptools,
+  sphinxHook,
+  stestr,
+}:
+
+buildPythonPackage rec {
+  pname = "python-aodhclient";
+  version = "3.6.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "openstack";
+    repo = "python-aodhclient";
+    rev = "refs/tags/${version}";
+    hash = "sha256-FArXBkDOY0Weu3Fm/M0Qgg0XHTy95MqlUidZ/hUZfB8=";
+  };
+
+  env.PBR_VERSION = version;
+
+  build-system = [
+    pbr
+    setuptools
+  ];
+
+  nativeBuildInputs = [
+    openstackdocstheme
+    sphinxHook
+  ];
+
+  sphinxBuilders = [ "man" ];
+
+  dependencies = [
+    cliff
+    keystoneauth1
+    osc-lib
+    oslo-i18n
+    oslo-serialization
+    oslo-utils
+    osprofiler
+    pbr
+    pyparsing
+  ];
+
+  nativeCheckInputs = [
+    oslotest
+    stestr
+  ];
+
+  checkPhase = ''
+    runHook preCheck
+    stestr run
+    runHook postCheck
+  '';
+
+  pythonImportsCheck = [ "aodhclient" ];
+
+  meta = {
+    homepage = "https://opendev.org/openstack/python-aodhclient";
+    description = "Client library for OpenStack Aodh API";
+    license = lib.licenses.asl20;
+    mainProgram = "aodh";
+    maintainers = lib.teams.openstack.members;
+  };
+}
diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix
index 3489b57aeefc..f7edf890d648 100644
--- a/pkgs/development/python-modules/python-openstackclient/default.nix
+++ b/pkgs/development/python-modules/python-openstackclient/default.nix
@@ -7,6 +7,7 @@
   osc-lib,
   osc-placement,
   pbr,
+  python-aodhclient,
   python-barbicanclient,
   python-cinderclient,
   python-designateclient,
@@ -76,6 +77,7 @@ buildPythonPackage rec {
       # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst
       cli-plugins = [
         osc-placement
+        python-aodhclient
         python-barbicanclient
         python-designateclient
         python-heatclient
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 56e148e7b4a1..78dcb00fd643 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12559,6 +12559,8 @@ self: super: with self; {
 
   python3-openid = callPackage ../development/python-modules/python3-openid { };
 
+  python-aodhclient = callPackage ../development/python-modules/python-aodhclient { };
+
   python-apt = callPackage ../development/python-modules/python-apt { };
 
   python-arango = callPackage ../development/python-modules/python-arango { };