Rename `tcpcloud` driver into `saltcloud`
TCPCloud was an internal name of a product owned by a company acquired by Mirantis. Change-Id: I6c5d6e7ee5c537c3b82f95abda63129594d3d9b4
This commit is contained in:
Ilya Shakhat
parent
601c49cca0
commit
87a80f6af5
|
|
@ -9,7 +9,7 @@ Cloud management
|
|||
|
||||
.. cloud_driver_doc:: devstack
|
||||
|
||||
.. cloud_driver_doc:: tcpcloud
|
||||
.. cloud_driver_doc:: saltcloud
|
||||
|
||||
|
||||
Power management
|
||||
|
|
|
|||
|
|
@ -79,7 +79,7 @@ and contains arguments such as SSH username/password/key/proxy.
|
|||
|
||||
|
||||
Drivers can support discovering of cloud nodes. For example,
|
||||
``tcpcloud`` drives allow discovering information about nodes
|
||||
``saltcloud`` drives allow discovering information about nodes
|
||||
through master/config node of the cloud.
|
||||
|
||||
List of supported drivers for cloud_management: :ref:`Cloud management`
|
||||
|
|
|
|||
|
|
@ -30,8 +30,8 @@ class DevStackNode(node_collection.NodeCollection):
|
|||
raise NotImplementedError
|
||||
|
||||
|
||||
class DevStackManagement(cloud_management.CloudManagement,
|
||||
node_discover.NodeDiscover):
|
||||
class DevStackCloudManagement(cloud_management.CloudManagement,
|
||||
node_discover.NodeDiscover):
|
||||
"""Driver for DevStack.
|
||||
|
||||
This driver requires DevStack installed with Systemd (USE_SCREEN=False).
|
||||
|
|
@ -220,7 +220,7 @@ class DevStackManagement(cloud_management.CloudManagement,
|
|||
}
|
||||
|
||||
def __init__(self, cloud_management_params):
|
||||
super(DevStackManagement, self).__init__()
|
||||
super(DevStackCloudManagement, self).__init__()
|
||||
self.node_discover = self # supports discovering
|
||||
|
||||
address = cloud_management_params['address']
|
||||
|
|
|
|||
|
|
@ -25,7 +25,7 @@ from os_faults import error
|
|||
LOG = logging.getLogger(__name__)
|
||||
|
||||
|
||||
class TCPCloudNodeCollection(node_collection.NodeCollection):
|
||||
class SaltCloudNodeCollection(node_collection.NodeCollection):
|
||||
|
||||
def connect(self, network_name):
|
||||
raise NotImplementedError
|
||||
|
|
@ -34,9 +34,9 @@ class TCPCloudNodeCollection(node_collection.NodeCollection):
|
|||
raise NotImplementedError
|
||||
|
||||
|
||||
class TCPCloudManagement(cloud_management.CloudManagement,
|
||||
node_discover.NodeDiscover):
|
||||
"""TCPCloud driver.
|
||||
class SaltCloudManagement(cloud_management.CloudManagement,
|
||||
node_discover.NodeDiscover):
|
||||
"""Driver for OpenStack cloud managed by Salt.
|
||||
|
||||
Supports discovering of slave nodes.
|
||||
|
||||
|
|
@ -45,7 +45,7 @@ class TCPCloudManagement(cloud_management.CloudManagement,
|
|||
.. code-block:: yaml
|
||||
|
||||
cloud_management:
|
||||
driver: tcpcloud
|
||||
driver: saltcloud
|
||||
args:
|
||||
address: 192.168.1.10
|
||||
auth:
|
||||
|
|
@ -80,9 +80,9 @@ class TCPCloudManagement(cloud_management.CloudManagement,
|
|||
(optional) default: 10
|
||||
"""
|
||||
|
||||
NAME = 'tcpcloud'
|
||||
DESCRIPTION = 'TCPCloud management driver'
|
||||
NODE_CLS = TCPCloudNodeCollection
|
||||
NAME = 'saltcloud'
|
||||
DESCRIPTION = 'SaltCloud management driver'
|
||||
NODE_CLS = SaltCloudNodeCollection
|
||||
SERVICES = {
|
||||
'keystone': {
|
||||
'driver': 'salt_service',
|
||||
|
|
@ -322,7 +322,7 @@ class TCPCloudManagement(cloud_management.CloudManagement,
|
|||
}
|
||||
|
||||
def __init__(self, cloud_management_params):
|
||||
super(TCPCloudManagement, self).__init__()
|
||||
super(SaltCloudManagement, self).__init__()
|
||||
self.node_discover = self # supports discovering
|
||||
|
||||
self.master_node_address = cloud_management_params['address']
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ class DevStackNodeTestCase(test.TestCase):
|
|||
def setUp(self):
|
||||
super(DevStackNodeTestCase, self).setUp()
|
||||
self.mock_cloud_management = mock.Mock(
|
||||
spec=devstack.DevStackManagement)
|
||||
spec=devstack.DevStackCloudManagement)
|
||||
self.host = node_collection.Host(
|
||||
ip='10.0.0.2', mac='09:7b:74:90:63:c1', fqdn='')
|
||||
|
||||
|
|
@ -61,7 +61,7 @@ class DevStackManagementTestCase(test.TestCase):
|
|||
[fakes.FakeAnsibleResult(payload={'stdout': ''},
|
||||
host='10.0.0.2')],
|
||||
]
|
||||
devstack_management = devstack.DevStackManagement(self.conf)
|
||||
devstack_management = devstack.DevStackCloudManagement(self.conf)
|
||||
devstack_management.verify()
|
||||
|
||||
ansible_runner_inst.execute.assert_has_calls([
|
||||
|
|
@ -75,7 +75,7 @@ class DevStackManagementTestCase(test.TestCase):
|
|||
ansible_runner_inst.execute.side_effect = [
|
||||
[fakes.FakeAnsibleResult(payload={'stdout': '/root'})],
|
||||
]
|
||||
devstack_management = devstack.DevStackManagement(self.conf)
|
||||
devstack_management = devstack.DevStackCloudManagement(self.conf)
|
||||
result = devstack_management.execute_on_cloud(
|
||||
['10.0.0.2'], {'command': 'pwd'})
|
||||
|
||||
|
|
@ -92,7 +92,7 @@ class DevStackManagementTestCase(test.TestCase):
|
|||
host='10.0.0.2')],
|
||||
]
|
||||
|
||||
devstack_management = devstack.DevStackManagement(self.conf)
|
||||
devstack_management = devstack.DevStackCloudManagement(self.conf)
|
||||
nodes = devstack_management.get_nodes()
|
||||
ansible_runner_inst.execute.assert_called_once_with(
|
||||
[self.host], {'command': 'cat /sys/class/net/eth0/address'})
|
||||
|
|
@ -104,7 +104,7 @@ class DevStackManagementTestCase(test.TestCase):
|
|||
nodes.hosts)
|
||||
|
||||
@mock.patch('os_faults.ansible.executor.AnsibleRunner', autospec=True)
|
||||
@ddt.data(*devstack.DevStackManagement.SERVICES.keys())
|
||||
@ddt.data(*devstack.DevStackCloudManagement.SERVICES.keys())
|
||||
def test_get_service_nodes(self, service_name, mock_ansible_runner):
|
||||
ansible_runner_inst = mock_ansible_runner.return_value
|
||||
ansible_runner_inst.execute.side_effect = [
|
||||
|
|
@ -113,7 +113,7 @@ class DevStackManagementTestCase(test.TestCase):
|
|||
[fakes.FakeAnsibleResult(payload={'stdout': ''}, host='10.0.0.2')]
|
||||
]
|
||||
|
||||
devstack_management = devstack.DevStackManagement(self.conf)
|
||||
devstack_management = devstack.DevStackCloudManagement(self.conf)
|
||||
|
||||
service = devstack_management.get_service(service_name)
|
||||
nodes = service.get_nodes()
|
||||
|
|
@ -131,7 +131,7 @@ class DevStackManagementTestCase(test.TestCase):
|
|||
nodes.hosts)
|
||||
|
||||
def test_validate_services(self):
|
||||
devstack_management = devstack.DevStackManagement(self.conf)
|
||||
devstack_management = devstack.DevStackCloudManagement(self.conf)
|
||||
devstack_management.validate_services()
|
||||
|
||||
|
||||
|
|
@ -147,7 +147,7 @@ class DevStackServiceTestCase(test.TestCase):
|
|||
fqdn='')
|
||||
|
||||
@mock.patch('os_faults.ansible.executor.AnsibleRunner', autospec=True)
|
||||
@ddt.data(*devstack.DevStackManagement.SERVICES.keys())
|
||||
@ddt.data(*devstack.DevStackCloudManagement.SERVICES.keys())
|
||||
def test_restart(self, service_name, mock_ansible_runner):
|
||||
ansible_runner_inst = mock_ansible_runner.return_value
|
||||
ansible_runner_inst.execute.side_effect = [
|
||||
|
|
@ -157,7 +157,7 @@ class DevStackServiceTestCase(test.TestCase):
|
|||
[fakes.FakeAnsibleResult(payload={'stdout': ''}, host='10.0.0.2')]
|
||||
]
|
||||
|
||||
devstack_management = devstack.DevStackManagement(
|
||||
devstack_management = devstack.DevStackCloudManagement(
|
||||
self.conf)
|
||||
|
||||
service = devstack_management.get_service(service_name)
|
||||
|
|
@ -172,7 +172,7 @@ class DevStackServiceTestCase(test.TestCase):
|
|||
])
|
||||
|
||||
@mock.patch('os_faults.ansible.executor.AnsibleRunner', autospec=True)
|
||||
@ddt.data(*devstack.DevStackManagement.SERVICES.keys())
|
||||
@ddt.data(*devstack.DevStackCloudManagement.SERVICES.keys())
|
||||
def test_terminate(self, service_name, mock_ansible_runner):
|
||||
ansible_runner_inst = mock_ansible_runner.return_value
|
||||
ansible_runner_inst.execute.side_effect = [
|
||||
|
|
@ -182,7 +182,7 @@ class DevStackServiceTestCase(test.TestCase):
|
|||
[fakes.FakeAnsibleResult(payload={'stdout': ''}, host='10.0.0.2')]
|
||||
]
|
||||
|
||||
devstack_management = devstack.DevStackManagement(
|
||||
devstack_management = devstack.DevStackCloudManagement(
|
||||
self.conf)
|
||||
|
||||
service = devstack_management.get_service(service_name)
|
||||
|
|
@ -197,7 +197,7 @@ class DevStackServiceTestCase(test.TestCase):
|
|||
])
|
||||
|
||||
@mock.patch('os_faults.ansible.executor.AnsibleRunner', autospec=True)
|
||||
@ddt.data(*devstack.DevStackManagement.SERVICES.keys())
|
||||
@ddt.data(*devstack.DevStackCloudManagement.SERVICES.keys())
|
||||
def test_start(self, service_name, mock_ansible_runner):
|
||||
ansible_runner_inst = mock_ansible_runner.return_value
|
||||
ansible_runner_inst.execute.side_effect = [
|
||||
|
|
@ -207,7 +207,7 @@ class DevStackServiceTestCase(test.TestCase):
|
|||
[fakes.FakeAnsibleResult(payload={'stdout': ''}, host='10.0.0.2')]
|
||||
]
|
||||
|
||||
devstack_management = devstack.DevStackManagement(
|
||||
devstack_management = devstack.DevStackCloudManagement(
|
||||
self.conf)
|
||||
|
||||
service = devstack_management.get_service(service_name)
|
||||
|
|
|
|||
|
|
@ -22,10 +22,10 @@ from os_faults.tests.unit import test
|
|||
|
||||
|
||||
@ddt.ddt
|
||||
class TCPCloudManagementTestCase(test.TestCase):
|
||||
class SaltCloudManagementTestCase(test.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(TCPCloudManagementTestCase, self).setUp()
|
||||
super(SaltCloudManagementTestCase, self).setUp()
|
||||
self.fake_ansible_result = fakes.FakeAnsibleResult(
|
||||
payload={
|
||||
'stdout': 'cmp01.mk20.local:\n'
|
||||
|
|
@ -98,7 +98,7 @@ class TCPCloudManagementTestCase(test.TestCase):
|
|||
def test_init(self, config, expected_runner_calls, mock_ansible_runner):
|
||||
ansible_runner_inst = mock_ansible_runner.return_value
|
||||
|
||||
tcp_managment = tcpcloud.TCPCloudManagement(config)
|
||||
tcp_managment = tcpcloud.SaltCloudManagement(config)
|
||||
|
||||
mock_ansible_runner.assert_has_calls(expected_runner_calls)
|
||||
self.assertIs(tcp_managment.master_node_executor, ansible_runner_inst)
|
||||
|
|
@ -114,7 +114,7 @@ class TCPCloudManagementTestCase(test.TestCase):
|
|||
fakes.FakeAnsibleResult(payload={'stdout': ''})],
|
||||
]
|
||||
self.tcp_conf['slave_name_regexp'] = '(ctl*|cmp*)'
|
||||
tcp_managment = tcpcloud.TCPCloudManagement(self.tcp_conf)
|
||||
tcp_managment = tcpcloud.SaltCloudManagement(self.tcp_conf)
|
||||
tcp_managment.verify()
|
||||
|
||||
get_nodes_cmd = "salt -E '(ctl*|cmp*)' network.interfaces --out=yaml"
|
||||
|
|
@ -127,7 +127,7 @@ class TCPCloudManagementTestCase(test.TestCase):
|
|||
])
|
||||
|
||||
def test_validate_services(self):
|
||||
tcp_managment = tcpcloud.TCPCloudManagement(self.tcp_conf)
|
||||
tcp_managment = tcpcloud.SaltCloudManagement(self.tcp_conf)
|
||||
tcp_managment.validate_services()
|
||||
|
||||
@mock.patch('os_faults.ansible.executor.AnsibleRunner', autospec=True)
|
||||
|
|
@ -137,7 +137,7 @@ class TCPCloudManagementTestCase(test.TestCase):
|
|||
[self.fake_ansible_result],
|
||||
[self.fake_node_ip_result],
|
||||
]
|
||||
tcp_managment = tcpcloud.TCPCloudManagement(self.tcp_conf)
|
||||
tcp_managment = tcpcloud.SaltCloudManagement(self.tcp_conf)
|
||||
nodes = tcp_managment.get_nodes()
|
||||
|
||||
ansible_runner_inst.execute.assert_has_calls([
|
||||
|
|
@ -158,7 +158,7 @@ class TCPCloudManagementTestCase(test.TestCase):
|
|||
]
|
||||
node_discover_driver = mock.Mock()
|
||||
node_discover_driver.discover_hosts.return_value = hosts
|
||||
tcp_managment = tcpcloud.TCPCloudManagement(self.tcp_conf)
|
||||
tcp_managment = tcpcloud.SaltCloudManagement(self.tcp_conf)
|
||||
tcp_managment.set_node_discover(node_discover_driver)
|
||||
nodes = tcp_managment.get_nodes()
|
||||
|
||||
|
|
@ -174,7 +174,7 @@ class TCPCloudManagementTestCase(test.TestCase):
|
|||
[fakes.FakeAnsibleResult(payload={'stdout': ''}),
|
||||
fakes.FakeAnsibleResult(payload={'stdout': ''})]
|
||||
]
|
||||
tcp_managment = tcpcloud.TCPCloudManagement(self.tcp_conf)
|
||||
tcp_managment = tcpcloud.SaltCloudManagement(self.tcp_conf)
|
||||
nodes = tcp_managment.get_nodes()
|
||||
result = tcp_managment.execute_on_cloud(
|
||||
nodes.hosts, {'command': 'mycmd'}, raise_on_error=False)
|
||||
|
|
@ -196,13 +196,13 @@ class TCPCloudManagementTestCase(test.TestCase):
|
|||
[self.fake_ansible_result],
|
||||
[self.fake_node_ip_result],
|
||||
]
|
||||
tcp_managment = tcpcloud.TCPCloudManagement(self.tcp_conf)
|
||||
tcp_managment = tcpcloud.SaltCloudManagement(self.tcp_conf)
|
||||
nodes = tcp_managment.get_nodes(fqdns=['cmp02.mk20.local'])
|
||||
|
||||
self.assertEqual(nodes.hosts, [self.hosts[1]])
|
||||
|
||||
@mock.patch('os_faults.ansible.executor.AnsibleRunner', autospec=True)
|
||||
@ddt.data(*tcpcloud.TCPCloudManagement.SERVICES.keys())
|
||||
@ddt.data(*tcpcloud.SaltCloudManagement.SERVICES.keys())
|
||||
def test_get_service_nodes(self, service_name, mock_ansible_runner):
|
||||
ansible_runner_inst = mock_ansible_runner.return_value
|
||||
ansible_runner_inst.execute.side_effect = [
|
||||
|
|
@ -215,7 +215,7 @@ class TCPCloudManagementTestCase(test.TestCase):
|
|||
host='10.0.0.3')]
|
||||
]
|
||||
|
||||
tcp_managment = tcpcloud.TCPCloudManagement(self.tcp_conf)
|
||||
tcp_managment = tcpcloud.SaltCloudManagement(self.tcp_conf)
|
||||
|
||||
service = tcp_managment.get_service(service_name)
|
||||
nodes = service.get_nodes()
|
||||
|
|
@ -231,10 +231,10 @@ class TCPCloudManagementTestCase(test.TestCase):
|
|||
|
||||
|
||||
@ddt.ddt
|
||||
class TCPCloudServiceTestCase(test.TestCase):
|
||||
class SaltCloudServiceTestCase(test.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(TCPCloudServiceTestCase, self).setUp()
|
||||
super(SaltCloudServiceTestCase, self).setUp()
|
||||
self.fake_ansible_result = fakes.FakeAnsibleResult(
|
||||
payload={
|
||||
'stdout': 'cmp01.mk20.local:\n'
|
||||
|
|
@ -274,7 +274,7 @@ class TCPCloudServiceTestCase(test.TestCase):
|
|||
]
|
||||
|
||||
@mock.patch('os_faults.ansible.executor.AnsibleRunner', autospec=True)
|
||||
@ddt.data(*tcpcloud.TCPCloudManagement.SERVICES.keys())
|
||||
@ddt.data(*tcpcloud.SaltCloudManagement.SERVICES.keys())
|
||||
def test_restart(self, service_name, mock_ansible_runner):
|
||||
ansible_runner_inst = mock_ansible_runner.return_value
|
||||
ansible_runner_inst.execute.side_effect = [
|
||||
|
|
@ -291,7 +291,7 @@ class TCPCloudServiceTestCase(test.TestCase):
|
|||
host='10.0.0.3')]
|
||||
]
|
||||
|
||||
tcp_managment = tcpcloud.TCPCloudManagement(self.tcp_conf)
|
||||
tcp_managment = tcpcloud.SaltCloudManagement(self.tcp_conf)
|
||||
|
||||
service = tcp_managment.get_service(service_name)
|
||||
service.restart()
|
||||
|
|
@ -307,7 +307,7 @@ class TCPCloudServiceTestCase(test.TestCase):
|
|||
])
|
||||
|
||||
@mock.patch('os_faults.ansible.executor.AnsibleRunner', autospec=True)
|
||||
@ddt.data(*tcpcloud.TCPCloudManagement.SERVICES.keys())
|
||||
@ddt.data(*tcpcloud.SaltCloudManagement.SERVICES.keys())
|
||||
def test_terminate(self, service_name, mock_ansible_runner):
|
||||
ansible_runner_inst = mock_ansible_runner.return_value
|
||||
ansible_runner_inst.execute.side_effect = [
|
||||
|
|
@ -324,7 +324,7 @@ class TCPCloudServiceTestCase(test.TestCase):
|
|||
host='10.0.0.3')]
|
||||
]
|
||||
|
||||
tcp_managment = tcpcloud.TCPCloudManagement(self.tcp_conf)
|
||||
tcp_managment = tcpcloud.SaltCloudManagement(self.tcp_conf)
|
||||
|
||||
service = tcp_managment.get_service(service_name)
|
||||
service.terminate()
|
||||
|
|
@ -340,7 +340,7 @@ class TCPCloudServiceTestCase(test.TestCase):
|
|||
])
|
||||
|
||||
@mock.patch('os_faults.ansible.executor.AnsibleRunner', autospec=True)
|
||||
@ddt.data(*tcpcloud.TCPCloudManagement.SERVICES.keys())
|
||||
@ddt.data(*tcpcloud.SaltCloudManagement.SERVICES.keys())
|
||||
def test_start(self, service_name, mock_ansible_runner):
|
||||
ansible_runner_inst = mock_ansible_runner.return_value
|
||||
ansible_runner_inst.execute.side_effect = [
|
||||
|
|
@ -357,7 +357,7 @@ class TCPCloudServiceTestCase(test.TestCase):
|
|||
host='10.0.0.3')]
|
||||
]
|
||||
|
||||
tcp_managment = tcpcloud.TCPCloudManagement(self.tcp_conf)
|
||||
tcp_managment = tcpcloud.SaltCloudManagement(self.tcp_conf)
|
||||
|
||||
service = tcp_managment.get_service(service_name)
|
||||
service.start()
|
||||
|
|
|
|||
|
|
@ -61,7 +61,7 @@ class OSFaultsTestCase(test.TestCase):
|
|||
}
|
||||
}
|
||||
destructor = os_faults.connect(cloud_config)
|
||||
self.assertIsInstance(destructor, devstack.DevStackManagement)
|
||||
self.assertIsInstance(destructor, devstack.DevStackCloudManagement)
|
||||
|
||||
def test_config_with_services(self):
|
||||
self.cloud_config['services'] = {
|
||||
|
|
@ -107,7 +107,7 @@ class OSFaultsTestCase(test.TestCase):
|
|||
|
||||
def test_connect_with_libvirt(self):
|
||||
destructor = os_faults.connect(self.cloud_config)
|
||||
self.assertIsInstance(destructor, devstack.DevStackManagement)
|
||||
self.assertIsInstance(destructor, devstack.DevStackCloudManagement)
|
||||
self.assertEqual(1, len(destructor.power_manager.power_drivers))
|
||||
self.assertIsInstance(destructor.power_manager.power_drivers[0],
|
||||
libvirt.LibvirtDriver)
|
||||
|
|
|
|||
Loading…
Reference in New Issue