From e26f1d734b443dd8c12d11c1391bac99641a9994 Mon Sep 17 00:00:00 2001 From: "Brad P. Crochet" Date: Thu, 19 Mar 2015 15:35:43 -0400 Subject: [PATCH] Redo layout of undercloud module namespace Change-Id: I9e59de74a878843fc22a34341d7e251862ac358a --- rdomanager_oscplugin/tests/v1/plugin/__init__.py | 0 .../tests/v1/{plugin => undercloud}/test_undercloud.py | 2 +- rdomanager_oscplugin/v1/plugin/__init__.py | 0 rdomanager_oscplugin/v1/{plugin => }/undercloud.py | 0 setup.cfg | 2 +- 5 files changed, 2 insertions(+), 2 deletions(-) delete mode 100644 rdomanager_oscplugin/tests/v1/plugin/__init__.py rename rdomanager_oscplugin/tests/v1/{plugin => undercloud}/test_undercloud.py (96%) delete mode 100644 rdomanager_oscplugin/v1/plugin/__init__.py rename rdomanager_oscplugin/v1/{plugin => }/undercloud.py (100%) diff --git a/rdomanager_oscplugin/tests/v1/plugin/__init__.py b/rdomanager_oscplugin/tests/v1/plugin/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/rdomanager_oscplugin/tests/v1/plugin/test_undercloud.py b/rdomanager_oscplugin/tests/v1/undercloud/test_undercloud.py similarity index 96% rename from rdomanager_oscplugin/tests/v1/plugin/test_undercloud.py rename to rdomanager_oscplugin/tests/v1/undercloud/test_undercloud.py index 92a79ccf4..11b6919c7 100644 --- a/rdomanager_oscplugin/tests/v1/plugin/test_undercloud.py +++ b/rdomanager_oscplugin/tests/v1/undercloud/test_undercloud.py @@ -18,7 +18,7 @@ import mock from rdomanager_oscplugin.tests.v1.test_plugin import TestPluginV1 # Load the plugin init module for the plugin list and show commands -from rdomanager_oscplugin.v1.plugin import undercloud +from rdomanager_oscplugin.v1 import undercloud class FakePluginV1Client(object): diff --git a/rdomanager_oscplugin/v1/plugin/__init__.py b/rdomanager_oscplugin/v1/plugin/__init__.py deleted file mode 100644 index e69de29bb..000000000 diff --git a/rdomanager_oscplugin/v1/plugin/undercloud.py b/rdomanager_oscplugin/v1/undercloud.py similarity index 100% rename from rdomanager_oscplugin/v1/plugin/undercloud.py rename to rdomanager_oscplugin/v1/undercloud.py diff --git a/setup.cfg b/setup.cfg index 7a125e0f7..2e1424ef9 100644 --- a/setup.cfg +++ b/setup.cfg @@ -54,4 +54,4 @@ openstack.cli.extension = rdomanger_oscplugin = rdomanager_oscplugin.plugin openstack.rdomanager_oscplugin.v1 = - undercloud_install = rdomanager_oscplugin.v1.plugin.undercloud:InstallPlugin + undercloud_install = rdomanager_oscplugin.v1.undercloud:InstallPlugin