diff --git a/releasenotes/notes/add-instance-show-to-osc-d97cac1c697dcbdd.yaml b/releasenotes/notes/add-instance-show-to-osc-d97cac1c697dcbdd.yaml new file mode 100644 index 00000000..306f3f6b --- /dev/null +++ b/releasenotes/notes/add-instance-show-to-osc-d97cac1c697dcbdd.yaml @@ -0,0 +1,4 @@ +--- +features: + - The command ``trove show`` is now available to use in + the python-openstackclient CLI as ``openstack database instance show`` diff --git a/setup.cfg b/setup.cfg index bba3b9ac..974446fa 100644 --- a/setup.cfg +++ b/setup.cfg @@ -35,6 +35,7 @@ openstack.database.v1 = database_configuration_list = troveclient.osc.v1.database_configurations:ListDatabaseConfigurations database_flavor_list = troveclient.osc.v1.database_flavors:ListDatabaseFlavors database_instance_list = troveclient.osc.v1.database_instances:ListDatabaseInstances + database_instance_show = troveclient.osc.v1.database_instances:ShowDatabaseInstance database_limit_list = troveclient.osc.v1.database_limits:ListDatabaseLimits database_list = troveclient.osc.v1.databases:ListDatabases database_user_list = troveclient.osc.v1.database_users:ListDatabaseUsers diff --git a/troveclient/osc/v1/database_instances.py b/troveclient/osc/v1/database_instances.py index 43a83535..e5fef9da 100644 --- a/troveclient/osc/v1/database_instances.py +++ b/troveclient/osc/v1/database_instances.py @@ -14,6 +14,7 @@ from osc_lib.command import command from osc_lib import utils as osc_utils +import six from troveclient.i18n import _ @@ -33,6 +34,38 @@ def set_attributes_for_print(instances): return instances +def set_attributes_for_print_detail(instance): + info = instance._info.copy() + info['flavor'] = instance.flavor['id'] + if hasattr(instance, 'volume'): + info['volume'] = instance.volume['size'] + if 'used' in instance.volume: + info['volume_used'] = instance.volume['used'] + if hasattr(instance, 'ip'): + info['ip'] = ', '.join(instance.ip) + if hasattr(instance, 'datastore'): + info['datastore'] = instance.datastore['type'] + info['datastore_version'] = instance.datastore['version'] + if hasattr(instance, 'configuration'): + info['configuration'] = instance.configuration['id'] + if hasattr(instance, 'replica_of'): + info['replica_of'] = instance.replica_of['id'] + if hasattr(instance, 'replicas'): + replicas = [replica['id'] for replica in instance.replicas] + info['replicas'] = ', '.join(replicas) + if hasattr(instance, 'networks'): + info['networks'] = instance.networks['name'] + info['networks_id'] = instance.networks['id'] + if hasattr(instance, 'fault'): + info.pop('fault', None) + info['fault'] = instance.fault['message'] + info['fault_date'] = instance.fault['created'] + if 'details' in instance.fault and instance.fault['details']: + info['fault_details'] = instance.fault['details'] + info.pop('links', None) + return info + + class ListDatabaseInstances(command.Lister): _description = _("List database instances") @@ -81,3 +114,22 @@ class ListDatabaseInstances(command.Lister): instances = [osc_utils.get_item_properties(i, self.columns) for i in instances] return self.columns, instances + + +class ShowDatabaseInstance(command.ShowOne): + _description = _("Show instance details") + + def get_parser(self, prog_name): + parser = super(ShowDatabaseInstance, self).get_parser(prog_name) + parser.add_argument( + 'instance', + metavar='', + help=_('Instance (name or ID)'), + ) + return parser + + def take_action(self, parsed_args): + db_instances = self.app.client_manager.database.instances + instance = osc_utils.find_resource(db_instances, parsed_args.instance) + instance = set_attributes_for_print_detail(instance) + return zip(*sorted(six.iteritems(instance))) diff --git a/troveclient/tests/osc/v1/test_database_instances.py b/troveclient/tests/osc/v1/test_database_instances.py index d05abf78..7cabf630 100644 --- a/troveclient/tests/osc/v1/test_database_instances.py +++ b/troveclient/tests/osc/v1/test_database_instances.py @@ -47,3 +47,33 @@ class TestInstanceList(TestInstances): self.instance_client.list.assert_called_once_with(**self.defaults) self.assertEqual(self.columns, columns) self.assertEqual([self.values], data) + + +class TestInstanceShow(TestInstances): + + values = ('mysql', '5.6', '02', '1234', '10.0.0.13', + 'test-member-1', 'regionOne', 'ACTIVE', 2) + + def setUp(self): + super(TestInstanceShow, self).setUp() + self.cmd = database_instances.ShowDatabaseInstance(self.app, None) + self.data = self.fake_instances.get_instances_1234() + self.instance_client.get.return_value = self.data + self.columns = ( + 'datastore', + 'datastore_version', + 'flavor', + 'id', + 'ip', + 'name', + 'region', + 'status', + 'volume', + ) + + def test_show(self): + args = ['1234'] + parsed_args = self.check_parser(self.cmd, args, []) + columns, data = self.cmd.take_action(parsed_args) + self.assertEqual(self.columns, columns) + self.assertEqual(self.values, data)