Skip to content

Commit

Permalink
Merge "Currently the self_ip_list does not always carry configured vi…
Browse files Browse the repository at this point in the history 
…rtual_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." into R3.1
  • Loading branch information
@opencontrail-ci-admin
Zuul authored and opencontrail-ci-admin committed Sep 16, 2016
2 parents 0166af3 + 3fd0184 commit db54ebc
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 169 deletions.
19 changes: 0 additions & 19 deletions src/opserver/plugins/alarm_address_mismatch/main.py
View file
Expand Up @@ -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']
Expand Down
150 changes: 0 additions & 150 deletions src/opserver/test/test_alarm_plugins.py
View file
Expand Up @@ -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': {
Expand All @@ -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.' +\
Expand All @@ -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': {
Expand All @@ -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.' +\
Expand All @@ -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': {
Expand All @@ -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': {
Expand Down Expand Up @@ -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': {
Expand All @@ -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.' +\
Expand Down

0 comments on commit db54ebc

Please sign in to comment.