Commit 1b5415cb authored by Xavier Thompson's avatar Xavier Thompson

cli/info: Include news digest in output

Include new 'status' field to be one of 'none', 'green', 'red', 'orange'
or 'unsupported' if news are not supported by the master (e.g. proxy).

Add --news option to include a 'news' field with the raw news.
parent 3006cb19
...@@ -54,6 +54,10 @@ class InfoCommand(ClientConfigCommand): ...@@ -54,6 +54,10 @@ class InfoCommand(ClientConfigCommand):
ap.add_argument('reference', ap.add_argument('reference',
help='Your instance reference') help='Your instance reference')
ap.add_argument('--news',
action='store_true',
help='Include raw news in output')
return ap return ap
def take_action(self, args): def take_action(self, args):
...@@ -98,14 +102,32 @@ def do_info(logger, conf, local): ...@@ -98,14 +102,32 @@ def do_info(logger, conf, local):
if '_' in connection_parameter_dict: if '_' in connection_parameter_dict:
connection_parameter_dict = json.loads(connection_parameter_dict['_']) connection_parameter_dict = json.loads(connection_parameter_dict['_'])
logger.info(
json.dumps( info = {
{
'software-url': instance._software_release_url, 'software-url': instance._software_release_url,
'instance-state': instance._requested_state, 'instance-state': instance._requested_state,
'instance-parameters': instance._parameter_dict, 'instance-parameters': instance._parameter_dict,
'connection-parameters': connection_parameter_dict, 'connection-parameters': connection_parameter_dict,
}, }
indent=2,
) try:
) news = instance._news['instance']
except (AttributeError, KeyError):
info['status'] = 'unsupported'
else:
# 2 bits : 00 -> none, 01 -> green, 10 -> red, 11 -> orange
status = 0b00
for e in news:
text = e.get('text', '')
if text.startswith('#access'):
status |= 0b01
elif text.startswith('#error'):
status |= 0b10
if status == 0b11:
break
info['status'] = ('none', 'green', 'red', 'orange')[status]
if conf.news:
info['news'] = news
logger.info(json.dumps(info, indent=2))
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment