From 14972080fd8362c0f624cc43ead3dcf346e52d39 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Thu, 21 Sep 2023 14:28:37 +0100 Subject: [PATCH] Implement add_consumer, remove_consumer KeyManager APIs These were introduced in Bobcat but later reverted [1]. Add them now in preparation for a future major version bump of Castellan. [1] https://review.opendev.org/c/openstack/castellan/+/895502/ Change-Id: I7565523d052d48109c7e70490c2c31b9944d2fc1 Signed-off-by: Stephen Finucane --- nova/keymgr/conf_key_mgr.py | 10 ++++++++++ nova/tests/functional/libvirt/test_vtpm.py | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/nova/keymgr/conf_key_mgr.py b/nova/keymgr/conf_key_mgr.py index 97f8a788ec87..a9fe53cf26ff 100644 --- a/nova/keymgr/conf_key_mgr.py +++ b/nova/keymgr/conf_key_mgr.py @@ -129,3 +129,13 @@ class ConfKeyManager(key_manager.KeyManager): reason="cannot delete non-existent key") LOG.warning("Not deleting key %s", managed_object_id) + + def add_consumer(self, context, managed_object_id, consumer_data): + raise NotImplementedError( + 'ConfKeyManager does not implement adding consumers' + ) + + def remove_consumer(self, context, managed_object_id, consumer_data): + raise NotImplementedError( + 'ConfKeyManager does not implement removing consumers' + ) diff --git a/nova/tests/functional/libvirt/test_vtpm.py b/nova/tests/functional/libvirt/test_vtpm.py index 3b5ae9a60f0d..8c0fd9dbe148 100644 --- a/nova/tests/functional/libvirt/test_vtpm.py +++ b/nova/tests/functional/libvirt/test_vtpm.py @@ -109,6 +109,16 @@ class FakeKeyManager(key_manager.KeyManager): del self._passphrases[managed_object_id] + def add_consumer(self, context, managed_object_id, consumer_data): + raise NotImplementedError( + 'FakeKeyManager does not implement adding consumers' + ) + + def remove_consumer(self, context, managed_object_id, consumer_data): + raise NotImplementedError( + 'FakeKeyManager does not implement removing consumers' + ) + class VTPMServersTest(base.ServersTestBase):