Move unit tests into unit test directory
In order to pave the way for functional testing, move existing unit tests into a directory labeled unit. A subsequent patch will add a directory for functional tests. Change-Id: I0adb8b9f14451acb382c725d31f5387b4b6d82bb
This commit is contained in:
parent
7544dcb4ea
commit
3561772f8b
novaclient/tests/unit
__init__.pyfakes.py
fixture_data
__init__.pyagents.pyaggregates.pyavailability_zones.pybase.pycerts.pyclient.pycloudpipe.pyfixedips.pyfloatingips.pyfping.pyhosts.pyhypervisors.pyimages.pykeypairs.pylimits.pynetworks.pyquotas.pysecurity_group_rules.pysecurity_groups.pyserver_groups.pyservers.py
idfake.pemtest_auth_plugins.pytest_base.pytest_client.pytest_discover.pytest_http.pytest_service_catalog.pytest_shell.pytest_utils.pyutils.pyv1_1
__init__.py
contrib
__init__.pyfakes.pytest_assisted_volume_snapshots.pytest_baremetal.pytest_cells.pytest_instance_actions.pytest_list_extensions.pytest_migrations.pytest_server_external_events.pytest_tenant_networks.py
fakes.pytest_agents.pytest_aggregates.pytest_auth.pytest_availability_zone.pytest_certs.pytest_client.pytest_cloudpipe.pytest_fixed_ips.pytest_flavor_access.pytest_flavors.pytest_floating_ip_dns.pytest_floating_ip_pools.pytest_floating_ips.pytest_floating_ips_bulk.pytest_fping.pytest_hosts.pytest_hypervisors.pytest_images.pytest_keypairs.pytest_limits.pytest_networks.pytest_quota_classes.pytest_quotas.pytest_security_group_rules.pytest_security_groups.pytest_server_groups.pytest_servers.pytest_services.pytest_shell.pytest_usage.pytest_volumes.pytestfile.txtutils.py@ -10,7 +10,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class Fixture(base.Fixture):
|
@ -10,7 +10,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class Fixture(base.Fixture):
|
@ -10,7 +10,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class V1(base.Fixture):
|
@ -10,7 +10,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class Fixture(base.Fixture):
|
@ -10,7 +10,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class Fixture(base.Fixture):
|
@ -10,7 +10,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class Fixture(base.Fixture):
|
@ -12,8 +12,8 @@
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
|
||||
from novaclient.tests import fakes
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit import fakes
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class FloatingFixture(base.Fixture):
|
@ -10,7 +10,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class Fixture(base.Fixture):
|
@ -13,7 +13,7 @@
|
||||
from oslo.serialization import jsonutils
|
||||
from six.moves.urllib import parse
|
||||
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class BaseFixture(base.Fixture):
|
@ -10,7 +10,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class V1(base.Fixture):
|
@ -12,8 +12,8 @@
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
|
||||
from novaclient.tests import fakes
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit import fakes
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class V1(base.Fixture):
|
@ -12,8 +12,8 @@
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
|
||||
from novaclient.tests import fakes
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit import fakes
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class V1(base.Fixture):
|
@ -10,7 +10,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class Fixture(base.Fixture):
|
@ -12,7 +12,7 @@
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class Fixture(base.Fixture):
|
@ -10,7 +10,7 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class V1(base.Fixture):
|
@ -12,8 +12,8 @@
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
|
||||
from novaclient.tests import fakes
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit import fakes
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class Fixture(base.Fixture):
|
@ -12,8 +12,8 @@
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
|
||||
from novaclient.tests import fakes
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit import fakes
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class Fixture(base.Fixture):
|
2
novaclient/tests/fixture_data/server_groups.py → novaclient/tests/unit/fixture_data/server_groups.py
2
novaclient/tests/fixture_data/server_groups.py → novaclient/tests/unit/fixture_data/server_groups.py
@ -12,7 +12,7 @@
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class Fixture(base.Fixture):
|
@ -12,8 +12,8 @@
|
||||
|
||||
from oslo.serialization import jsonutils
|
||||
|
||||
from novaclient.tests import fakes
|
||||
from novaclient.tests.fixture_data import base
|
||||
from novaclient.tests.unit import fakes
|
||||
from novaclient.tests.unit.fixture_data import base
|
||||
|
||||
|
||||
class Base(base.Fixture):
|
||||
@ -336,7 +336,7 @@ class V1(Base):
|
||||
#
|
||||
# Clear password: FooBar123
|
||||
#
|
||||
# RSA Private Key: novaclient/tests/idfake.pem
|
||||
# RSA Private Key: novaclient/tests/unit/idfake.pem
|
||||
#
|
||||
# Encrypted password
|
||||
# OIuEuQttO8Rk93BcKlwHQsziDAnkAm/V6V8VPToA8ZeUaUBWwS0gwo2K6Y61Z96r
|
@ -27,7 +27,7 @@ except ImportError:
|
||||
|
||||
from novaclient import auth_plugin
|
||||
from novaclient import exceptions
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import client
|
||||
|
||||
|
@ -13,8 +13,8 @@
|
||||
|
||||
from novaclient import base
|
||||
from novaclient import exceptions
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.tests.unit.v1_1 import fakes
|
||||
from novaclient.v1_1 import flavors
|
||||
|
||||
|
@ -23,7 +23,7 @@ import requests
|
||||
|
||||
import novaclient.client
|
||||
import novaclient.extension
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit import utils
|
||||
import novaclient.v1_1.client
|
||||
|
||||
|
@ -20,7 +20,7 @@ import mock
|
||||
import pkg_resources
|
||||
|
||||
import novaclient.shell
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit import utils
|
||||
|
||||
|
||||
class DiscoverTest(utils.TestCase):
|
@ -17,7 +17,7 @@ import six
|
||||
|
||||
from novaclient import client
|
||||
from novaclient import exceptions
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit import utils
|
||||
|
||||
|
||||
fake_response = utils.TestResponse({
|
@ -15,7 +15,7 @@ from keystoneclient import fixture
|
||||
|
||||
from novaclient import exceptions
|
||||
from novaclient import service_catalog
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit import utils
|
||||
|
||||
|
||||
SERVICE_CATALOG = fixture.V2Token()
|
@ -26,7 +26,7 @@ from testtools import matchers
|
||||
import novaclient.client
|
||||
from novaclient import exceptions
|
||||
import novaclient.shell
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit import utils
|
||||
|
||||
FAKE_ENV = {'OS_USERNAME': 'username',
|
||||
'OS_PASSWORD': 'password',
|
@ -18,7 +18,7 @@ import six
|
||||
|
||||
from novaclient import base
|
||||
from novaclient import exceptions
|
||||
from novaclient.tests import utils as test_utils
|
||||
from novaclient.tests.unit import utils as test_utils
|
||||
from novaclient import utils
|
||||
|
||||
UUID = '8e8ec658-c7b0-4243-bdf8-6f7f2952c0d0'
|
0
novaclient/tests/unit/v1_1/contrib/__init__.py
Normal file
0
novaclient/tests/unit/v1_1/contrib/__init__.py
Normal file
@ -12,7 +12,7 @@
|
||||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests.unit.v1_1 import fakes
|
||||
from novaclient.v1_1 import client
|
||||
|
||||
|
@ -17,8 +17,8 @@ Assisted volume snapshots - to be used by Cinder and not end users.
|
||||
"""
|
||||
|
||||
from novaclient import extension
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1.contrib import fakes
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.tests.unit.v1_1.contrib import fakes
|
||||
from novaclient.v1_1.contrib import assisted_volume_snapshots as assisted_snaps
|
||||
|
||||
|
@ -15,8 +15,8 @@
|
||||
|
||||
|
||||
from novaclient import extension
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1.contrib import fakes
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.tests.unit.v1_1.contrib import fakes
|
||||
from novaclient.v1_1.contrib import baremetal
|
||||
|
||||
|
@ -14,8 +14,8 @@
|
||||
# under the License.
|
||||
|
||||
from novaclient import extension
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1.contrib import fakes
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.tests.unit.v1_1.contrib import fakes
|
||||
from novaclient.v1_1.contrib import cells
|
||||
|
||||
|
@ -14,8 +14,8 @@
|
||||
# under the License.
|
||||
|
||||
from novaclient import extension
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1.contrib import fakes
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.tests.unit.v1_1.contrib import fakes
|
||||
from novaclient.v1_1.contrib import instance_action
|
||||
|
||||
|
@ -12,8 +12,8 @@
|
||||
# under the License.
|
||||
|
||||
from novaclient import extension
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.tests.unit.v1_1 import fakes
|
||||
from novaclient.v1_1.contrib import list_extensions
|
||||
|
||||
|
@ -11,8 +11,8 @@
|
||||
# under the License.
|
||||
|
||||
from novaclient import extension
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.tests.unit.v1_1 import fakes
|
||||
from novaclient.v1_1.contrib import migrations
|
||||
|
||||
extensions = [
|
@ -17,8 +17,8 @@ External event triggering for servers, not to be used by users.
|
||||
"""
|
||||
|
||||
from novaclient import extension
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1.contrib import fakes
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.tests.unit.v1_1.contrib import fakes
|
||||
from novaclient.v1_1.contrib import server_external_events as ext_events
|
||||
|
||||
|
@ -14,8 +14,8 @@
|
||||
# under the License.
|
||||
|
||||
from novaclient import extension
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1.contrib import fakes
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.tests.unit.v1_1.contrib import fakes
|
||||
from novaclient.v1_1.contrib import tenant_networks
|
||||
|
||||
|
@ -22,8 +22,8 @@ from six.moves.urllib import parse
|
||||
|
||||
from novaclient import client as base_client
|
||||
from novaclient import exceptions
|
||||
from novaclient.tests import fakes
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit import fakes
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import client
|
||||
|
||||
|
||||
@ -515,7 +515,7 @@ class FakeHTTPClient(base_client.HTTPClient):
|
||||
#
|
||||
# Clear password: FooBar123
|
||||
#
|
||||
# RSA Private Key: novaclient/tests/idfake.pem
|
||||
# RSA Private Key: novaclient/tests/unit/idfake.pem
|
||||
#
|
||||
# Encrypted password
|
||||
# OIuEuQttO8Rk93BcKlwHQsziDAnkAm/V6V8VPToA8ZeUaUBWwS0gwo2K6Y61Z96r
|
@ -13,9 +13,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import agents as data
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import agents as data
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import agents
|
||||
|
||||
|
@ -13,9 +13,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import aggregates as data
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import aggregates as data
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import aggregates
|
||||
|
||||
|
@ -19,7 +19,7 @@ import mock
|
||||
import requests
|
||||
|
||||
from novaclient import exceptions
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import client
|
||||
|
||||
|
@ -16,9 +16,9 @@
|
||||
|
||||
import six
|
||||
|
||||
from novaclient.tests.fixture_data import availability_zones as data
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import availability_zones as data
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import availability_zones
|
||||
|
||||
|
@ -11,9 +11,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import certs as data
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import certs as data
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import certs
|
||||
|
||||
|
@ -14,7 +14,7 @@ import uuid
|
||||
|
||||
from keystoneclient import session
|
||||
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import client
|
||||
|
||||
|
@ -13,9 +13,9 @@
|
||||
|
||||
import six
|
||||
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import cloudpipe as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import cloudpipe as data
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import cloudpipe
|
||||
|
||||
|
@ -13,9 +13,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import fixedips as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import fixedips as data
|
||||
from novaclient.tests.unit import utils
|
||||
|
||||
|
||||
class FixedIpsTest(utils.FixturedTestCase):
|
@ -13,8 +13,8 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.tests.unit.v1_1 import fakes
|
||||
from novaclient.v1_1 import flavor_access
|
||||
|
||||
|
@ -16,8 +16,8 @@
|
||||
import mock
|
||||
|
||||
from novaclient import exceptions
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.tests.unit.v1_1 import fakes
|
||||
from novaclient.v1_1 import flavors
|
||||
|
||||
|
6
novaclient/tests/v1_1/test_floating_ip_dns.py → novaclient/tests/unit/v1_1/test_floating_ip_dns.py
6
novaclient/tests/v1_1/test_floating_ip_dns.py → novaclient/tests/unit/v1_1/test_floating_ip_dns.py
@ -11,9 +11,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import floatingips as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import floatingips as data
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import floating_ip_dns
|
||||
|
||||
|
@ -14,9 +14,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import floatingips as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import floatingips as data
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import floating_ip_pools
|
||||
|
||||
|
@ -14,9 +14,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import floatingips as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import floatingips as data
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import floating_ips
|
||||
|
||||
|
@ -13,9 +13,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import floatingips as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import floatingips as data
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import floating_ips_bulk
|
||||
|
||||
|
@ -13,9 +13,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import fping as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import fping as data
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import fping
|
||||
|
||||
|
@ -11,9 +11,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import hosts as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import hosts as data
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import hosts
|
||||
|
||||
|
@ -13,9 +13,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import hypervisors as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import hypervisors as data
|
||||
from novaclient.tests.unit import utils
|
||||
|
||||
|
||||
class HypervisorsTest(utils.FixturedTestCase):
|
@ -11,9 +11,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import images as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import images as data
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import images
|
||||
|
||||
|
@ -11,9 +11,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import keypairs as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import keypairs as data
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import keypairs
|
||||
|
||||
|
@ -11,9 +11,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import limits as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import limits as data
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import limits
|
||||
|
||||
|
@ -11,9 +11,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import networks as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import networks as data
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import networks
|
||||
|
||||
|
@ -13,8 +13,8 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.tests.unit.v1_1 import fakes
|
||||
|
||||
|
||||
cs = fakes.FakeClient()
|
@ -13,9 +13,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import quotas as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import quotas as data
|
||||
from novaclient.tests.unit import utils
|
||||
|
||||
|
||||
class QuotaSetsTest(utils.FixturedTestCase):
|
@ -12,9 +12,9 @@
|
||||
# under the License.
|
||||
|
||||
from novaclient import exceptions
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import security_group_rules as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import security_group_rules as data
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import security_group_rules
|
||||
|
||||
|
6
novaclient/tests/v1_1/test_security_groups.py → novaclient/tests/unit/v1_1/test_security_groups.py
6
novaclient/tests/v1_1/test_security_groups.py → novaclient/tests/unit/v1_1/test_security_groups.py
@ -11,9 +11,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import security_groups as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import security_groups as data
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import security_groups
|
||||
|
||||
|
@ -13,9 +13,9 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import server_groups as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import server_groups as data
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import server_groups
|
||||
|
||||
|
@ -17,10 +17,10 @@ from oslo.serialization import jsonutils
|
||||
import six
|
||||
|
||||
from novaclient import exceptions
|
||||
from novaclient.tests.fixture_data import client
|
||||
from novaclient.tests.fixture_data import floatingips
|
||||
from novaclient.tests.fixture_data import servers as data
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.unit.fixture_data import client
|
||||
from novaclient.tests.unit.fixture_data import floatingips
|
||||
from novaclient.tests.unit.fixture_data import servers as data
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.v1_1 import servers
|
||||
|
||||
|
||||
@ -525,7 +525,7 @@ class ServersTest(utils.FixturedTestCase):
|
||||
#
|
||||
# Clear password: FooBar123
|
||||
#
|
||||
# RSA Private Key: novaclient/tests/idfake.pem
|
||||
# RSA Private Key: novaclient/tests/unit/idfake.pem
|
||||
#
|
||||
# Encrypted password
|
||||
# OIuEuQttO8Rk93BcKlwHQsziDAnkAm/V6V8VPToA8ZeUaUBWwS0gwo2K6Y61Z96r
|
||||
@ -538,7 +538,7 @@ class ServersTest(utils.FixturedTestCase):
|
||||
def test_get_password(self):
|
||||
s = self.cs.servers.get(1234)
|
||||
self.assertEqual(b'FooBar123',
|
||||
s.get_password('novaclient/tests/idfake.pem'))
|
||||
s.get_password('novaclient/tests/unit/idfake.pem'))
|
||||
self.assert_called('GET', '/servers/1234/os-server-password')
|
||||
|
||||
def test_get_password_without_key(self):
|
@ -13,8 +13,8 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.tests.unit.v1_1 import fakes
|
||||
from novaclient.v1_1 import services
|
||||
|
||||
|
@ -29,8 +29,8 @@ from six.moves import builtins
|
||||
import novaclient.client
|
||||
from novaclient import exceptions
|
||||
import novaclient.shell
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.tests.unit.v1_1 import fakes
|
||||
import novaclient.v1_1.shell
|
||||
|
||||
|
@ -13,8 +13,8 @@
|
||||
|
||||
import datetime
|
||||
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.tests.unit.v1_1 import fakes
|
||||
from novaclient.v1_1 import usage
|
||||
|
||||
|
@ -13,8 +13,8 @@
|
||||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
from novaclient.tests import utils
|
||||
from novaclient.tests.v1_1 import fakes
|
||||
from novaclient.tests.unit import utils
|
||||
from novaclient.tests.unit.v1_1 import fakes
|
||||
from novaclient.v1_1 import volumes
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user