diff options
Diffstat (limited to 'openstackclient/tests/unit')
| -rw-r--r-- | openstackclient/tests/unit/api/test_compute_v2.py | 30 | ||||
| -rw-r--r-- | openstackclient/tests/unit/network/v2/test_network_compute.py | 18 |
2 files changed, 33 insertions, 15 deletions
diff --git a/openstackclient/tests/unit/api/test_compute_v2.py b/openstackclient/tests/unit/api/test_compute_v2.py index 22ee4899..f10fb6cf 100644 --- a/openstackclient/tests/unit/api/test_compute_v2.py +++ b/openstackclient/tests/unit/api/test_compute_v2.py @@ -185,7 +185,7 @@ class TestNetwork(TestComputeAPIv2): def test_network_create_default(self): self.requests_mock.register_uri( 'POST', - FAKE_URL + '/os-tenant-networks', + FAKE_URL + '/os-networks', json={'network': self.FAKE_NETWORK_RESP}, status_code=200, ) @@ -195,7 +195,7 @@ class TestNetwork(TestComputeAPIv2): def test_network_create_options(self): self.requests_mock.register_uri( 'POST', - FAKE_URL + '/os-tenant-networks', + FAKE_URL + '/os-networks', json={'network': self.FAKE_NETWORK_RESP}, status_code=200, ) @@ -208,13 +208,13 @@ class TestNetwork(TestComputeAPIv2): def test_network_delete_id(self): self.requests_mock.register_uri( 'GET', - FAKE_URL + '/os-tenant-networks/1', + FAKE_URL + '/os-networks/1', json={'network': self.FAKE_NETWORK_RESP}, status_code=200, ) self.requests_mock.register_uri( 'DELETE', - FAKE_URL + '/os-tenant-networks/1', + FAKE_URL + '/os-networks/1', status_code=202, ) ret = self.api.network_delete('1') @@ -224,18 +224,18 @@ class TestNetwork(TestComputeAPIv2): def test_network_delete_name(self): self.requests_mock.register_uri( 'GET', - FAKE_URL + '/os-tenant-networks/label1', + FAKE_URL + '/os-networks/label1', status_code=404, ) self.requests_mock.register_uri( 'GET', - FAKE_URL + '/os-tenant-networks', + FAKE_URL + '/os-networks', json={'networks': self.LIST_NETWORK_RESP}, status_code=200, ) self.requests_mock.register_uri( 'DELETE', - FAKE_URL + '/os-tenant-networks/1', + FAKE_URL + '/os-networks/1', status_code=202, ) ret = self.api.network_delete('label1') @@ -245,12 +245,12 @@ class TestNetwork(TestComputeAPIv2): def test_network_delete_not_found(self): self.requests_mock.register_uri( 'GET', - FAKE_URL + '/os-tenant-networks/label3', + FAKE_URL + '/os-networks/label3', status_code=404, ) self.requests_mock.register_uri( 'GET', - FAKE_URL + '/os-tenant-networks', + FAKE_URL + '/os-networks', json={'networks': self.LIST_NETWORK_RESP}, status_code=200, ) @@ -263,7 +263,7 @@ class TestNetwork(TestComputeAPIv2): def test_network_find_id(self): self.requests_mock.register_uri( 'GET', - FAKE_URL + '/os-tenant-networks/1', + FAKE_URL + '/os-networks/1', json={'network': self.FAKE_NETWORK_RESP}, status_code=200, ) @@ -273,12 +273,12 @@ class TestNetwork(TestComputeAPIv2): def test_network_find_name(self): self.requests_mock.register_uri( 'GET', - FAKE_URL + '/os-tenant-networks/label2', + FAKE_URL + '/os-networks/label2', status_code=404, ) self.requests_mock.register_uri( 'GET', - FAKE_URL + '/os-tenant-networks', + FAKE_URL + '/os-networks', json={'networks': self.LIST_NETWORK_RESP}, status_code=200, ) @@ -288,12 +288,12 @@ class TestNetwork(TestComputeAPIv2): def test_network_find_not_found(self): self.requests_mock.register_uri( 'GET', - FAKE_URL + '/os-tenant-networks/label3', + FAKE_URL + '/os-networks/label3', status_code=404, ) self.requests_mock.register_uri( 'GET', - FAKE_URL + '/os-tenant-networks', + FAKE_URL + '/os-networks', json={'networks': self.LIST_NETWORK_RESP}, status_code=200, ) @@ -306,7 +306,7 @@ class TestNetwork(TestComputeAPIv2): def test_network_list_no_options(self): self.requests_mock.register_uri( 'GET', - FAKE_URL + '/os-tenant-networks', + FAKE_URL + '/os-networks', json={'networks': self.LIST_NETWORK_RESP}, status_code=200, ) diff --git a/openstackclient/tests/unit/network/v2/test_network_compute.py b/openstackclient/tests/unit/network/v2/test_network_compute.py index 25beb859..c649401c 100644 --- a/openstackclient/tests/unit/network/v2/test_network_compute.py +++ b/openstackclient/tests/unit/network/v2/test_network_compute.py @@ -132,6 +132,24 @@ class TestCreateNetworkCompute(TestNetworkCompute): verifylist, ) + def test_network_create_missing_options(self, net_mock): + net_mock.return_value = self._network + arglist = [ + self._network['label'], + ] + verifylist = [ + ('name', self._network['label']), + ] + + # Missing required args should raise exception here + self.assertRaises( + tests_utils.ParserException, + self.check_parser, + self.cmd, + arglist, + verifylist, + ) + def test_network_create_default_options(self, net_mock): net_mock.return_value = self._network arglist = [ |