diff options
Diffstat (limited to 'openstackclient/tests')
5 files changed, 119 insertions, 21 deletions
diff --git a/openstackclient/tests/functional/network/v2/test_router.py b/openstackclient/tests/functional/network/v2/test_router.py index 443f68b2..aa708e0a 100644 --- a/openstackclient/tests/functional/network/v2/test_router.py +++ b/openstackclient/tests/functional/network/v2/test_router.py @@ -20,7 +20,7 @@ class RouterTests(base.TestCase): """Functional tests for router. """ def test_router_create_and_delete(self): - """Test create options, delete""" + """Test create options, delete multiple""" name1 = uuid.uuid4().hex name2 = uuid.uuid4().hex cmd_output = json.loads(self.openstack( @@ -75,6 +75,8 @@ class RouterTests(base.TestCase): '--disable ' + name1 )) + + self.addCleanup(self.openstack, 'router delete ' + name1) self.assertEqual( name1, cmd_output["name"], @@ -92,6 +94,8 @@ class RouterTests(base.TestCase): '--project ' + demo_project_id + ' ' + name2 )) + + self.addCleanup(self.openstack, 'router delete ' + name2) self.assertEqual( name2, cmd_output["name"], @@ -141,12 +145,8 @@ class RouterTests(base.TestCase): self.assertIn(name1, names) self.assertIn(name2, names) - del_output = self.openstack( - 'router delete ' + name1 + ' ' + name2) - self.assertOutput('', del_output) - def test_router_set_show_unset(self): - """Tests create router, set, unset, show, delete""" + """Tests create router, set, unset, show""" name = uuid.uuid4().hex new_name = name + "_" @@ -155,6 +155,7 @@ class RouterTests(base.TestCase): '--description aaaa ' + name )) + self.addCleanup(self.openstack, 'router delete ' + new_name) self.assertEqual( name, cmd_output["name"], @@ -221,7 +222,3 @@ class RouterTests(base.TestCase): new_name )) self.assertIsNone(cmd_output["external_gateway_info"]) - - del_output = self.openstack( - 'router delete ' + new_name) - self.assertOutput('', del_output) diff --git a/openstackclient/tests/functional/network/v2/test_subnet.py b/openstackclient/tests/functional/network/v2/test_subnet.py index 995a4979..61cffcde 100644 --- a/openstackclient/tests/functional/network/v2/test_subnet.py +++ b/openstackclient/tests/functional/network/v2/test_subnet.py @@ -37,7 +37,7 @@ class SubnetTests(base.TestCase): cls.assertOutput('', raw_output) def test_subnet_create_and_delete(self): - """Test create, delete""" + """Test create, delete multiple""" name1 = uuid.uuid4().hex cmd = ('subnet create -f json --network ' + self.NETWORK_NAME + @@ -51,9 +51,22 @@ class SubnetTests(base.TestCase): self.NETWORK_ID, cmd_output["network_id"], ) + name2 = uuid.uuid4().hex + cmd = ('subnet create -f json --network ' + + self.NETWORK_NAME + + ' --subnet-range') + cmd_output = self._subnet_create(cmd, name2) + self.assertEqual( + name2, + cmd_output["name"], + ) + self.assertEqual( + self.NETWORK_ID, + cmd_output["network_id"], + ) del_output = self.openstack( - 'subnet delete ' + name1) + 'subnet delete ' + name1 + ' ' + name2) self.assertOutput('', del_output) def test_subnet_list(self): @@ -64,6 +77,8 @@ class SubnetTests(base.TestCase): '--network ' + self.NETWORK_NAME + ' --dhcp --subnet-range') cmd_output = self._subnet_create(cmd, name1) + + self.addCleanup(self.openstack, 'subnet delete ' + name1) self.assertEqual( name1, cmd_output["name"], @@ -86,6 +101,8 @@ class SubnetTests(base.TestCase): ' --ip-version 6 --no-dhcp ' + '--subnet-range') cmd_output = self._subnet_create(cmd, name2, is_type_ipv4=False) + + self.addCleanup(self.openstack, 'subnet delete ' + name2) self.assertEqual( name2, cmd_output["name"], @@ -148,12 +165,8 @@ class SubnetTests(base.TestCase): self.assertNotIn(name1, names) self.assertIn(name2, names) - del_output = self.openstack( - 'subnet delete ' + name1 + ' ' + name2) - self.assertOutput('', del_output) - def test_subnet_set_show_unset(self): - """Test create subnet, set, unset, show, delete""" + """Test create subnet, set, unset, show""" name = uuid.uuid4().hex new_name = name + "_" @@ -161,6 +174,8 @@ class SubnetTests(base.TestCase): '--network ' + self.NETWORK_NAME + ' --description aaaa --subnet-range') cmd_output = self._subnet_create(cmd, name) + + self.addCleanup(self.openstack, 'subnet delete ' + new_name) self.assertEqual( name, cmd_output["name"], @@ -224,10 +239,6 @@ class SubnetTests(base.TestCase): cmd_output["service_types"], ) - del_output = self.openstack( - 'subnet delete ' + new_name) - self.assertOutput('', del_output) - def _subnet_create(self, cmd, name, is_type_ipv4=True): # Try random subnet range for subnet creating # Because we can not determine ahead of time what subnets are already diff --git a/openstackclient/tests/unit/identity/v2_0/test_project.py b/openstackclient/tests/unit/identity/v2_0/test_project.py index 4e1077db..c726f2a6 100644 --- a/openstackclient/tests/unit/identity/v2_0/test_project.py +++ b/openstackclient/tests/unit/identity/v2_0/test_project.py @@ -26,6 +26,7 @@ from openstackclient.tests.unit.identity.v2_0 import fakes as identity_fakes class TestProject(identity_fakes.TestIdentityv2): fake_project = identity_fakes.FakeProject.create_one_project() + fake_projects = identity_fakes.FakeProject.create_projects() columns = ( 'description', @@ -39,6 +40,12 @@ class TestProject(identity_fakes.TestIdentityv2): fake_project.id, fake_project.name, ) + datalists = ( + (fake_projects[0].description, True, + fake_projects[0].id, fake_projects[0].name,), + (fake_projects[1].description, True, + fake_projects[1].id, fake_projects[1].name,), + ) def setUp(self): super(TestProject, self).setUp() @@ -386,6 +393,35 @@ class TestProjectList(TestProject): ), ) self.assertEqual(datalist, tuple(data)) + def test_project_list_sort(self): + self.projects_mock.list.return_value = self.fake_projects + + arglist = ['--sort', 'name:asc', ] + verifylist = [] + parsed_args = self.check_parser(self.cmd, arglist, verifylist) + + # In base command class Lister in cliff, abstract method take_action() + # returns a tuple containing the column names and an iterable + # containing the data to be listed. + (columns, data) = self.cmd.take_action(parsed_args) + self.projects_mock.list.assert_called_with() + + collist = ('ID', 'Name') + self.assertEqual(collist, columns) + + if self.fake_projects[0].name > self.fake_projects[1].name: + datalists = ( + (self.fake_projects[1].id, self.fake_projects[1].name), + (self.fake_projects[0].id, self.fake_projects[0].name), + ) + else: + datalists = ( + (self.fake_projects[0].id, self.fake_projects[0].name), + (self.fake_projects[1].id, self.fake_projects[1].name), + ) + + self.assertEqual(datalists, tuple(data)) + class TestProjectSet(TestProject): diff --git a/openstackclient/tests/unit/identity/v3/fakes.py b/openstackclient/tests/unit/identity/v3/fakes.py index 75065e65..01b5dede 100644 --- a/openstackclient/tests/unit/identity/v3/fakes.py +++ b/openstackclient/tests/unit/identity/v3/fakes.py @@ -622,6 +622,23 @@ class FakeProject(object): loaded=True) return project + @staticmethod + def create_projects(attrs=None, count=2): + """Create multiple fake projects. + + :param Dictionary attrs: + A dictionary with all attributes + :param int count: + The number of projects to fake + :return: + A list of FakeResource objects faking the projects + """ + + projects = [] + for i in range(0, count): + projects.append(FakeProject.create_one_project(attrs)) + return projects + class FakeDomain(object): """Fake one or more domain.""" diff --git a/openstackclient/tests/unit/identity/v3/test_project.py b/openstackclient/tests/unit/identity/v3/test_project.py index b99eaf85..a27bf2a5 100644 --- a/openstackclient/tests/unit/identity/v3/test_project.py +++ b/openstackclient/tests/unit/identity/v3/test_project.py @@ -479,6 +479,7 @@ class TestProjectList(TestProject): domain = identity_fakes.FakeDomain.create_one_domain() project = identity_fakes.FakeProject.create_one_project( attrs={'domain_id': domain.id}) + projects = identity_fakes.FakeProject.create_projects() columns = ( 'ID', @@ -490,6 +491,12 @@ class TestProjectList(TestProject): project.name, ), ) + datalists = ( + (projects[0].description, True, + projects[0].id, projects[0].name,), + (projects[1].description, True, + projects[1].id, projects[1].name,), + ) def setUp(self): super(TestProjectList, self).setUp() @@ -580,6 +587,36 @@ class TestProjectList(TestProject): self.assertEqual(self.columns, columns) self.assertEqual(self.datalist, tuple(data)) + def test_project_list_sort(self): + self.projects_mock.list.return_value = self.projects + + arglist = ['--sort', 'name:asc', ] + verifylist = [] + + parsed_args = self.check_parser(self.cmd, arglist, verifylist) + + # In base command class Lister in cliff, abstract method take_action() + # returns a tuple containing the column names and an iterable + # containing the data to be listed. + (columns, data) = self.cmd.take_action(parsed_args) + self.projects_mock.list.assert_called_with() + + collist = ('ID', 'Name') + self.assertEqual(collist, columns) + + if self.projects[0].name > self.projects[1].name: + datalists = ( + (self.projects[1].id, self.projects[1].name), + (self.projects[0].id, self.projects[0].name), + ) + else: + datalists = ( + (self.projects[0].id, self.projects[0].name), + (self.projects[1].id, self.projects[1].name), + ) + + self.assertEqual(datalists, tuple(data)) + class TestProjectSet(TestProject): |