Add MAAS support

At the moment, Watcher can use a single bare metal provisioning
service: Openstack Ironic.

We're now adding support for Canonical's MAAS service [1], which
is commonly used along with Juju [2] to deploy Openstack.

In order to do so, we're building a metal client abstraction, with
concrete implementations for Ironic and MAAS. We'll pick the MAAS
client if the MAAS url is provided, otherwise defaulting to Ironic.

For now, we aren't updating the baremetal model collector since it
doesn't seem to be used by any of the existing Watcher strategy
implementations.

[1] https://maas.io/docs
[2] https://juju.is/docs

Implements: blueprint maas-support

Change-Id: I6861995598f6c542fa9c006131f10203f358e0a6
This commit is contained in:
Lucian Petrut
2023-10-05 10:50:56 +03:00
parent 9492c2190e
commit c95ce4ec17
24 changed files with 1154 additions and 228 deletions

View File

@@ -0,0 +1,96 @@
# Copyright 2023 Cloudbase Solutions
# 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 unittest import mock
from watcher.common import exception
from watcher.common.metal_helper import base as m_helper_base
from watcher.common.metal_helper import constants as m_constants
from watcher.tests import base
# The base classes have abstract methods, we'll need to
# stub them.
class MockMetalNode(m_helper_base.BaseMetalNode):
def get_power_state(self):
raise NotImplementedError()
def get_id(self):
raise NotImplementedError()
def power_on(self):
raise NotImplementedError()
def power_off(self):
raise NotImplementedError()
class MockMetalHelper(m_helper_base.BaseMetalHelper):
def list_compute_nodes(self):
pass
def get_node(self, node_id):
pass
class TestBaseMetalNode(base.TestCase):
def setUp(self):
super().setUp()
self._nova_node = mock.Mock()
self._node = MockMetalNode(self._nova_node)
def test_get_hypervisor_node(self):
self.assertEqual(
self._nova_node,
self._node.get_hypervisor_node())
def test_get_hypervisor_node_missing(self):
node = MockMetalNode()
self.assertRaises(
exception.Invalid,
node.get_hypervisor_node)
def test_get_hypervisor_hostname(self):
self.assertEqual(
self._nova_node.hypervisor_hostname,
self._node.get_hypervisor_hostname())
@mock.patch.object(MockMetalNode, 'power_on')
@mock.patch.object(MockMetalNode, 'power_off')
def test_set_power_state(self,
mock_power_off, mock_power_on):
self._node.set_power_state(m_constants.PowerState.ON)
mock_power_on.assert_called_once_with()
self._node.set_power_state(m_constants.PowerState.OFF)
mock_power_off.assert_called_once_with()
self.assertRaises(
exception.UnsupportedActionType,
self._node.set_power_state,
m_constants.PowerState.UNKNOWN)
class TestBaseMetalHelper(base.TestCase):
def setUp(self):
super().setUp()
self._osc = mock.Mock()
self._helper = MockMetalHelper(self._osc)
def test_nova_client_attr(self):
self.assertEqual(self._osc.nova.return_value,
self._helper.nova_client)

View File

@@ -0,0 +1,38 @@
# Copyright 2023 Cloudbase Solutions
# 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 unittest import mock
from watcher.common import clients
from watcher.common.metal_helper import factory
from watcher.common.metal_helper import ironic
from watcher.common.metal_helper import maas
from watcher.tests import base
class TestMetalHelperFactory(base.TestCase):
@mock.patch.object(clients, 'OpenStackClients')
@mock.patch.object(maas, 'MaasHelper')
@mock.patch.object(ironic, 'IronicHelper')
def test_factory(self, mock_ironic, mock_maas, mock_osc):
self.assertEqual(
mock_ironic.return_value,
factory.get_helper())
self.config(url="fake_maas_url", group="maas_client")
self.assertEqual(
mock_maas.return_value,
factory.get_helper())

View File

@@ -0,0 +1,128 @@
# Copyright 2023 Cloudbase Solutions
# 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 unittest import mock
from watcher.common.metal_helper import constants as m_constants
from watcher.common.metal_helper import ironic
from watcher.tests import base
class TestIronicNode(base.TestCase):
def setUp(self):
super().setUp()
self._wrapped_node = mock.Mock()
self._nova_node = mock.Mock()
self._ironic_client = mock.Mock()
self._node = ironic.IronicNode(
self._wrapped_node, self._nova_node, self._ironic_client)
def test_get_power_state(self):
states = (
"power on",
"power off",
"rebooting",
"soft power off",
"soft reboot",
'SomeOtherState')
type(self._wrapped_node).power_state = mock.PropertyMock(
side_effect=states)
expected_states = (
m_constants.PowerState.ON,
m_constants.PowerState.OFF,
m_constants.PowerState.ON,
m_constants.PowerState.OFF,
m_constants.PowerState.ON,
m_constants.PowerState.UNKNOWN)
for expected_state in expected_states:
actual_state = self._node.get_power_state()
self.assertEqual(expected_state, actual_state)
def test_get_id(self):
self.assertEqual(
self._wrapped_node.uuid,
self._node.get_id())
def test_power_on(self):
self._node.power_on()
self._ironic_client.node.set_power_state.assert_called_once_with(
self._wrapped_node.uuid, "on")
def test_power_off(self):
self._node.power_off()
self._ironic_client.node.set_power_state.assert_called_once_with(
self._wrapped_node.uuid, "off")
class TestIronicHelper(base.TestCase):
def setUp(self):
super().setUp()
self._mock_osc = mock.Mock()
self._mock_nova_client = self._mock_osc.nova.return_value
self._mock_ironic_client = self._mock_osc.ironic.return_value
self._helper = ironic.IronicHelper(osc=self._mock_osc)
def test_list_compute_nodes(self):
mock_machines = [
mock.Mock(
extra=dict(compute_node_id=mock.sentinel.compute_node_id)),
mock.Mock(
extra=dict(compute_node_id=mock.sentinel.compute_node_id2)),
mock.Mock(
extra=dict())
]
mock_hypervisor = mock.Mock()
self._mock_ironic_client.node.list.return_value = mock_machines
self._mock_ironic_client.node.get.side_effect = mock_machines
self._mock_nova_client.hypervisors.get.side_effect = (
mock_hypervisor, None)
out_nodes = self._helper.list_compute_nodes()
self.assertEqual(1, len(out_nodes))
out_node = out_nodes[0]
self.assertIsInstance(out_node, ironic.IronicNode)
self.assertEqual(mock_hypervisor, out_node._nova_node)
self.assertEqual(mock_machines[0], out_node._ironic_node)
self.assertEqual(self._mock_ironic_client, out_node._ironic_client)
def test_get_node(self):
mock_machine = mock.Mock(
extra=dict(compute_node_id=mock.sentinel.compute_node_id))
self._mock_ironic_client.node.get.return_value = mock_machine
out_node = self._helper.get_node(mock.sentinel.id)
self.assertEqual(self._mock_nova_client.hypervisors.get.return_value,
out_node._nova_node)
self.assertEqual(self._mock_ironic_client, out_node._ironic_client)
self.assertEqual(mock_machine, out_node._ironic_node)
def test_get_node_not_a_hypervisor(self):
mock_machine = mock.Mock(extra=dict(compute_node_id=None))
self._mock_ironic_client.node.get.return_value = mock_machine
out_node = self._helper.get_node(mock.sentinel.id)
self._mock_nova_client.hypervisors.get.assert_not_called()
self.assertIsNone(out_node._nova_node)
self.assertEqual(self._mock_ironic_client, out_node._ironic_client)
self.assertEqual(mock_machine, out_node._ironic_node)

View File

@@ -0,0 +1,126 @@
# Copyright 2023 Cloudbase Solutions
# 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 unittest import mock
try:
from maas.client import enum as maas_enum
except ImportError:
maas_enum = None
from watcher.common.metal_helper import constants as m_constants
from watcher.common.metal_helper import maas
from watcher.tests import base
class TestMaasNode(base.TestCase):
def setUp(self):
super().setUp()
self._wrapped_node = mock.Mock()
self._nova_node = mock.Mock()
self._maas_client = mock.Mock()
self._node = maas.MaasNode(
self._wrapped_node, self._nova_node, self._maas_client)
def test_get_power_state(self):
if not maas_enum:
self.skipTest("python-libmaas not intalled.")
self._wrapped_node.query_power_state.side_effect = (
maas_enum.PowerState.ON,
maas_enum.PowerState.OFF,
maas_enum.PowerState.ERROR,
maas_enum.PowerState.UNKNOWN,
'SomeOtherState')
expected_states = (
m_constants.PowerState.ON,
m_constants.PowerState.OFF,
m_constants.PowerState.ERROR,
m_constants.PowerState.UNKNOWN,
m_constants.PowerState.UNKNOWN)
for expected_state in expected_states:
actual_state = self._node.get_power_state()
self.assertEqual(expected_state, actual_state)
def test_get_id(self):
self.assertEqual(
self._wrapped_node.system_id,
self._node.get_id())
def test_power_on(self):
self._node.power_on()
self._wrapped_node.power_on.assert_called_once_with()
def test_power_off(self):
self._node.power_off()
self._wrapped_node.power_off.assert_called_once_with()
class TestMaasHelper(base.TestCase):
def setUp(self):
super().setUp()
self._mock_osc = mock.Mock()
self._mock_nova_client = self._mock_osc.nova.return_value
self._mock_maas_client = self._mock_osc.maas.return_value
self._helper = maas.MaasHelper(osc=self._mock_osc)
def test_list_compute_nodes(self):
compute_fqdn = "compute-0"
# some other MAAS node, not a Nova node
ctrl_fqdn = "ctrl-1"
mock_machines = [
mock.Mock(fqdn=compute_fqdn,
system_id=mock.sentinel.compute_node_id),
mock.Mock(fqdn=ctrl_fqdn,
system_id=mock.sentinel.ctrl_node_id),
]
mock_hypervisors = [
mock.Mock(hypervisor_hostname=compute_fqdn),
]
self._mock_maas_client.machines.list.return_value = mock_machines
self._mock_nova_client.hypervisors.list.return_value = mock_hypervisors
out_nodes = self._helper.list_compute_nodes()
self.assertEqual(1, len(out_nodes))
out_node = out_nodes[0]
self.assertIsInstance(out_node, maas.MaasNode)
self.assertEqual(mock.sentinel.compute_node_id, out_node.get_id())
self.assertEqual(compute_fqdn, out_node.get_hypervisor_hostname())
def test_get_node(self):
mock_machine = mock.Mock(fqdn='compute-0')
self._mock_maas_client.machines.get.return_value = mock_machine
mock_compute_nodes = [
mock.Mock(hypervisor_hostname="compute-011"),
mock.Mock(hypervisor_hostname="compute-0"),
mock.Mock(hypervisor_hostname="compute-01"),
]
self._mock_nova_client.hypervisors.search.return_value = (
mock_compute_nodes)
out_node = self._helper.get_node(mock.sentinel.id)
self.assertEqual(mock_compute_nodes[1], out_node._nova_node)
self.assertEqual(self._mock_maas_client, out_node._maas_client)
self.assertEqual(mock_machine, out_node._maas_node)

View File

@@ -0,0 +1,52 @@
# Copyright 2023 Cloudbase Solutions
# 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.
import asyncio
import time
from unittest import mock
from watcher.common import utils
from watcher.tests import base
class TestCommonUtils(base.TestCase):
async def test_coro(self, sleep=0, raise_exc=None):
time.sleep(sleep)
if raise_exc:
raise raise_exc
return mock.sentinel.ret_val
def test_async_compat(self):
ret_val = utils.async_compat_call(self.test_coro)
self.assertEqual(mock.sentinel.ret_val, ret_val)
def test_async_compat_exc(self):
self.assertRaises(
IOError,
utils.async_compat_call,
self.test_coro,
raise_exc=IOError('fake error'))
def test_async_compat_timeout(self):
# Timeout not reached.
ret_val = utils.async_compat_call(self.test_coro, timeout=10)
self.assertEqual(mock.sentinel.ret_val, ret_val)
# Timeout reached.
self.assertRaises(
asyncio.TimeoutError,
utils.async_compat_call,
self.test_coro,
sleep=0.5, timeout=0.1)