summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--nova/tests/virt/vmwareapi/__init__.py (renamed from nova/tests/vmwareapi/__init__.py)5
-rw-r--r--nova/tests/virt/vmwareapi/db_fakes.py (renamed from nova/tests/vmwareapi/db_fakes.py)0
-rw-r--r--nova/tests/virt/vmwareapi/stubs.py (renamed from nova/tests/vmwareapi/stubs.py)0
-rw-r--r--nova/tests/virt/vmwareapi/test_vmwareapi.py (renamed from nova/tests/test_vmwareapi.py)4
-rw-r--r--nova/tests/virt/vmwareapi/test_vmwareapi_vif.py (renamed from nova/tests/test_vmwareapi_vif.py)0
-rw-r--r--nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py (renamed from nova/tests/test_vmwareapi_vm_util.py)0
-rw-r--r--nova/tests/virt/vmwareapi/test_vmwareapi_vmops.py (renamed from nova/tests/test_vmwareapi_vmops.py)0
7 files changed, 2 insertions, 7 deletions
diff --git a/nova/tests/vmwareapi/__init__.py b/nova/tests/virt/vmwareapi/__init__.py
index d22b919f3..fcf71c88d 100644
--- a/nova/tests/vmwareapi/__init__.py
+++ b/nova/tests/virt/vmwareapi/__init__.py
@@ -14,8 +14,3 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
-
-"""
-:mod:`vmwareapi` -- Stubs for VMware API
-=======================================
-"""
diff --git a/nova/tests/vmwareapi/db_fakes.py b/nova/tests/virt/vmwareapi/db_fakes.py
index 54e3cf43b..54e3cf43b 100644
--- a/nova/tests/vmwareapi/db_fakes.py
+++ b/nova/tests/virt/vmwareapi/db_fakes.py
diff --git a/nova/tests/vmwareapi/stubs.py b/nova/tests/virt/vmwareapi/stubs.py
index dc87b2355..dc87b2355 100644
--- a/nova/tests/vmwareapi/stubs.py
+++ b/nova/tests/virt/vmwareapi/stubs.py
diff --git a/nova/tests/test_vmwareapi.py b/nova/tests/virt/vmwareapi/test_vmwareapi.py
index f63e403d6..9508a5805 100644
--- a/nova/tests/test_vmwareapi.py
+++ b/nova/tests/virt/vmwareapi/test_vmwareapi.py
@@ -33,8 +33,8 @@ from nova import test
import nova.tests.image.fake
from nova.tests import matchers
from nova.tests import utils
-from nova.tests.vmwareapi import db_fakes
-from nova.tests.vmwareapi import stubs
+from nova.tests.virt.vmwareapi import db_fakes
+from nova.tests.virt.vmwareapi import stubs
from nova.virt.vmwareapi import driver
from nova.virt.vmwareapi import fake as vmwareapi_fake
from nova.virt.vmwareapi import vim
diff --git a/nova/tests/test_vmwareapi_vif.py b/nova/tests/virt/vmwareapi/test_vmwareapi_vif.py
index 043885543..043885543 100644
--- a/nova/tests/test_vmwareapi_vif.py
+++ b/nova/tests/virt/vmwareapi/test_vmwareapi_vif.py
diff --git a/nova/tests/test_vmwareapi_vm_util.py b/nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py
index eda2c25f9..eda2c25f9 100644
--- a/nova/tests/test_vmwareapi_vm_util.py
+++ b/nova/tests/virt/vmwareapi/test_vmwareapi_vm_util.py
diff --git a/nova/tests/test_vmwareapi_vmops.py b/nova/tests/virt/vmwareapi/test_vmwareapi_vmops.py
index 92bca8ae7..92bca8ae7 100644
--- a/nova/tests/test_vmwareapi_vmops.py
+++ b/nova/tests/virt/vmwareapi/test_vmwareapi_vmops.py