From 1c739d307ee73f7fe1fd722e90b176bd3f515604 Mon Sep 17 00:00:00 2001 From: Brian Curtin Date: Tue, 15 Dec 2015 12:15:51 -0600 Subject: [PATCH] Rename key_management to key_manager Some time ago, the Key Management service was renamed to Key Manager service in the governance repo. We originally stuck to naming it Key Management *because* it was named as such in the projects.yaml file, and because it has changed, we should follow how it's named there. Change-Id: Id5c1bd617a02e21e91f01ec095f817222c535138 --- .../{key_management.rst => key_manager.rst} | 6 +- doc/source/users/index.rst | 6 +- doc/source/users/proxies/key_management.rst | 18 ------ doc/source/users/proxies/key_manager.rst | 18 ++++++ .../resources/key_management/v1/order.rst | 12 ---- .../resources/key_management/v1/secret.rst | 12 ---- .../{key_management => key_manager}/index.rst | 4 +- .../v1/container.rst | 6 +- .../users/resources/key_manager/v1/order.rst | 12 ++++ .../users/resources/key_manager/v1/secret.rst | 12 ++++ .../__init__.py | 0 .../key_manager_service.py} | 10 ++-- .../v1/__init__.py | 0 .../v1/_proxy.py | 60 +++++++++---------- .../v1/container.py | 4 +- .../v1/order.py | 4 +- .../v1/secret.py | 4 +- openstack/profile.py | 4 +- .../__init__.py | 0 .../test_key_management_service.py | 6 +- .../v1/__init__.py | 0 .../v1/test_container.py | 2 +- .../v1/test_order.py | 2 +- .../v1/test_proxy.py | 8 +-- .../v1/test_secret.py | 2 +- 25 files changed, 106 insertions(+), 106 deletions(-) rename doc/source/users/guides/{key_management.rst => key_manager.rst} (59%) delete mode 100644 doc/source/users/proxies/key_management.rst create mode 100644 doc/source/users/proxies/key_manager.rst delete mode 100644 doc/source/users/resources/key_management/v1/order.rst delete mode 100644 doc/source/users/resources/key_management/v1/secret.rst rename doc/source/users/resources/{key_management => key_manager}/index.rst (60%) rename doc/source/users/resources/{key_management => key_manager}/v1/container.rst (52%) create mode 100644 doc/source/users/resources/key_manager/v1/order.rst create mode 100644 doc/source/users/resources/key_manager/v1/secret.rst rename openstack/{key_management => key_manager}/__init__.py (100%) rename openstack/{key_management/key_management_service.py => key_manager/key_manager_service.py} (70%) rename openstack/{key_management => key_manager}/v1/__init__.py (100%) rename openstack/{key_management => key_manager}/v1/_proxy.py (80%) rename openstack/{key_management => key_manager}/v1/container.py (92%) rename openstack/{key_management => key_manager}/v1/order.py (92%) rename openstack/{key_management => key_manager}/v1/secret.py (93%) rename openstack/tests/unit/{key_management => key_manager}/__init__.py (100%) rename openstack/tests/unit/{key_management => key_manager}/test_key_management_service.py (84%) rename openstack/tests/unit/{key_management => key_manager}/v1/__init__.py (100%) rename openstack/tests/unit/{key_management => key_manager}/v1/test_container.py (97%) rename openstack/tests/unit/{key_management => key_manager}/v1/test_order.py (97%) rename openstack/tests/unit/{key_management => key_manager}/v1/test_proxy.py (94%) rename openstack/tests/unit/{key_management => key_manager}/v1/test_secret.py (97%) diff --git a/doc/source/users/guides/key_management.rst b/doc/source/users/guides/key_manager.rst similarity index 59% rename from doc/source/users/guides/key_management.rst rename to doc/source/users/guides/key_manager.rst index de9ea1912..f49506d58 100644 --- a/doc/source/users/guides/key_management.rst +++ b/doc/source/users/guides/key_manager.rst @@ -1,7 +1,7 @@ -Using OpenStack Key Management -============================== +Using OpenStack Key Manager +=========================== -Before working with the Key Management service, you'll need to create a +Before working with the Key Manager service, you'll need to create a connection to your OpenStack cloud by following the :doc:`connect` user guide. This will provide you with the ``conn`` variable used in the examples below. diff --git a/doc/source/users/index.rst b/doc/source/users/index.rst index fde069368..942475ea3 100644 --- a/doc/source/users/index.rst +++ b/doc/source/users/index.rst @@ -33,7 +33,7 @@ approach, this is where you'll want to begin. Database Identity Image - Key Management + Key Manager Network Object Store Orchestration @@ -73,7 +73,7 @@ but listed below are the ones provided by this SDK by default. Database Identity Image - Key Management + Key Manager Network Object Store Orchestration @@ -99,7 +99,7 @@ The following services have exposed *Resource* classes. Database Identity Image - Key Management + Key Management Metric Network Orchestration diff --git a/doc/source/users/proxies/key_management.rst b/doc/source/users/proxies/key_management.rst deleted file mode 100644 index 1ba21aa5a..000000000 --- a/doc/source/users/proxies/key_management.rst +++ /dev/null @@ -1,18 +0,0 @@ -KeyManagement API -================= - -For details on how to use key_management, see -:doc:`/users/guides/key_management` - -.. automodule:: openstack.key_management.v1._proxy - -The KeyManagement Class ------------------------ - -The key_management high-level interface is available through the -``key_management`` member of a :class:`~openstack.connection.Connection` -object. The ``key_management`` member will only be added if the service is -detected. - -.. autoclass:: openstack.key_management.v1._proxy.Proxy - :members: diff --git a/doc/source/users/proxies/key_manager.rst b/doc/source/users/proxies/key_manager.rst new file mode 100644 index 000000000..455e1b5d2 --- /dev/null +++ b/doc/source/users/proxies/key_manager.rst @@ -0,0 +1,18 @@ +KeyManager API +============== + +For details on how to use key_management, see +:doc:`/users/guides/key_manager` + +.. automodule:: openstack.key_manager.v1._proxy + +The KeyManager Class +-------------------- + +The key_management high-level interface is available through the +``key_manager`` member of a :class:`~openstack.connection.Connection` +object. The ``key_manager`` member will only be added if the service is +detected. + +.. autoclass:: openstack.key_manager.v1._proxy.Proxy + :members: diff --git a/doc/source/users/resources/key_management/v1/order.rst b/doc/source/users/resources/key_management/v1/order.rst deleted file mode 100644 index eaac2513a..000000000 --- a/doc/source/users/resources/key_management/v1/order.rst +++ /dev/null @@ -1,12 +0,0 @@ -openstack.key_management.v1.order -================================= - -.. automodule:: openstack.key_management.v1.order - -The Order Class ---------------- - -The ``Order`` class inherits from :class:`~openstack.resource.Resource`. - -.. autoclass:: openstack.key_management.v1.order.Order - :members: diff --git a/doc/source/users/resources/key_management/v1/secret.rst b/doc/source/users/resources/key_management/v1/secret.rst deleted file mode 100644 index 9ece455aa..000000000 --- a/doc/source/users/resources/key_management/v1/secret.rst +++ /dev/null @@ -1,12 +0,0 @@ -openstack.key_management.v1.secret -================================== - -.. automodule:: openstack.key_management.v1.secret - -The Secret Class ----------------- - -The ``Secret`` class inherits from :class:`~openstack.resource.Resource`. - -.. autoclass:: openstack.key_management.v1.secret.Secret - :members: diff --git a/doc/source/users/resources/key_management/index.rst b/doc/source/users/resources/key_manager/index.rst similarity index 60% rename from doc/source/users/resources/key_management/index.rst rename to doc/source/users/resources/key_manager/index.rst index 4a9b80cdb..76b6659c6 100644 --- a/doc/source/users/resources/key_management/index.rst +++ b/doc/source/users/resources/key_manager/index.rst @@ -1,5 +1,5 @@ -KeyManagement Resources -======================= +KeyManager Resources +==================== .. toctree:: :maxdepth: 1 diff --git a/doc/source/users/resources/key_management/v1/container.rst b/doc/source/users/resources/key_manager/v1/container.rst similarity index 52% rename from doc/source/users/resources/key_management/v1/container.rst rename to doc/source/users/resources/key_manager/v1/container.rst index 517da4c16..ef09035dc 100644 --- a/doc/source/users/resources/key_management/v1/container.rst +++ b/doc/source/users/resources/key_manager/v1/container.rst @@ -1,12 +1,12 @@ -openstack.key_management.v1.container +openstack.key_manager.v1.container ===================================== -.. automodule:: openstack.key_management.v1.container +.. automodule:: openstack.key_manager.v1.container The Container Class ------------------- The ``Container`` class inherits from :class:`~openstack.resource.Resource`. -.. autoclass:: openstack.key_management.v1.container.Container +.. autoclass:: openstack.key_manager.v1.container.Container :members: diff --git a/doc/source/users/resources/key_manager/v1/order.rst b/doc/source/users/resources/key_manager/v1/order.rst new file mode 100644 index 000000000..2f53627b0 --- /dev/null +++ b/doc/source/users/resources/key_manager/v1/order.rst @@ -0,0 +1,12 @@ +openstack.key_manager.v1.order +============================== + +.. automodule:: openstack.key_manager.v1.order + +The Order Class +--------------- + +The ``Order`` class inherits from :class:`~openstack.resource.Resource`. + +.. autoclass:: openstack.key_manager.v1.order.Order + :members: diff --git a/doc/source/users/resources/key_manager/v1/secret.rst b/doc/source/users/resources/key_manager/v1/secret.rst new file mode 100644 index 000000000..8d0a56e7a --- /dev/null +++ b/doc/source/users/resources/key_manager/v1/secret.rst @@ -0,0 +1,12 @@ +openstack.key_manager.v1.secret +=============================== + +.. automodule:: openstack.key_manager.v1.secret + +The Secret Class +---------------- + +The ``Secret`` class inherits from :class:`~openstack.resource.Resource`. + +.. autoclass:: openstack.key_manager.v1.secret.Secret + :members: diff --git a/openstack/key_management/__init__.py b/openstack/key_manager/__init__.py similarity index 100% rename from openstack/key_management/__init__.py rename to openstack/key_manager/__init__.py diff --git a/openstack/key_management/key_management_service.py b/openstack/key_manager/key_manager_service.py similarity index 70% rename from openstack/key_management/key_management_service.py rename to openstack/key_manager/key_manager_service.py index 9af5fe608..36d3b413b 100644 --- a/openstack/key_management/key_management_service.py +++ b/openstack/key_manager/key_manager_service.py @@ -13,12 +13,12 @@ from openstack import service_filter -class KeyManagementService(service_filter.ServiceFilter): - """The key management service.""" +class KeyManagerService(service_filter.ServiceFilter): + """The key manager service.""" valid_versions = [service_filter.ValidVersion('v1')] def __init__(self, version=None): - """Create a key management service.""" - super(KeyManagementService, self).__init__(service_type='key-manager', - version=version) + """Create a key manager service.""" + super(KeyManagerService, self).__init__(service_type='key-manager', + version=version) diff --git a/openstack/key_management/v1/__init__.py b/openstack/key_manager/v1/__init__.py similarity index 100% rename from openstack/key_management/v1/__init__.py rename to openstack/key_manager/v1/__init__.py diff --git a/openstack/key_management/v1/_proxy.py b/openstack/key_manager/v1/_proxy.py similarity index 80% rename from openstack/key_management/v1/_proxy.py rename to openstack/key_manager/v1/_proxy.py index 2e88c1d7c..21215bad1 100644 --- a/openstack/key_management/v1/_proxy.py +++ b/openstack/key_manager/v1/_proxy.py @@ -10,9 +10,9 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.key_management.v1 import container as _container -from openstack.key_management.v1 import order as _order -from openstack.key_management.v1 import secret as _secret +from openstack.key_manager.v1 import container as _container +from openstack.key_manager.v1 import order as _order +from openstack.key_manager.v1 import secret as _secret from openstack import proxy @@ -22,11 +22,11 @@ class Proxy(proxy.BaseProxy): """Create a new container from attributes :param dict attrs: Keyword arguments which will be used to create - a :class:`~openstack.key_management.v1.container.Container`, + a :class:`~openstack.key_manager.v1.container.Container`, comprised of the properties on the Container class. :returns: The results of container creation - :rtype: :class:`~openstack.key_management.v1.container.Container` + :rtype: :class:`~openstack.key_manager.v1.container.Container` """ return self._create(_container.Container, **attrs) @@ -34,7 +34,7 @@ class Proxy(proxy.BaseProxy): """Delete a container :param container: The value can be either the ID of a container or a - :class:`~openstack.key_management.v1.container.Container` + :class:`~openstack.key_manager.v1.container.Container` instance. :param bool ignore_missing: When set to ``False`` :class:`~openstack.exceptions.ResourceNotFound` will be @@ -56,7 +56,7 @@ class Proxy(proxy.BaseProxy): raised when the resource does not exist. When set to ``True``, None will be returned when attempting to find a nonexistent resource. - :returns: One :class:`~openstack.key_management.v1.container.Container` + :returns: One :class:`~openstack.key_manager.v1.container.Container` or None """ return self._find(_container.Container, name_or_id, @@ -66,10 +66,10 @@ class Proxy(proxy.BaseProxy): """Get a single container :param container: The value can be the ID of a container or a - :class:`~openstack.key_management.v1.container.Container` + :class:`~openstack.key_manager.v1.container.Container` instance. - :returns: One :class:`~openstack.key_management.v1.container.Container` + :returns: One :class:`~openstack.key_manager.v1.container.Container` :raises: :class:`~openstack.exceptions.ResourceNotFound` when no resource can be found. """ @@ -82,7 +82,7 @@ class Proxy(proxy.BaseProxy): the resources being returned. :returns: A generator of container objects - :rtype: :class:`~openstack.key_management.v1.container.Container` + :rtype: :class:`~openstack.key_manager.v1.container.Container` """ return self._list(_container.Container, paginated=False, **query) @@ -90,13 +90,13 @@ class Proxy(proxy.BaseProxy): """Update a container :param container: Either the id of a container or a - :class:`~openstack.key_management.v1.container.Container` + :class:`~openstack.key_manager.v1.container.Container` instance. :attrs kwargs: The attributes to update on the container represented by ``value``. :returns: The updated container - :rtype: :class:`~openstack.key_management.v1.container.Container` + :rtype: :class:`~openstack.key_manager.v1.container.Container` """ return self._update(_container.Container, container, **attrs) @@ -104,11 +104,11 @@ class Proxy(proxy.BaseProxy): """Create a new order from attributes :param dict attrs: Keyword arguments which will be used to create - a :class:`~openstack.key_management.v1.order.Order`, + a :class:`~openstack.key_manager.v1.order.Order`, comprised of the properties on the Order class. :returns: The results of order creation - :rtype: :class:`~openstack.key_management.v1.order.Order` + :rtype: :class:`~openstack.key_manager.v1.order.Order` """ return self._create(_order.Order, **attrs) @@ -116,7 +116,7 @@ class Proxy(proxy.BaseProxy): """Delete an order :param order: The value can be either the ID of a order or a - :class:`~openstack.key_management.v1.order.Order` + :class:`~openstack.key_manager.v1.order.Order` instance. :param bool ignore_missing: When set to ``False`` :class:`~openstack.exceptions.ResourceNotFound` will be @@ -137,7 +137,7 @@ class Proxy(proxy.BaseProxy): raised when the resource does not exist. When set to ``True``, None will be returned when attempting to find a nonexistent resource. - :returns: One :class:`~openstack.key_management.v1.order.Order` or None + :returns: One :class:`~openstack.key_manager.v1.order.Order` or None """ return self._find(_order.Order, name_or_id, ignore_missing=ignore_missing) @@ -146,10 +146,10 @@ class Proxy(proxy.BaseProxy): """Get a single order :param order: The value can be the ID of an order or a - :class:`~openstack.key_management.v1.order.Order` + :class:`~openstack.key_manager.v1.order.Order` instance. - :returns: One :class:`~openstack.key_management.v1.order.Order` + :returns: One :class:`~openstack.key_manager.v1.order.Order` :raises: :class:`~openstack.exceptions.ResourceNotFound` when no resource can be found. """ @@ -162,7 +162,7 @@ class Proxy(proxy.BaseProxy): the resources being returned. :returns: A generator of order objects - :rtype: :class:`~openstack.key_management.v1.order.Order` + :rtype: :class:`~openstack.key_manager.v1.order.Order` """ return self._list(_order.Order, paginated=False, **query) @@ -170,13 +170,13 @@ class Proxy(proxy.BaseProxy): """Update a order :param order: Either the id of a order or a - :class:`~openstack.key_management.v1.order.Order` + :class:`~openstack.key_manager.v1.order.Order` instance. :attrs kwargs: The attributes to update on the order represented by ``value``. :returns: The updated order - :rtype: :class:`~openstack.key_management.v1.order.Order` + :rtype: :class:`~openstack.key_manager.v1.order.Order` """ return self._update(_order.Order, order, **attrs) @@ -184,11 +184,11 @@ class Proxy(proxy.BaseProxy): """Create a new secret from attributes :param dict attrs: Keyword arguments which will be used to create a - :class:`~openstack.key_management.v1.secret.Secret`, + :class:`~openstack.key_manager.v1.secret.Secret`, comprised of the properties on the Order class. :returns: The results of secret creation - :rtype: :class:`~openstack.key_management.v1.secret.Secret` + :rtype: :class:`~openstack.key_manager.v1.secret.Secret` """ return self._create(_secret.Secret, **attrs) @@ -196,7 +196,7 @@ class Proxy(proxy.BaseProxy): """Delete a secret :param secret: The value can be either the ID of a secret or a - :class:`~openstack.key_management.v1.secret.Secret` + :class:`~openstack.key_manager.v1.secret.Secret` instance. :param bool ignore_missing: When set to ``False`` :class:`~openstack.exceptions.ResourceNotFound` will be @@ -217,7 +217,7 @@ class Proxy(proxy.BaseProxy): raised when the resource does not exist. When set to ``True``, None will be returned when attempting to find a nonexistent resource. - :returns: One :class:`~openstack.key_management.v1.secret.Secret` or + :returns: One :class:`~openstack.key_manager.v1.secret.Secret` or None """ return self._find(_secret.Secret, name_or_id, @@ -227,10 +227,10 @@ class Proxy(proxy.BaseProxy): """Get a single secret :param secret: The value can be the ID of a secret or a - :class:`~openstack.key_management.v1.secret.Secret` + :class:`~openstack.key_manager.v1.secret.Secret` instance. - :returns: One :class:`~openstack.key_management.v1.secret.Secret` + :returns: One :class:`~openstack.key_manager.v1.secret.Secret` :raises: :class:`~openstack.exceptions.ResourceNotFound` when no resource can be found. """ @@ -243,7 +243,7 @@ class Proxy(proxy.BaseProxy): the resources being returned. :returns: A generator of secret objects - :rtype: :class:`~openstack.key_management.v1.secret.Secret` + :rtype: :class:`~openstack.key_manager.v1.secret.Secret` """ return self._list(_secret.Secret, paginated=False, **query) @@ -251,12 +251,12 @@ class Proxy(proxy.BaseProxy): """Update a secret :param secret: Either the id of a secret or a - :class:`~openstack.key_management.v1.secret.Secret` + :class:`~openstack.key_manager.v1.secret.Secret` instance. :attrs kwargs: The attributes to update on the secret represented by ``value``. :returns: The updated secret - :rtype: :class:`~openstack.key_management.v1.secret.Secret` + :rtype: :class:`~openstack.key_manager.v1.secret.Secret` """ return self._update(_secret.Secret, secret, **attrs) diff --git a/openstack/key_management/v1/container.py b/openstack/key_manager/v1/container.py similarity index 92% rename from openstack/key_management/v1/container.py rename to openstack/key_manager/v1/container.py index 3d5eafeab..b66f73b07 100644 --- a/openstack/key_management/v1/container.py +++ b/openstack/key_manager/v1/container.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.key_management import key_management_service +from openstack.key_manager import key_manager_service from openstack import resource @@ -18,7 +18,7 @@ class Container(resource.Resource): id_attribute = 'container_ref' resources_key = 'containers' base_path = '/containers' - service = key_management_service.KeyManagementService() + service = key_manager_service.KeyManagerService() # capabilities allow_create = True diff --git a/openstack/key_management/v1/order.py b/openstack/key_manager/v1/order.py similarity index 92% rename from openstack/key_management/v1/order.py rename to openstack/key_manager/v1/order.py index dfe42d85b..9d3cd3e8f 100644 --- a/openstack/key_management/v1/order.py +++ b/openstack/key_manager/v1/order.py @@ -10,14 +10,14 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.key_management import key_management_service +from openstack.key_manager import key_manager_service from openstack import resource class Order(resource.Resource): resources_key = 'orders' base_path = '/orders' - service = key_management_service.KeyManagementService() + service = key_manager_service.KeyManagerService() # capabilities allow_create = True diff --git a/openstack/key_management/v1/secret.py b/openstack/key_manager/v1/secret.py similarity index 93% rename from openstack/key_management/v1/secret.py rename to openstack/key_manager/v1/secret.py index 9b1fce40e..efa32d542 100644 --- a/openstack/key_management/v1/secret.py +++ b/openstack/key_manager/v1/secret.py @@ -10,7 +10,7 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.key_management import key_management_service +from openstack.key_manager import key_manager_service from openstack import resource @@ -19,7 +19,7 @@ class Secret(resource.Resource): resource_key = 'secret' resources_key = 'secrets' base_path = '/secrets' - service = key_management_service.KeyManagementService() + service = key_manager_service.KeyManagerService() # capabilities allow_create = True diff --git a/openstack/profile.py b/openstack/profile.py index ac0f4317d..bd29bce14 100644 --- a/openstack/profile.py +++ b/openstack/profile.py @@ -62,7 +62,7 @@ from openstack.database import database_service from openstack import exceptions from openstack.identity import identity_service from openstack.image import image_service -from openstack.key_management import key_management_service +from openstack.key_manager import key_manager_service from openstack.message import message_service from openstack import module_loader from openstack.network import network_service @@ -97,7 +97,7 @@ class Profile(object): self._add_service(network_service.NetworkService()) self._add_service(object_store_service.ObjectStoreService()) self._add_service(orchestration_service.OrchestrationService()) - self._add_service(key_management_service.KeyManagementService()) + self._add_service(key_manager_service.KeyManagerService()) self._add_service(telemetry_service.TelemetryService()) self._add_service(block_store_service.BlockStoreService()) self._add_service(message_service.MessageService()) diff --git a/openstack/tests/unit/key_management/__init__.py b/openstack/tests/unit/key_manager/__init__.py similarity index 100% rename from openstack/tests/unit/key_management/__init__.py rename to openstack/tests/unit/key_manager/__init__.py diff --git a/openstack/tests/unit/key_management/test_key_management_service.py b/openstack/tests/unit/key_manager/test_key_management_service.py similarity index 84% rename from openstack/tests/unit/key_management/test_key_management_service.py rename to openstack/tests/unit/key_manager/test_key_management_service.py index 7f0d5b60b..b458daf73 100644 --- a/openstack/tests/unit/key_management/test_key_management_service.py +++ b/openstack/tests/unit/key_manager/test_key_management_service.py @@ -12,13 +12,13 @@ import testtools -from openstack.key_management import key_management_service +from openstack.key_manager import key_manager_service -class TestKeyManagementService(testtools.TestCase): +class TestKeyManagerService(testtools.TestCase): def test_service(self): - sot = key_management_service.KeyManagementService() + sot = key_manager_service.KeyManagerService() self.assertEqual('key-manager', sot.service_type) self.assertEqual('public', sot.interface) self.assertIsNone(sot.region) diff --git a/openstack/tests/unit/key_management/v1/__init__.py b/openstack/tests/unit/key_manager/v1/__init__.py similarity index 100% rename from openstack/tests/unit/key_management/v1/__init__.py rename to openstack/tests/unit/key_manager/v1/__init__.py diff --git a/openstack/tests/unit/key_management/v1/test_container.py b/openstack/tests/unit/key_manager/v1/test_container.py similarity index 97% rename from openstack/tests/unit/key_management/v1/test_container.py rename to openstack/tests/unit/key_manager/v1/test_container.py index e9f88552f..6a8500c1f 100644 --- a/openstack/tests/unit/key_management/v1/test_container.py +++ b/openstack/tests/unit/key_manager/v1/test_container.py @@ -12,7 +12,7 @@ import testtools -from openstack.key_management.v1 import container +from openstack.key_manager.v1 import container IDENTIFIER = 'http://localhost/containers/IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/key_management/v1/test_order.py b/openstack/tests/unit/key_manager/v1/test_order.py similarity index 97% rename from openstack/tests/unit/key_management/v1/test_order.py rename to openstack/tests/unit/key_manager/v1/test_order.py index 7413db40a..c76decb35 100644 --- a/openstack/tests/unit/key_management/v1/test_order.py +++ b/openstack/tests/unit/key_manager/v1/test_order.py @@ -12,7 +12,7 @@ import testtools -from openstack.key_management.v1 import order +from openstack.key_manager.v1 import order IDENTIFIER = 'IDENTIFIER' EXAMPLE = { diff --git a/openstack/tests/unit/key_management/v1/test_proxy.py b/openstack/tests/unit/key_manager/v1/test_proxy.py similarity index 94% rename from openstack/tests/unit/key_management/v1/test_proxy.py rename to openstack/tests/unit/key_manager/v1/test_proxy.py index 9fc057dc6..97d507244 100644 --- a/openstack/tests/unit/key_management/v1/test_proxy.py +++ b/openstack/tests/unit/key_manager/v1/test_proxy.py @@ -10,10 +10,10 @@ # License for the specific language governing permissions and limitations # under the License. -from openstack.key_management.v1 import _proxy -from openstack.key_management.v1 import container -from openstack.key_management.v1 import order -from openstack.key_management.v1 import secret +from openstack.key_manager.v1 import _proxy +from openstack.key_manager.v1 import container +from openstack.key_manager.v1 import order +from openstack.key_manager.v1 import secret from openstack.tests.unit import test_proxy_base diff --git a/openstack/tests/unit/key_management/v1/test_secret.py b/openstack/tests/unit/key_manager/v1/test_secret.py similarity index 97% rename from openstack/tests/unit/key_management/v1/test_secret.py rename to openstack/tests/unit/key_manager/v1/test_secret.py index 93a695b1a..f418f62e8 100644 --- a/openstack/tests/unit/key_management/v1/test_secret.py +++ b/openstack/tests/unit/key_manager/v1/test_secret.py @@ -12,7 +12,7 @@ import testtools -from openstack.key_management.v1 import secret +from openstack.key_manager.v1 import secret IDENTIFIER = 'http://localhost:9311/v1/secrets/ID' EXAMPLE = {