1869bfbc97
The current implementations use of a specific interface to build FQDN from has the undesired side effect of the ``nova-compute`` and ``neutron-openvswitch`` charms ending up with using different hostnames in some situations. It may also lead to use of a identifier that is mutable throughout the lifetime of a deployment. Use of a specific interface was chosen due to ``socket.getfqdn()`` not giving reliable results (https://bugs.python.org/issue5004). This patch gets the FQDN by mimickingthe behaviour of a call to ``hostname -f`` with fallback to shortname on failure. Add relevant update from c-h. Needed-By: Ic8f8742261b773484687985aa0a366391cd2737a Change-Id: I82db81937e5a46dc6bd222b7160ca1fa5b190c10 Closes-Bug: #1839300
88 lines
3.2 KiB
Python
88 lines
3.2 KiB
Python
# Copyright 2016 Canonical Ltd
|
|
#
|
|
# 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 mock import patch
|
|
import os
|
|
|
|
os.environ['JUJU_UNIT_NAME'] = 'nova_compute'
|
|
|
|
with patch('charmhelpers.core.hookenv.config') as config:
|
|
config.return_value = 'nova'
|
|
with patch('charmhelpers.contrib.openstack.context.HostInfoContext'):
|
|
import nova_compute_utils as utils # noqa
|
|
|
|
with patch('nova_compute_utils.restart_map'):
|
|
with patch('nova_compute_utils.register_configs'):
|
|
import openstack_upgrade
|
|
|
|
from test_utils import (
|
|
CharmTestCase
|
|
)
|
|
|
|
TO_PATCH = [
|
|
'config_changed',
|
|
'do_openstack_upgrade'
|
|
]
|
|
|
|
|
|
class TestNovaComputeUpgradeActions(CharmTestCase):
|
|
|
|
def setUp(self):
|
|
super(TestNovaComputeUpgradeActions, self).setUp(openstack_upgrade,
|
|
TO_PATCH)
|
|
|
|
@patch.object(openstack_upgrade, 'nova_ceilometer_joined')
|
|
@patch.object(openstack_upgrade, 'neutron_plugin_joined')
|
|
@patch.object(openstack_upgrade, 'relation_ids')
|
|
@patch('charmhelpers.contrib.openstack.utils.config')
|
|
@patch('charmhelpers.contrib.openstack.utils.action_set')
|
|
@patch('charmhelpers.contrib.openstack.utils.openstack_upgrade_available')
|
|
@patch('charmhelpers.contrib.openstack.utils.juju_log')
|
|
def test_openstack_upgrade_true(self, log, upgrade_avail,
|
|
action_set, config, relation_ids,
|
|
neutron_plugin_joined,
|
|
nova_ceilometer_joined):
|
|
|
|
upgrade_avail.return_value = True
|
|
config.return_value = True
|
|
|
|
def fake_relation_ids(thing):
|
|
return {'neutron-plugin': ['1'],
|
|
'nova-ceilometer': ['2']}[thing]
|
|
|
|
relation_ids.side_effect = fake_relation_ids
|
|
|
|
openstack_upgrade.openstack_upgrade()
|
|
|
|
self.assertTrue(self.do_openstack_upgrade.called)
|
|
self.assertTrue(self.config_changed.called)
|
|
neutron_plugin_joined.assert_called_once_with("1", remote_restart=True)
|
|
nova_ceilometer_joined.assert_called_once_with(
|
|
"2", remote_restart=True)
|
|
|
|
@patch('charmhelpers.contrib.openstack.utils.config')
|
|
@patch('charmhelpers.contrib.openstack.utils.action_set')
|
|
@patch('charmhelpers.contrib.openstack.utils.openstack_upgrade_available') # noqa
|
|
@patch('charmhelpers.contrib.openstack.utils.juju_log')
|
|
def test_openstack_upgrade_false(self, log, upgrade_avail,
|
|
action_set, config):
|
|
|
|
upgrade_avail.return_value = True
|
|
config.return_value = False
|
|
|
|
openstack_upgrade.openstack_upgrade()
|
|
|
|
self.assertFalse(self.do_openstack_upgrade.called)
|
|
self.assertFalse(self.config_changed.called)
|