From 3fd01845143e91c5c193a1d4af1f1dcdccc23c89 Mon Sep 17 00:00:00 2001 From: Raj Reddy Date: Wed, 31 Aug 2016 15:09:39 -0700 Subject: [PATCH] Currently the self_ip_list does not always carry configured virtual_router_ip_address.. The control_ip is matches the configured virtual_router_ip_address, the condition is already present. This commit removes self_ip_list comparison. Closes-Bug: #1616587 (cherry picked from commit 3306df1020ec759477a693f38e1faabaf33ea50f) Conflicts: src/opserver/plugins/alarm_address_mismatch/main.py Change-Id: I0e13852cc023dcdc72370862e99afaf2d424cfef --- .../plugins/alarm_address_mismatch/main.py | 19 --- src/opserver/test/test_alarm_plugins.py | 150 ------------------ 2 files changed, 169 deletions(-) diff --git a/src/opserver/plugins/alarm_address_mismatch/main.py b/src/opserver/plugins/alarm_address_mismatch/main.py index 39618498b51..556adc1b88c 100644 --- a/src/opserver/plugins/alarm_address_mismatch/main.py +++ b/src/opserver/plugins/alarm_address_mismatch/main.py @@ -29,25 +29,6 @@ def __call__(self, uve_key, uve_data): if 'VrouterAgent' not in uve_data: return None - try: - vrouter_agent_self_ip_list = \ - uve_data['VrouterAgent']['self_ip_list'] - except KeyError: - vrouter_agent_self_ip_list = None - - if not isinstance(vrouter_agent_self_ip_list, list) or \ - vrouter_ip_address not in vrouter_agent_self_ip_list: - and_list = [AlarmConditionMatch( - condition=AlarmCondition(operation='not in', - operand1='ContrailConfig.elements.' - 'virtual_router_ip_address', - operand2=AlarmOperand2( - uve_attribute='VrouterAgent.self_ip_list'), - variables = []), - match=[AlarmMatch(json_operand1_value=json.dumps( - vrouter_ip_address), json_operand2_value=json.dumps( - vrouter_agent_self_ip_list), json_variables={})])] - or_list.append(AlarmAndList(and_list)) try: vrouter_agent_control_ip = uve_data['VrouterAgent']['control_ip'] diff --git a/src/opserver/test/test_alarm_plugins.py b/src/opserver/test/test_alarm_plugins.py index 4c88237e15c..7b593b3c6c7 100644 --- a/src/opserver/test/test_alarm_plugins.py +++ b/src/opserver/test/test_alarm_plugins.py @@ -270,37 +270,12 @@ def test_alarm_address_mismatch(self): self._verify(AddressMismatchControl(), tests) tests = [ - TestCase( - name='ContrailConfig == null', - input=TestInput(uve_key='ObjectVRouter:host1', - uve_data={ - 'VrouterAgent': { - 'self_ip_list': ['10.1.1.1'] - } - } - ), - output=TestOutput(or_list=None) - ), - TestCase( - name='VrouterAgent == null', - input=TestInput(uve_key='ObjectVRouter:host1', - uve_data={ - 'ContrailConfig': { - 'elements': { - 'virtual_router_ip_address': '"10.1.1.1"' - } - } - } - ), - output=TestOutput(or_list=None) - ), TestCase( name='ContrailConfig.elements.virtual_router_ip_address ' +\ '== null', input=TestInput(uve_key='ObjectVRouter:host1', uve_data={ 'VrouterAgent': { - 'self_ip_list': ['10.1.1.1'], 'control_ip': '10.1.1.1' }, 'ContrailConfig': { @@ -310,14 +285,6 @@ def test_alarm_address_mismatch(self): } ), output=TestOutput(or_list=[ - { - 'and_list': [ - ('ContrailConfig.elements.' +\ - 'virtual_router_ip_address not in ' - 'VrouterAgent.self_ip_list', None, - [('null', '["10.1.1.1"]', None)]) - ] - }, { 'and_list': [ ('ContrailConfig.elements.' +\ @@ -328,59 +295,8 @@ def test_alarm_address_mismatch(self): } ]) ), - TestCase( - name='VrouterAgent.self_ip_list == null', - input=TestInput(uve_key='ObjectVRouter:host1', - uve_data={ - 'VrouterAgent': { - 'control_ip': '10.1.1.1' - }, - 'ContrailConfig': { - 'elements': { - 'virtual_router_ip_address': '"10.1.1.1"' - } - } - } - ), - output=TestOutput(or_list=[ - { - 'and_list': [ - ('ContrailConfig.elements.' +\ - 'virtual_router_ip_address not in ' - 'VrouterAgent.self_ip_list', None, - [('"10.1.1.1"', 'null', None)]) - ] - } - ]) - ), TestCase( name='VrouterAgent.control_ip == null', - input=TestInput(uve_key='ObjectVRouter:host1', - uve_data={ - 'VrouterAgent': { - 'self_ip_list': ['1.1.1.1', '10.1.1.1'], - }, - 'ContrailConfig': { - 'elements': { - 'virtual_router_ip_address': '"10.1.1.1"' - } - } - } - ), - output=TestOutput(or_list=[ - { - 'and_list': [ - ('ContrailConfig.elements.' +\ - 'virtual_router_ip_address != ' - 'VrouterAgent.control_ip', None, - [('"10.1.1.1"', 'null', None)]) - ] - } - ]) - ), - TestCase( - name='VrouterAgent.control_ip == null, ' +\ - 'VrouterAgent.self_ip_list == null', input=TestInput(uve_key='ObjectVRouter:host1', uve_data={ 'VrouterAgent': { @@ -393,14 +309,6 @@ def test_alarm_address_mismatch(self): } ), output=TestOutput(or_list=[ - { - 'and_list': [ - ('ContrailConfig.elements.' +\ - 'virtual_router_ip_address not in ' - 'VrouterAgent.self_ip_list', None, - [('"10.1.1.1"', 'null', None)]) - ] - }, { 'and_list': [ ('ContrailConfig.elements.' +\ @@ -417,7 +325,6 @@ def test_alarm_address_mismatch(self): input=TestInput(uve_key='ObjectVRouter:host1', uve_data={ 'VrouterAgent': { - 'self_ip_list': ['1.1.1.1', '1.1.1.2'], 'control_ip': '1.1.1.1' }, 'ContrailConfig': { @@ -438,59 +345,11 @@ def test_alarm_address_mismatch(self): } ]) ), - TestCase( - name='ContrailConfig.elements.virtual_router_ip_address ' +\ - 'not in VrouterAgent.self_ip_list', - input=TestInput(uve_key='ObjectVRouter:host1', - uve_data={ - 'VrouterAgent': { - 'self_ip_list': ['10.1.1.1'], - 'control_ip': '1.1.1.2' - }, - 'ContrailConfig': { - 'elements': { - 'virtual_router_ip_address': '"1.1.1.2"' - } - } - } - ), - output=TestOutput(or_list=[ - { - 'and_list': [ - ('ContrailConfig.elements.' +\ - 'virtual_router_ip_address not in ' - 'VrouterAgent.self_ip_list', None, - [('"1.1.1.2"', '["10.1.1.1"]', None)]) - ] - } - ]) - ), - TestCase( - name='ContrailConfig.elements.virtual_router_ip_address ' +\ - 'in VrouterAgent.self_ip_list, ' +\ - 'ContrailConfig.elements.virtual_router_ip_address ' +\ - '== VrouterAgent.control_ip', - input=TestInput(uve_key='ObjectVRouter:host1', - uve_data={ - 'VrouterAgent': { - 'self_ip_list': ['1.1.1.1', '10.1.1.1'], - 'control_ip': '10.1.1.1' - }, - 'ContrailConfig': { - 'elements': { - 'virtual_router_ip_address': '"10.1.1.1"' - } - } - } - ), - output=TestOutput(or_list=None) - ), TestCase( name='ContrailConfig.elements is a list of list - no match', input=TestInput(uve_key='ObjectVRouter:host1', uve_data={ 'VrouterAgent': { - 'self_ip_list': ['1.1.1.1', '10.1.1.1'], 'control_ip': '10.1.1.1' }, 'ContrailConfig': { @@ -522,7 +381,6 @@ def test_alarm_address_mismatch(self): input=TestInput(uve_key='ObjectVRouter:host1', uve_data={ 'VrouterAgent': { - 'self_ip_list': ['1.1.1.1', '10.1.1.1'], 'control_ip': '10.1.1.1' }, 'ContrailConfig': { @@ -548,14 +406,6 @@ def test_alarm_address_mismatch(self): } ), output=TestOutput(or_list=[ - { - 'and_list': [ - ('ContrailConfig.elements.' +\ - 'virtual_router_ip_address not in ' - 'VrouterAgent.self_ip_list', None, - [('"10.1.1.2"', '["1.1.1.1", "10.1.1.1"]', None)]) - ] - }, { 'and_list': [ ('ContrailConfig.elements.' +\