From cea8c5c3d193b71a0afd0dfb145982c270b64bb9 Mon Sep 17 00:00:00 2001 From: James Page Date: Wed, 12 Oct 2016 14:05:50 +0100 Subject: [PATCH] Update active status message Align active status message with other OpenStack related charms, ensuring a consistent user experience and aligning with monitoring code checks in amulet functional test helpers. Change-Id: I97324c80e0c5a4ea406c9a53b1bb80a7e4234661 Closes-Bug: 1632095 --- src/lib/charm/openstack/openvswitch_odl.py | 2 +- unit_tests/test_lib_charm_openstack_openvswitch_odl.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/charm/openstack/openvswitch_odl.py b/src/lib/charm/openstack/openvswitch_odl.py index a5b0ccd..75a2786 100644 --- a/src/lib/charm/openstack/openvswitch_odl.py +++ b/src/lib/charm/openstack/openvswitch_odl.py @@ -31,7 +31,7 @@ class OVSODLCharm(charms_openstack.charm.OpenStackCharm): ovs.set_config('host-id', socket.gethostname(), table='external_ids') ovs.set_manager(odl_ovsdb.connection_string()) - hookenv.status_set('active', 'Open vSwitch configured and ready') + hookenv.status_set('active', 'Unit is ready') def unconfigure_openvswitch(self, odl_ovsdb): hookenv.log("Unconfiguring OpenvSwitch") diff --git a/unit_tests/test_lib_charm_openstack_openvswitch_odl.py b/unit_tests/test_lib_charm_openstack_openvswitch_odl.py index 3c3ddce..8e2ce4d 100644 --- a/unit_tests/test_lib_charm_openstack_openvswitch_odl.py +++ b/unit_tests/test_lib_charm_openstack_openvswitch_odl.py @@ -75,7 +75,7 @@ class TestOpenStackOVSODLCharm(Helper): ]) self.get_address_in_network.assert_called_with(mock.ANY, '10.1.1.1') self.status_set.assert_called_with('active', - 'Open vSwitch configured and ready') + 'Unit is ready') def test_unconfigure_openvswitch(self): odl_ovsdb = mock.MagicMock()