Merge "Remove functional tests for removed commands"
This commit is contained in:
commit
8968353964
@ -1,45 +0,0 @@
|
|||||||
# Copyright 2015 IBM Corp.
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
||||||
# not use this file except in compliance with the License. You may obtain
|
|
||||||
# a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
# License for the specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
|
|
||||||
from oslo_utils import strutils
|
|
||||||
|
|
||||||
from novaclient.tests.functional import base
|
|
||||||
|
|
||||||
|
|
||||||
class TestFixedIPsNovaClient(base.ClientTestBase):
|
|
||||||
"""FixedIPs functional tests."""
|
|
||||||
|
|
||||||
COMPUTE_API_VERSION = '2.1'
|
|
||||||
|
|
||||||
def _test_fixedip_get(self, expect_reserved=False):
|
|
||||||
# os-fixed-ips does not proxy to neutron
|
|
||||||
self.skip_if_neutron()
|
|
||||||
server = self._create_server(with_network=False)
|
|
||||||
networks = server.networks
|
|
||||||
self.assertIn('private', networks)
|
|
||||||
fixed_ip = networks['private'][0]
|
|
||||||
table = self.nova('fixed-ip-get %s' % fixed_ip)
|
|
||||||
addr = self._get_column_value_from_single_row_table(table, 'address')
|
|
||||||
self.assertEqual(fixed_ip, addr)
|
|
||||||
if expect_reserved:
|
|
||||||
reserved = self._get_column_value_from_single_row_table(table,
|
|
||||||
'reserved')
|
|
||||||
# By default the fixed IP should not be reserved.
|
|
||||||
self.assertFalse(strutils.bool_from_string(reserved, strict=True))
|
|
||||||
else:
|
|
||||||
self.assertRaises(ValueError,
|
|
||||||
self._get_column_value_from_single_row_table,
|
|
||||||
table, 'reserved')
|
|
||||||
|
|
||||||
def test_fixedip_get(self):
|
|
||||||
self._test_fixedip_get()
|
|
@ -41,11 +41,6 @@ class SimpleReadOnlyNovaClientTest(base.ClientTestBase):
|
|||||||
def test_admin_cloudpipe_list(self):
|
def test_admin_cloudpipe_list(self):
|
||||||
self.nova('cloudpipe-list')
|
self.nova('cloudpipe-list')
|
||||||
|
|
||||||
# "Neutron does not provide this feature"
|
|
||||||
def test_admin_dns_domains(self):
|
|
||||||
self.skip_if_neutron()
|
|
||||||
self.nova('dns-domains')
|
|
||||||
|
|
||||||
@decorators.skip_because(bug="1157349")
|
@decorators.skip_because(bug="1157349")
|
||||||
def test_admin_dns_list(self):
|
def test_admin_dns_list(self):
|
||||||
self.skip_if_neutron()
|
self.skip_if_neutron()
|
||||||
|
@ -1,23 +0,0 @@
|
|||||||
# Copyright 2015 IBM Corp.
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
||||||
# not use this file except in compliance with the License. You may obtain
|
|
||||||
# a copy of the License at
|
|
||||||
#
|
|
||||||
# http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
||||||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
||||||
# License for the specific language governing permissions and limitations
|
|
||||||
# under the License.
|
|
||||||
|
|
||||||
from novaclient.tests.functional.v2.legacy import test_fixedips
|
|
||||||
|
|
||||||
|
|
||||||
class TestFixedIPsNovaClientV24(test_fixedips.TestFixedIPsNovaClient):
|
|
||||||
"""FixedIPs functional tests for v2.4 nova-api microversion."""
|
|
||||||
|
|
||||||
COMPUTE_API_VERSION = '2.4'
|
|
||||||
|
|
||||||
def test_fixedip_get(self):
|
|
||||||
self._test_fixedip_get(expect_reserved=True)
|
|
Loading…
Reference in New Issue
Block a user