performa/os-faults
Code Issues Proposed changes

Remove deprecated methods

Browse Source 
Change-Id: Ie0361a0607d0467bc61eef4b5212c562883db43e
This commit is contained in:
Ilya Shakhat 2018-12-17 14:23:42 +01:00
parent d544fae043
commit 8f7e490c75
4 changed files with 3 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
os_faults/__init__.py
View File

@ -93,15 +93,6 @@ CONFIG_SCHEMA = {
'required': ['driver'],
'additionalProperties': False,
},
'power_management': {
'type': 'object',
'properties': {
'driver': {'type': 'string'},
'args': {'type': 'object'},
},
'required': ['driver', 'args'],
'additionalProperties': False,
},
'power_managements': {
'type': 'array',
'items': {
@ -179,17 +170,6 @@ def connect(cloud_config=None, config_filename=None):
pm = _init_driver(pm_conf)
cloud_management.add_power_management(pm)
power_management_conf = cloud_config.get('power_management')
if power_management_conf:
if power_managements_conf:
raise error.OSFError('Please use only power_managements')
else:
LOG.warning('power_management is deprecated, use '
'power_managements instead.')
power_management = _init_driver(power_management_conf)
cloud_management.add_power_management(power_management)
return cloud_management

6
os_faults/api/node_collection.py
View File

@ -13,7 +13,6 @@
import logging
import random
import warnings
from os_faults.api import error
from os_faults.api.utils import public
@ -99,11 +98,6 @@ class NodeCollection(utils.ReprMixin):
def get_fqdns(self):
return [host.fqdn for host in self.hosts]
def iterate_hosts(self):
warnings.warn('iterate_hosts is deprecated, use __iter__ instead',
DeprecationWarning, stacklevel=2)
return self.__iter__()
def pick(self, count=1):
"""Pick one Node out of collection

4
os_faults/tests/unit/api/test_node_collection.py
View File

@ -122,10 +122,6 @@ class NodeCollectionTestCase(test.TestCase):
def test_iter(self):
self.assertEqual(self.hosts, list(self.node_collection))
def test_iterate_hosts(self):
self.assertEqual(self.hosts,
list(self.node_collection.iterate_hosts()))
def test_get_ips(self):
self.assertEqual(['10.0.0.2', '10.0.0.3', '10.0.0.4', '10.0.0.5'],
self.node_collection.get_ips())

6
os_faults/tests/unit/test_os_faults.py
View File

@ -39,12 +39,12 @@ class OSFaultsTestCase(test.TestCase):
},
}
},
'power_management': {
'power_managements': [{
'driver': 'libvirt',
'args': {
'connection_uri': "qemu+ssh://user@10.30.20.21/system"
}
}
}]
}
def test_connect_devstack(self):
@ -105,7 +105,7 @@ class OSFaultsTestCase(test.TestCase):
self.assertEqual(['01:ab:cd:01:ab:cd', '02:ab:cd:02:ab:cd'],
nodes.get_macs())
def test_connect_fuel_with_libvirt(self):
def test_connect_with_libvirt(self):
destructor = os_faults.connect(self.cloud_config)
self.assertIsInstance(destructor, devstack.DevStackManagement)
self.assertEqual(1, len(destructor.power_manager.power_drivers))