openstack/python-novaclient
Code Issues Proposed changes

Merge "Remove the deprecated fping API"

Browse Source
This commit is contained in:
Jenkins 2017-03-24 04:46:39 +00:00 committed by Gerrit Code Review
commit 8551ee3b36
5 changed files with 1 additions and 181 deletions

46
novaclient/tests/unit/fixture_data/fping.py

@ -1,46 +0,0 @@
# 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.unit.fixture_data import base
class Fixture(base.Fixture):
base_url = 'os-fping'
def setUp(self):
super(Fixture, self).setUp()
get_os_fping_1 = {
'server': {
"id": "1",
"project_id": "fake-project",
"alive": True,
}
}
self.requests_mock.get(self.url(1),
json=get_os_fping_1,
headers=self.json_headers)
get_os_fping = {
'servers': [
get_os_fping_1['server'],
{
"id": "2",
"project_id": "fake-project",
"alive": True,
},
]
}
self.requests_mock.get(self.url(),
json=get_os_fping,
headers=self.json_headers)

69
novaclient/tests/unit/v2/test_fping.py

@ -1,69 +0,0 @@
# Copyright 2012 OpenStack Foundation
# All Rights Reserved.
#
# 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.unit.fixture_data import client
from novaclient.tests.unit.fixture_data import fping as data
from novaclient.tests.unit import utils
from novaclient.tests.unit.v2 import fakes
from novaclient.v2 import fping
class FpingTest(utils.FixturedTestCase):
client_fixture_class = client.V1
data_fixture_class = data.Fixture
def test_fping_repr(self):
r = self.cs.fping.get(1)
self.assert_request_id(r, fakes.FAKE_REQUEST_ID_LIST)
self.assertEqual("<Fping: 1>", repr(r))
def test_list_fpings(self):
fl = self.cs.fping.list()
self.assert_request_id(fl, fakes.FAKE_REQUEST_ID_LIST)
self.assert_called('GET', '/os-fping')
for f in fl:
self.assertIsInstance(f, fping.Fping)
self.assertEqual("fake-project", f.project_id)
self.assertTrue(f.alive)
def test_list_fpings_all_tenants(self):
fl = self.cs.fping.list(all_tenants=True)
self.assert_request_id(fl, fakes.FAKE_REQUEST_ID_LIST)
for f in fl:
self.assertIsInstance(f, fping.Fping)
self.assert_called('GET', '/os-fping?all_tenants=1')
def test_list_fpings_exclude(self):
fl = self.cs.fping.list(exclude=['1'])
self.assert_request_id(fl, fakes.FAKE_REQUEST_ID_LIST)
for f in fl:
self.assertIsInstance(f, fping.Fping)
self.assert_called('GET', '/os-fping?exclude=1')
def test_list_fpings_include(self):
fl = self.cs.fping.list(include=['1'])
self.assert_request_id(fl, fakes.FAKE_REQUEST_ID_LIST)
for f in fl:
self.assertIsInstance(f, fping.Fping)
self.assert_called('GET', '/os-fping?include=1')
def test_get_fping(self):
f = self.cs.fping.get(1)
self.assert_request_id(f, fakes.FAKE_REQUEST_ID_LIST)
self.assert_called('GET', '/os-fping/1')
self.assertIsInstance(f, fping.Fping)
self.assertEqual("fake-project", f.project_id)
self.assertTrue(f.alive)

2
novaclient/v2/client.py

@ -32,7 +32,6 @@ from novaclient.v2 import fixed_ips
from novaclient.v2 import flavor_access
from novaclient.v2 import flavors
from novaclient.v2 import floating_ips
from novaclient.v2 import fping
from novaclient.v2 import hosts
from novaclient.v2 import hypervisors
from novaclient.v2 import images
@ -160,7 +159,6 @@ class Client(object):
self.cloudpipe = cloudpipe.CloudpipeManager(self)
self.certs = certs.CertificateManager(self)
self.floating_ips = floating_ips.FloatingIPManager(self)
self.fping = fping.FpingManager(self)
self.volumes = volumes.VolumeManager(self)
self.keypairs = keypairs.KeypairManager(self)
self.networks = networks.NetworkManager(self)

64
novaclient/v2/fping.py

@ -1,64 +0,0 @@
# Copyright 2012 OpenStack Foundation
# All Rights Reserved.
#
# 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.
"""
Fping interface.
"""
from six.moves import urllib
from novaclient import api_versions
from novaclient import base
class Fping(base.Resource):
"""DEPRECATED: A server to fping."""
HUMAN_ID = True
def __repr__(self):
return "<Fping: %s>" % self.id
class FpingManager(base.ManagerWithFind):
"""DEPRECATED: Manage :class:`Fping` resources."""
resource_class = Fping
@api_versions.deprecated_after('2.35')
def list(self, all_tenants=False, include=None, exclude=None):
"""DEPRECATED: Fping all servers.
:returns: list of :class:`Fping`.
"""
include = include or []
exclude = exclude or []
params = []
if all_tenants:
params.append(("all_tenants", 1))
if include:
params.append(("include", ",".join(include)))
elif exclude:
params.append(("exclude", ",".join(exclude)))
uri = "/os-fping"
if params:
uri = "%s?%s" % (uri, urllib.parse.urlencode(params))
return self._list(uri, "servers")
@api_versions.deprecated_after('2.35')
def get(self, server):
"""DEPRECATED: Fping a specific server.
:param server: ID of the server to fping.
:returns: :class:`Fping`
"""
return self._get("/os-fping/%s" % base.getid(server), "server")

1
releasenotes/notes/pike-rm-deprecated-net-272aeb62b329a5bc.yaml

@ -58,6 +58,7 @@ upgrade:
* novaclient.v2.floating_ip_dns
* novaclient.v2.floating_ip_pools
* novaclient.v2.floating_ips_bulk
* novaclient.v2.fping
deprecations:
- |