|
19 | 19 | from openstackclient.tests import fakes |
20 | 20 | from openstackclient.tests.identity.v2_0 import fakes as identity_fakes_v2 |
21 | 21 | from openstackclient.tests.identity.v3 import fakes as identity_fakes_v3 |
22 | | -from openstackclient.tests.network import common |
23 | 22 | from openstackclient.tests.network.v2 import fakes as network_fakes |
24 | 23 |
|
25 | 24 | RESOURCE = 'network' |
@@ -414,6 +413,7 @@ def setUp(self): |
414 | 413 | return_value={RESOURCES: [copy.deepcopy(RECORD)]} |
415 | 414 | ) |
416 | 415 |
|
| 416 | + # Get the command object to test |
417 | 417 | self.cmd = network.SetNetwork(self.app, self.namespace) |
418 | 418 |
|
419 | 419 | def test_set_this(self): |
@@ -470,40 +470,36 @@ def test_set_nothing(self): |
470 | 470 | @mock.patch( |
471 | 471 | 'openstackclient.api.network_v2.APIv2.find_attr' |
472 | 472 | ) |
473 | | -class TestShowNetwork(common.TestNetworkBase): |
| 473 | +class TestShowNetwork(TestNetwork): |
474 | 474 |
|
475 | 475 | def setUp(self): |
476 | 476 | super(TestShowNetwork, self).setUp() |
477 | 477 |
|
478 | 478 | # Get the command object to test |
479 | 479 | self.cmd = network.ShowNetwork(self.app, self.namespace) |
480 | 480 |
|
481 | | - self.NETWORK_ITEM = copy.deepcopy(RECORD) |
482 | | - |
483 | | - def test_show_no_options(self, n_mock): |
| 481 | + def test_show_no_options(self, find_attr): |
484 | 482 | arglist = [ |
485 | 483 | FAKE_NAME, |
486 | 484 | ] |
487 | 485 | verifylist = [ |
488 | 486 | ('identifier', FAKE_NAME), |
489 | 487 | ] |
490 | | - n_mock.return_value = copy.deepcopy(RECORD) |
491 | | - self.cmd = network.ShowNetwork(self.app, self.namespace) |
| 488 | + find_attr.return_value = copy.deepcopy(RECORD) |
492 | 489 |
|
493 | 490 | parsed_args = self.check_parser(self.cmd, arglist, verifylist) |
494 | 491 | result = list(self.cmd.take_action(parsed_args)) |
495 | 492 |
|
496 | | - n_mock.assert_called_with('networks', FAKE_NAME) |
| 493 | + find_attr.assert_called_with('networks', FAKE_NAME) |
497 | 494 | self.assertEqual(FILTERED, result) |
498 | 495 |
|
499 | | - def test_show_all_options(self, n_mock): |
| 496 | + def test_show_all_options(self, find_attr): |
500 | 497 | arglist = [FAKE_NAME] |
501 | 498 | verifylist = [('identifier', FAKE_NAME)] |
502 | | - n_mock.return_value = copy.deepcopy(RECORD) |
503 | | - self.cmd = network.ShowNetwork(self.app, self.namespace) |
| 499 | + find_attr.return_value = copy.deepcopy(RECORD) |
504 | 500 |
|
505 | 501 | parsed_args = self.check_parser(self.cmd, arglist, verifylist) |
506 | 502 | result = list(self.cmd.take_action(parsed_args)) |
507 | 503 |
|
508 | | - n_mock.assert_called_with('networks', FAKE_NAME) |
| 504 | + find_attr.assert_called_with('networks', FAKE_NAME) |
509 | 505 | self.assertEqual(FILTERED, result) |
0 commit comments