summaryrefslogtreecommitdiff
path: root/openstackclient/tests
diff options
context:
space:
mode:
Diffstat (limited to 'openstackclient/tests')
-rw-r--r--openstackclient/tests/compute/v2/test_server.py2
-rw-r--r--openstackclient/tests/identity/v2_0/test_project.py4
-rw-r--r--openstackclient/tests/identity/v2_0/test_role.py4
-rw-r--r--openstackclient/tests/identity/v2_0/test_user.py4
-rw-r--r--openstackclient/tests/identity/v3/fakes.py2
-rw-r--r--openstackclient/tests/identity/v3/test_project.py2
-rw-r--r--openstackclient/tests/identity/v3/test_role.py2
-rw-r--r--openstackclient/tests/identity/v3/test_service.py87
-rw-r--r--openstackclient/tests/identity/v3/test_user.py2
-rw-r--r--openstackclient/tests/image/v1/test_image.py2
-rw-r--r--openstackclient/tests/image/v2/test_image.py2
-rw-r--r--openstackclient/tests/network/v2/test_network.py2
12 files changed, 98 insertions, 17 deletions
diff --git a/openstackclient/tests/compute/v2/test_server.py b/openstackclient/tests/compute/v2/test_server.py
index 19c13440..d51beef3 100644
--- a/openstackclient/tests/compute/v2/test_server.py
+++ b/openstackclient/tests/compute/v2/test_server.py
@@ -232,7 +232,7 @@ class TestServerDelete(TestServer):
compute_fakes.server_id,
]
verifylist = [
- ('server', compute_fakes.server_id),
+ ('servers', [compute_fakes.server_id]),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
diff --git a/openstackclient/tests/identity/v2_0/test_project.py b/openstackclient/tests/identity/v2_0/test_project.py
index 833b5d84..0c5ef77f 100644
--- a/openstackclient/tests/identity/v2_0/test_project.py
+++ b/openstackclient/tests/identity/v2_0/test_project.py
@@ -15,7 +15,7 @@
import copy
-from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
+from keystoneclient import exceptions as ksc_exc
from openstackclient.identity.v2_0 import project
from openstackclient.tests import fakes
@@ -326,7 +326,7 @@ class TestProjectDelete(TestProject):
identity_fakes.project_id,
]
verifylist = [
- ('project', identity_fakes.project_id),
+ ('projects', [identity_fakes.project_id]),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
diff --git a/openstackclient/tests/identity/v2_0/test_role.py b/openstackclient/tests/identity/v2_0/test_role.py
index 67467747..2e3a2863 100644
--- a/openstackclient/tests/identity/v2_0/test_role.py
+++ b/openstackclient/tests/identity/v2_0/test_role.py
@@ -16,7 +16,7 @@
import copy
import mock
-from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
+from keystoneclient import exceptions as ksc_exc
from openstackclient.common import exceptions
from openstackclient.identity.v2_0 import role
@@ -234,7 +234,7 @@ class TestRoleDelete(TestRole):
identity_fakes.role_name,
]
verifylist = [
- ('role', identity_fakes.role_name),
+ ('roles', [identity_fakes.role_name]),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
diff --git a/openstackclient/tests/identity/v2_0/test_user.py b/openstackclient/tests/identity/v2_0/test_user.py
index a025dd7d..ccdf240e 100644
--- a/openstackclient/tests/identity/v2_0/test_user.py
+++ b/openstackclient/tests/identity/v2_0/test_user.py
@@ -16,7 +16,7 @@
import copy
import mock
-from keystoneclient.openstack.common.apiclient import exceptions as ksc_exc
+from keystoneclient import exceptions as ksc_exc
from openstackclient.identity.v2_0 import user
from openstackclient.tests import fakes
from openstackclient.tests.identity.v2_0 import fakes as identity_fakes
@@ -443,7 +443,7 @@ class TestUserDelete(TestUser):
identity_fakes.user_id,
]
verifylist = [
- ('user', identity_fakes.user_id),
+ ('users', [identity_fakes.user_id]),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
diff --git a/openstackclient/tests/identity/v3/fakes.py b/openstackclient/tests/identity/v3/fakes.py
index 7acaa7f1..fbdac4ed 100644
--- a/openstackclient/tests/identity/v3/fakes.py
+++ b/openstackclient/tests/identity/v3/fakes.py
@@ -147,11 +147,13 @@ ROLE = {
service_id = 's-123'
service_name = 'Texaco'
service_type = 'gas'
+service_description = 'oil brand'
SERVICE = {
'id': service_id,
'name': service_name,
'type': service_type,
+ 'description': service_description,
'enabled': True,
'links': base_url + 'services/' + service_id,
}
diff --git a/openstackclient/tests/identity/v3/test_project.py b/openstackclient/tests/identity/v3/test_project.py
index 1060a277..d16f9732 100644
--- a/openstackclient/tests/identity/v3/test_project.py
+++ b/openstackclient/tests/identity/v3/test_project.py
@@ -353,7 +353,7 @@ class TestProjectDelete(TestProject):
identity_fakes.project_id,
]
verifylist = [
- ('project', identity_fakes.project_id),
+ ('projects', [identity_fakes.project_id]),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
diff --git a/openstackclient/tests/identity/v3/test_role.py b/openstackclient/tests/identity/v3/test_role.py
index 3d2a402b..1a9e6aa7 100644
--- a/openstackclient/tests/identity/v3/test_role.py
+++ b/openstackclient/tests/identity/v3/test_role.py
@@ -271,7 +271,7 @@ class TestRoleDelete(TestRole):
identity_fakes.role_name,
]
verifylist = [
- ('role', identity_fakes.role_name),
+ ('roles', [identity_fakes.role_name]),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
diff --git a/openstackclient/tests/identity/v3/test_service.py b/openstackclient/tests/identity/v3/test_service.py
index 57db77b1..5e4dc585 100644
--- a/openstackclient/tests/identity/v3/test_service.py
+++ b/openstackclient/tests/identity/v3/test_service.py
@@ -51,6 +51,7 @@ class TestServiceCreate(TestService):
]
verifylist = [
('name', identity_fakes.service_name),
+ ('description', None),
('enable', False),
('disable', False),
('type', identity_fakes.service_type),
@@ -64,12 +65,50 @@ class TestServiceCreate(TestService):
self.services_mock.create.assert_called_with(
name=identity_fakes.service_name,
type=identity_fakes.service_type,
+ description=None,
enabled=True,
)
- collist = ('enabled', 'id', 'name', 'type')
+ collist = ('description', 'enabled', 'id', 'name', 'type')
self.assertEqual(columns, collist)
datalist = (
+ identity_fakes.service_description,
+ True,
+ identity_fakes.service_id,
+ identity_fakes.service_name,
+ identity_fakes.service_type,
+ )
+ self.assertEqual(data, datalist)
+
+ def test_service_create_description(self):
+ arglist = [
+ '--description', identity_fakes.service_description,
+ identity_fakes.service_type,
+ ]
+ verifylist = [
+ ('name', None),
+ ('description', identity_fakes.service_description),
+ ('enable', False),
+ ('disable', False),
+ ('type', identity_fakes.service_type),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ # DisplayCommandBase.take_action() returns two tuples
+ columns, data = self.cmd.take_action(parsed_args)
+
+ # ServiceManager.create(name=, type=, enabled=, **kwargs)
+ self.services_mock.create.assert_called_with(
+ name=None,
+ type=identity_fakes.service_type,
+ description=identity_fakes.service_description,
+ enabled=True,
+ )
+
+ collist = ('description', 'enabled', 'id', 'name', 'type')
+ self.assertEqual(columns, collist)
+ datalist = (
+ identity_fakes.service_description,
True,
identity_fakes.service_id,
identity_fakes.service_name,
@@ -84,6 +123,7 @@ class TestServiceCreate(TestService):
]
verifylist = [
('name', None),
+ ('description', None),
('enable', True),
('disable', False),
('type', identity_fakes.service_type),
@@ -97,12 +137,14 @@ class TestServiceCreate(TestService):
self.services_mock.create.assert_called_with(
name=None,
type=identity_fakes.service_type,
+ description=None,
enabled=True,
)
- collist = ('enabled', 'id', 'name', 'type')
+ collist = ('description', 'enabled', 'id', 'name', 'type')
self.assertEqual(columns, collist)
datalist = (
+ identity_fakes.service_description,
True,
identity_fakes.service_id,
identity_fakes.service_name,
@@ -117,6 +159,7 @@ class TestServiceCreate(TestService):
]
verifylist = [
('name', None),
+ ('description', None),
('enable', False),
('disable', True),
('type', identity_fakes.service_type),
@@ -130,12 +173,14 @@ class TestServiceCreate(TestService):
self.services_mock.create.assert_called_with(
name=None,
type=identity_fakes.service_type,
+ description=None,
enabled=False,
)
- collist = ('enabled', 'id', 'name', 'type')
+ collist = ('description', 'enabled', 'id', 'name', 'type')
self.assertEqual(columns, collist)
datalist = (
+ identity_fakes.service_description,
True,
identity_fakes.service_id,
identity_fakes.service_name,
@@ -239,6 +284,7 @@ class TestServiceSet(TestService):
verifylist = [
('type', None),
('name', None),
+ ('description', None),
('enable', False),
('disable', False),
('service', identity_fakes.service_name),
@@ -256,6 +302,7 @@ class TestServiceSet(TestService):
verifylist = [
('type', identity_fakes.service_type),
('name', None),
+ ('description', None),
('enable', False),
('disable', False),
('service', identity_fakes.service_name),
@@ -283,6 +330,7 @@ class TestServiceSet(TestService):
verifylist = [
('type', None),
('name', identity_fakes.service_name),
+ ('description', None),
('enable', False),
('disable', False),
('service', identity_fakes.service_name),
@@ -302,6 +350,34 @@ class TestServiceSet(TestService):
**kwargs
)
+ def test_service_set_description(self):
+ arglist = [
+ '--description', identity_fakes.service_description,
+ identity_fakes.service_name,
+ ]
+ verifylist = [
+ ('type', None),
+ ('name', None),
+ ('description', identity_fakes.service_description),
+ ('enable', False),
+ ('disable', False),
+ ('service', identity_fakes.service_name),
+ ]
+ parsed_args = self.check_parser(self.cmd, arglist, verifylist)
+
+ result = self.cmd.run(parsed_args)
+ self.assertEqual(result, 0)
+
+ # Set expected values
+ kwargs = {
+ 'description': identity_fakes.service_description,
+ }
+ # ServiceManager.update(service, name=, type=, enabled=, **kwargs)
+ self.services_mock.update.assert_called_with(
+ identity_fakes.service_id,
+ **kwargs
+ )
+
def test_service_set_enable(self):
arglist = [
'--enable',
@@ -310,6 +386,7 @@ class TestServiceSet(TestService):
verifylist = [
('type', None),
('name', None),
+ ('description', None),
('enable', True),
('disable', False),
('service', identity_fakes.service_name),
@@ -337,6 +414,7 @@ class TestServiceSet(TestService):
verifylist = [
('type', None),
('name', None),
+ ('description', None),
('enable', False),
('disable', True),
('service', identity_fakes.service_name),
@@ -388,9 +466,10 @@ class TestServiceShow(TestService):
identity_fakes.service_name,
)
- collist = ('enabled', 'id', 'name', 'type')
+ collist = ('description', 'enabled', 'id', 'name', 'type')
self.assertEqual(columns, collist)
datalist = (
+ identity_fakes.service_description,
True,
identity_fakes.service_id,
identity_fakes.service_name,
diff --git a/openstackclient/tests/identity/v3/test_user.py b/openstackclient/tests/identity/v3/test_user.py
index bb59ebe5..9740ed82 100644
--- a/openstackclient/tests/identity/v3/test_user.py
+++ b/openstackclient/tests/identity/v3/test_user.py
@@ -461,7 +461,7 @@ class TestUserDelete(TestUser):
identity_fakes.user_id,
]
verifylist = [
- ('user', identity_fakes.user_id),
+ ('users', [identity_fakes.user_id]),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
diff --git a/openstackclient/tests/image/v1/test_image.py b/openstackclient/tests/image/v1/test_image.py
index a0566930..4d21ac48 100644
--- a/openstackclient/tests/image/v1/test_image.py
+++ b/openstackclient/tests/image/v1/test_image.py
@@ -288,7 +288,7 @@ class TestImageDelete(TestImage):
image_fakes.image_id,
]
verifylist = [
- ('image', image_fakes.image_id),
+ ('images', [image_fakes.image_id]),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
diff --git a/openstackclient/tests/image/v2/test_image.py b/openstackclient/tests/image/v2/test_image.py
index 3e9eeebb..bc61a89f 100644
--- a/openstackclient/tests/image/v2/test_image.py
+++ b/openstackclient/tests/image/v2/test_image.py
@@ -51,7 +51,7 @@ class TestImageDelete(TestImage):
image_fakes.image_id,
]
verifylist = [
- ('image', image_fakes.image_id),
+ ('images', [image_fakes.image_id]),
]
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
diff --git a/openstackclient/tests/network/v2/test_network.py b/openstackclient/tests/network/v2/test_network.py
index 468db5e0..b893229f 100644
--- a/openstackclient/tests/network/v2/test_network.py
+++ b/openstackclient/tests/network/v2/test_network.py
@@ -120,7 +120,7 @@ class TestDeleteNetwork(common.TestNetworkBase):
FAKE_NAME,
]
verifylist = [
- ('identifier', FAKE_NAME),
+ ('networks', [FAKE_NAME]),
]
lister = mock.Mock(return_value={RESOURCES: [RECORD]})
self.app.client_manager.network.list_networks = lister
View Lorry Controller Status