openstack/python-watcherclient
Code Issues Proposed changes

Merge "Add hostname field to support HA"

Browse Source
This commit is contained in:
Zuul
2018-07-26 13:45:54 +00:00
committed by Gerrit Code Review
parent d82be4c8c4 8d62995cf4
commit 6681724daa
5 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
watcherclient/tests/functional/v1/test_action_plan.py
View File

@@ -28,7 +28,8 @@ class ActionPlanTests(base.TestCase):
dummy_name = 'dummy' dummy_name = 'dummy'
list_fields = ['UUID', 'Audit', 'State', 'Updated At', 'Global efficacy'] list_fields = ['UUID', 'Audit', 'State', 'Updated At', 'Global efficacy']
detailed_list_fields = list_fields + ['Created At', 'Deleted At', detailed_list_fields = list_fields + ['Created At', 'Deleted At',
'Strategy', 'Efficacy indicators'] 'Strategy', 'Efficacy indicators',
'Hostname']
audit_template_name = 'a' + uuidutils.generate_uuid() audit_template_name = 'a' + uuidutils.generate_uuid()
audit_uuid = None audit_uuid = None

2
watcherclient/tests/functional/v1/test_audit.py
View File

@@ -30,7 +30,7 @@ class AuditTests(base.TestCase):
detailed_list_fields = list_fields + ['Created At', 'Updated At', detailed_list_fields = list_fields + ['Created At', 'Updated At',
'Deleted At', 'Parameters', 'Deleted At', 'Parameters',
'Interval', 'Audit Scope', 'Interval', 'Audit Scope',
'Next Run Time'] 'Next Run Time', 'Hostname']
audit_template_name = 'a' + uuidutils.generate_uuid() audit_template_name = 'a' + uuidutils.generate_uuid()
audit_uuid = None audit_uuid = None

2
watcherclient/tests/unit/v1/test_action_plan_shell.py
View File

@@ -44,6 +44,7 @@ ACTION_PLAN_1 = {
"description": "Dummy Global Efficacy2"} "description": "Dummy Global Efficacy2"}
], ],
'deleted_at': None, 'deleted_at': None,
'hostname': ''
} }
ACTION_PLAN_2 = { ACTION_PLAN_2 = {
@@ -63,6 +64,7 @@ ACTION_PLAN_2 = {
"description": "Dummy Global Efficacy", "description": "Dummy Global Efficacy",
}], }],
'deleted_at': None, 'deleted_at': None,
'hostname': ''
} }

3
watcherclient/tests/unit/v1/test_audit_shell.py
View File

@@ -69,6 +69,7 @@ AUDIT_1 = {
'auto_trigger': False, 'auto_trigger': False,
'next_run_time': None, 'next_run_time': None,
'name': 'my_audit1', 'name': 'my_audit1',
'hostname': '',
} }
AUDIT_2 = { AUDIT_2 = {
@@ -88,6 +89,7 @@ AUDIT_2 = {
'auto_trigger': False, 'auto_trigger': False,
'next_run_time': None, 'next_run_time': None,
'name': 'my_audit2', 'name': 'my_audit2',
'hostname': '',
} }
AUDIT_3 = { AUDIT_3 = {
@@ -107,6 +109,7 @@ AUDIT_3 = {
'auto_trigger': True, 'auto_trigger': True,
'next_run_time': None, 'next_run_time': None,
'name': 'my_audit3', 'name': 'my_audit3',
'hostname': '',
} }

10
watcherclient/v1/resource_fields.py
View File

@@ -32,12 +32,13 @@ AUDIT_TEMPLATE_SHORT_LIST_FIELD_LABELS = ['UUID', 'Name', 'Goal', 'Strategy']
# Audit # Audit
AUDIT_FIELDS = ['uuid', 'name', 'created_at', 'updated_at', 'deleted_at', AUDIT_FIELDS = ['uuid', 'name', 'created_at', 'updated_at', 'deleted_at',
'state', 'audit_type', 'parameters', 'interval', 'goal_name', 'state', 'audit_type', 'parameters', 'interval', 'goal_name',
'strategy_name', 'scope', 'auto_trigger', 'next_run_time'] 'strategy_name', 'scope', 'auto_trigger', 'next_run_time',
'hostname']
AUDIT_FIELD_LABELS = ['UUID', 'Name', 'Created At', 'Updated At', 'Deleted At', AUDIT_FIELD_LABELS = ['UUID', 'Name', 'Created At', 'Updated At', 'Deleted At',
'State', 'Audit Type', 'Parameters', 'Interval', 'Goal', 'State', 'Audit Type', 'Parameters', 'Interval', 'Goal',
'Strategy', 'Audit Scope', 'Auto Trigger', 'Strategy', 'Audit Scope', 'Auto Trigger',
'Next Run Time'] 'Next Run Time', 'Hostname']
AUDIT_SHORT_LIST_FIELDS = ['uuid', 'name', 'audit_type', AUDIT_SHORT_LIST_FIELDS = ['uuid', 'name', 'audit_type',
'state', 'goal_name', 'strategy_name', 'state', 'goal_name', 'strategy_name',
@@ -49,11 +50,12 @@ AUDIT_SHORT_LIST_FIELD_LABELS = ['UUID', 'Name', 'Audit Type', 'State', 'Goal',
# Action Plan # Action Plan
ACTION_PLAN_FIELDS = ['uuid', 'created_at', 'updated_at', 'deleted_at', ACTION_PLAN_FIELDS = ['uuid', 'created_at', 'updated_at', 'deleted_at',
'audit_uuid', 'strategy_name', 'state', 'audit_uuid', 'strategy_name', 'state',
'efficacy_indicators', 'global_efficacy'] 'efficacy_indicators', 'global_efficacy', 'hostname']
ACTION_PLAN_FIELD_LABELS = ['UUID', 'Created At', 'Updated At', 'Deleted At', ACTION_PLAN_FIELD_LABELS = ['UUID', 'Created At', 'Updated At', 'Deleted At',
'Audit', 'Strategy', 'State', 'Audit', 'Strategy', 'State',
'Efficacy indicators', 'Global efficacy'] 'Efficacy indicators', 'Global efficacy',
'Hostname']
ACTION_PLAN_SHORT_LIST_FIELDS = ['uuid', 'audit_uuid', 'state', ACTION_PLAN_SHORT_LIST_FIELDS = ['uuid', 'audit_uuid', 'state',
'updated_at', 'global_efficacy'] 'updated_at', 'global_efficacy']