x/browbeat
Code Issues Proposed changes

Metadata Compare breaks under special conditions

Browse Source 
When comparing OSP10 to OSP13 we were seeing issues when comparing
metadata. This patch addresses that issue, as well as ignores IP
addresses for the compare.

Change-Id: I9b827c80d98d84c862a228e72c2e6e3ee6cb4d9a
This commit is contained in:
Joe Talerico 2019-01-04 13:31:49 -05:00 committed by Aakarsh
parent fcd0d7ed05
commit cc9295342d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
browbeat/elastic.py
View File

@ -163,10 +163,10 @@ class Elastic(object):
for result in results:
for metadata in result['_source']['software-metadata']:
for service in metadata:
if pattern.match(metadata[service]['node_name']):
if metadata[service]['node_name'] not in nodes:
nodes[metadata[service][
'node_name']] = metadata
if 'node_name' in metadata[service]:
if pattern.match(metadata[service]['node_name']):
if metadata[service]['node_name'] not in nodes:
nodes[metadata[service]['node_name']] = metadata
return nodes
else:
self.logger.error("UUID {} wasn't found".format(browbeat_uuid))
@ -535,6 +535,8 @@ class Elastic(object):
ignore = [
"connection",
"admin_url",
"my_ip",
"local_ip",
"bind_host",
"rabbit_hosts",
"auth_url",