x/browbeat
Code Issues Proposed changes

Merge "Updating prescribe to look at group for hw data"

Browse Source
This commit is contained in:
Zuul 2018-12-13 18:39:03 +00:00 committed by Gerrit Code Review
commit ed1aada2ef
1 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
browbeat/prescribe.py
View File

@ -19,6 +19,9 @@ import sys
class Metadata(object): class Metadata(object):
def __init__(self): def __init__(self):
# These are the only groups from the ansible inventory, that we are
# Interested in
self._supported_node_types = ['overcloud', 'undercloud']
pass pass
def load_file(self, filename): def load_file(self, filename):
@ -33,23 +36,25 @@ class Metadata(object):
def get_hardware_metadata(self, sys_data): def get_hardware_metadata(self, sys_data):
hard_dict = {} hard_dict = {}
for item, dictionary in sys_data.iteritems(): for item, dictionary in sys_data.iteritems():
if 'hardware_details' not in hard_dict: if any(node in sys_data[item]['group_names'] for node in self._supported_node_types):
hard_dict['hardware_details'] = [] if 'hardware_details' not in hard_dict:
hardware_dict = {} hard_dict['hardware_details'] = []
hardware_dict['label'] = sys_data[item]['inventory_hostname'] hardware_dict = {}
hardware_dict['virtualization_role'] = sys_data[item]['ansible_virtualization_role'] hardware_dict['label'] = sys_data[item]['inventory_hostname']
hardware_dict['virtualization_type'] = sys_data[item]['ansible_virtualization_type'] hardware_dict['virtualization_role'] = sys_data[item]['ansible_virtualization_role']
hardware_dict['total_mem'] = sys_data[item][ hardware_dict['virtualization_type'] = sys_data[item]['ansible_virtualization_type']
'ansible_memory_mb']['real']['total'] hardware_dict['total_mem'] = sys_data[item][
hardware_dict['total_logical_cores'] = sys_data[item][ 'ansible_memory_mb']['real']['total']
'facter_processorcount'] hardware_dict['total_logical_cores'] = sys_data[item][
hardware_dict['os_name'] = sys_data[item]['ansible_distribution'] + \ 'facter_processorcount']
sys_data[item]['ansible_distribution_version'] hardware_dict['os_name'] = sys_data[item]['ansible_distribution'] + \
hardware_dict['ip'] = sys_data[item]['ansible_default_ipv4']['address'] sys_data[item]['ansible_distribution_version']
hardware_dict['num_interface'] = len(sys_data[item]['ansible_interfaces']) hardware_dict['ip'] = sys_data[item]['ansible_default_ipv4']['address']
hardware_dict['machine_make'] = sys_data[item]['ansible_product_name'] hardware_dict['num_interface'] = len(sys_data[item]['ansible_interfaces'])
hardware_dict['processor_type'] = ' '.join(sys_data[item]['facter_processor0'].split()) hardware_dict['machine_make'] = sys_data[item]['ansible_product_name']
hard_dict['hardware_details'].append(hardware_dict) hardware_dict['processor_type'] = ' '.join(sys_data[item][
'facter_processor0'].split())
hard_dict['hardware_details'].append(hardware_dict)
return hard_dict return hard_dict
def get_environment_metadata(self, sys_data): def get_environment_metadata(self, sys_data):
@ -67,8 +72,7 @@ class Metadata(object):
soft_all_dict = [] soft_all_dict = []
bad_output_list = [{},[],""] bad_output_list = [{},[],""]
for item, dictionary in sys_data.iteritems(): for item, dictionary in sys_data.iteritems():
nodes = ['controller', 'undercloud', 'compute'] if any(node in sys_data[item]['group_names'] for node in self._supported_node_types):
if any(node in sys_data[item]['group_names'] for node in nodes):
software_dict = {} software_dict = {}
sample_vuln_dict = {} sample_vuln_dict = {}
node = sys_data[item]['inventory_hostname'] node = sys_data[item]['inventory_hostname']