openstack
/
monasca-common
Code Issues Proposed changes

added support for complex characters without quote 

changed to accept numbers as leading characters
Change-Id: I8881b149b6248184df5c25b20e60b9415a9513be
This commit is contained in:
Derrick Johnson 2014-07-25 02:59:25 -07:00
parent be47680139
commit 3fb50c0b7f
2 changed files with 161 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
java/monasca-common-model/src/main/resources/com/hpcloud/mon/common/model/alarm/AlarmExpression.g4
View File

@ -31,6 +31,7 @@ expression
| '(' expression ')' # parenExpr
;
function
: functionType '(' compoundIdentifier (',' period)? ')'
;
@ -43,8 +44,8 @@ relational_operator
;
lt
: LT
| LT_S
: LT_S
| LT
;
lte
@ -90,7 +91,7 @@ compoundIdentifier
;
namespace
: identifier
: txt
;
dimensionList
@ -98,22 +99,9 @@ dimensionList
;
dimension
: identifier '=' ext_identifier
: txt '=' txt
;
identifier
: IDENTIFIER
| keyword
;
ext_identifier
: IDENTIFIER
| EXT_IDENTIFIER
| INTEGER
| keyword
| STRING
;
keyword
: LT
| LTE
@ -128,18 +116,24 @@ keyword
| AVG
;
literal
period
: INTEGER
;
period
literal
: INTEGER
;
repeat
: INTEGER
;
txt
: TXT
| keyword
| INTEGER
| STRING
;
LT
: [lL][tT]
;
@ -173,7 +167,7 @@ GTE_S
;
AND
: [aA][nN][dD]
: [aA][nN][dD]
;
AND_S
@ -212,12 +206,8 @@ INTEGER
: DIGIT+
;
IDENTIFIER
: (LETTER|UNDERSCORE) (LETTER|DIGIT|UNDERSCORE|DASH|PERIOD)*
;
EXT_IDENTIFIER
: (LETTER|DIGIT|UNDERSCORE|DASH|PERIOD)+
TXT
: [a-zA-Z_$/\\0-9]~('\''|';' | '}' | '{' | '=' | ','| '&' | ')' | '(' |' '| '"' )+
;
STRING
@ -250,4 +240,4 @@ PERIOD
: '.'
;
WS : [ \t\r\n]+ -> skip ;
WS : [ \t\r\n]+ -> skip ;

236
java/monasca-common-model/src/test/java/com/hpcloud/mon/common/model/alarm/AlarmExpressionTest.java
View File

@ -46,7 +46,7 @@ public class AlarmExpressionTest {
new MetricDefinition("hpcs.compute", ImmutableMap.<String, String>builder()
.put("instance_id", "5")
.put("metric_name", "cpu")
.put("url","\"https://www.google.com/?startpage=3&happygoing\"" )
.put("url", "\"https://www.google.com/?startpage=3&happygoing\"")
.put("device", "1")
.build()), AlarmOperator.GT, 5, 1, 3);
@ -54,116 +54,166 @@ public class AlarmExpressionTest {
new MetricDefinition("hpcs.compute", ImmutableMap.<String, String>builder()
.put("flavor_id", "3")
.put("metric_name", "mem")
.put("specialchars","\"!@#$%^&*()~<>{}[],.\"")
.put("specialchars", "\"!@#$%^&*()~<>{}[],.\"")
.build()), AlarmOperator.LT, 4, 2, 3);
assertEquals(alarms.get(0), expected1);
assertEquals(alarms.get(1), expected2);
}
public void shouldParseExpressionWithoutType() {
AlarmExpression expr = new AlarmExpression(
"avg(hpcs.compute{instance_id=5,metric_name=cpu,device=1}, 1) > 5 times 3 and avg(hpcs.compute{flavor_id=3,metric_name=mem}, 2) < 4 times 3");
List<AlarmSubExpression> alarms = expr.getSubExpressions();
public void shouldParseComplexWithoutQuotes() {
AlarmSubExpression expected1 = new AlarmSubExpression(AggregateFunction.AVG,
new MetricDefinition("hpcs.compute", ImmutableMap.<String, String>builder()
.put("instance_id", "5")
.put("metric_name", "cpu")
.put("device", "1")
.build()), AlarmOperator.GT, 5, 1, 3);
AlarmSubExpression expected2 = new AlarmSubExpression(AggregateFunction.AVG,
new MetricDefinition("hpcs.compute", ImmutableMap.<String, String>builder()
.put("flavor_id", "3")
.put("metric_name", "mem")
.build()), AlarmOperator.LT, 4, 2, 3);
assertEquals(alarms.get(0), expected1);
assertEquals(alarms.get(1), expected2);
}
AlarmExpression expr = new AlarmExpression(
"avg(hpcs.compute{instance_id=5,metric_name=cpu,device=1, url=https%3A%2F%2Fwww.google.com%2F%3Fstartpage%3D3%26happygoing}, 1) > 5 times 3 and avg(hpcs.compute{flavor_id=3,metric_name=mem, specialchars=a!@#/\\$%^*~}, 2) < 4 times 3");
List<AlarmSubExpression> alarms = expr.getSubExpressions();
public void shouldEvaluateExpression() {
AlarmExpression expr = new AlarmExpression(
"sum(hpcs.compute{instance_id=5,metric_name=disk}, 1) > 33 or (avg(hpcs.compute{instance_id=5,metric_name=cpu,device=1}, 1) > 5 times 3 and avg(hpcs.compute{flavor_id=3,metric_name=mem}, 2) < 4 times 3)");
List<AlarmSubExpression> alarms = expr.getSubExpressions();
AlarmSubExpression alarm1 = alarms.get(0);
AlarmSubExpression alarm2 = alarms.get(1);
AlarmSubExpression alarm3 = alarms.get(2);
AlarmExpression containsDirectories = new AlarmExpression("avg(hpcs.compute{instance_id=5,metric_name=cpu,device=1,global=$_globalVariable,special=__useSparingly,dos=C:\\system32\\}, 1) > 5 times 3 and avg(hpcs.compute{flavor_id=3,metric_name=mem,$globalVariable=global,__useSparingly=special,unix=/opt/vertica/bin/}, 2) < 4 times 3");
List<AlarmSubExpression> alarmsContainsDirectories = containsDirectories.getSubExpressions();
assertTrue(expr.evaluate(ImmutableMap.<AlarmSubExpression, Boolean>builder()
.put(alarm1, true)
.put(alarm2, false)
.put(alarm3, false)
.build()));
AlarmSubExpression expected1 = new AlarmSubExpression(AggregateFunction.AVG,
new MetricDefinition("hpcs.compute", ImmutableMap.<String, String>builder()
.put("instance_id", "5")
.put("metric_name", "cpu")
.put("url", "https%3A%2F%2Fwww.google.com%2F%3Fstartpage%3D3%26happygoing")
.put("device", "1")
.build()), AlarmOperator.GT, 5, 1, 3);
assertTrue(expr.evaluate(ImmutableMap.<AlarmSubExpression, Boolean>builder()
.put(alarm1, false)
.put(alarm2, true)
.put(alarm3, true)
.build()));
AlarmSubExpression expected2 = new AlarmSubExpression(AggregateFunction.AVG,
new MetricDefinition("hpcs.compute", ImmutableMap.<String, String>builder()
.put("flavor_id", "3")
.put("metric_name", "mem")
.put("specialchars", "a!@#/\\$%^*~")
.build()), AlarmOperator.LT, 4, 2, 3);
assertFalse(expr.evaluate(ImmutableMap.<AlarmSubExpression, Boolean>builder()
.put(alarm1, false)
.put(alarm2, false)
.put(alarm3, true)
.build()));
AlarmSubExpression expected3 = new AlarmSubExpression(AggregateFunction.AVG,
new MetricDefinition("hpcs.compute", ImmutableMap.<String, String>builder()
.put("instance_id", "5")
.put("metric_name", "cpu")
.put("device", "1")
.put("global", "$_globalVariable")
.put("special", "__useSparingly")
.put("dos", "C:\\system32\\")
.build()), AlarmOperator.GT, 5, 1, 3);
assertFalse(expr.evaluate(ImmutableMap.<AlarmSubExpression, Boolean>builder()
.put(alarm1, false)
.put(alarm2, true)
.put(alarm3, false)
.build()));
}
AlarmSubExpression expected4 = new AlarmSubExpression(AggregateFunction.AVG,
new MetricDefinition("hpcs.compute", ImmutableMap.<String, String>builder()
.put("flavor_id", "3")
.put("metric_name", "mem")
.put("$globalVariable", "global")
.put("__useSparingly", "special")
.put("unix", "/opt/vertica/bin/")
.build()), AlarmOperator.LT, 4, 2, 3);
assertEquals(alarms.get(0), expected1);
assertEquals(alarms.get(1), expected2);
assertEquals(alarmsContainsDirectories.get(0), expected3);
assertEquals(alarmsContainsDirectories.get(1), expected4);
}
public void shouldDefaultPeriodAndPeriods() {
AlarmExpression expr = new AlarmExpression(
"avg(hpcs.compute{instance_id=5,metric_name=cpu,device=1}) > 5");
AlarmSubExpression alarm = expr.getSubExpressions().get(0);
assertEquals(alarm.getPeriod(), 60);
assertEquals(alarm.getPeriods(), 1);
}
public void shouldParseExpressionWithoutType() {
AlarmExpression expr = new AlarmExpression(
"avg(hpcs.compute{instance_id=5,metric_name=cpu,device=1}, 1) > 5 times 3 and avg(hpcs.compute{flavor_id=3,metric_name=mem}, 2) < 4 times 3");
List<AlarmSubExpression> alarms = expr.getSubExpressions();
@Test(expectedExceptions = IllegalArgumentException.class)
public void shouldThrowOnEvaluateInvalidSubExpressions() {
AlarmExpression expr = new AlarmExpression(
"avg(hpcs.compute{instance_id=5,metric_name=cpu,device=2}, 1) > 5 times 3 and avg(hpcs.compute{flavor_id=3,metric_name=mem}, 2) < 4 times 3");
expr.evaluate(ImmutableMap.<AlarmSubExpression, Boolean>builder()
.put(
new AlarmSubExpression(AggregateFunction.AVG, new MetricDefinition("hpcs.compute",
ImmutableMap.<String, String>builder()
.put("flavor_id", "3")
.put("metric_name", "mem")
.build()), AlarmOperator.LT, 4, 2, 3), true)
.build());
}
AlarmSubExpression expected1 = new AlarmSubExpression(AggregateFunction.AVG,
new MetricDefinition("hpcs.compute", ImmutableMap.<String, String>builder()
.put("instance_id", "5")
.put("metric_name", "cpu")
.put("device", "1")
.build()), AlarmOperator.GT, 5, 1, 3);
AlarmSubExpression expected2 = new AlarmSubExpression(AggregateFunction.AVG,
new MetricDefinition("hpcs.compute", ImmutableMap.<String, String>builder()
.put("flavor_id", "3")
.put("metric_name", "mem")
.build()), AlarmOperator.LT, 4, 2, 3);
public void shouldGetAlarmExpressionTree() {
Object expr = AlarmExpression.of(
"(avg(foo) > 1 and avg(bar) < 2 and avg(baz) > 3) or (avg(foo) > 4 and avg(bar) < 5 and avg(baz) > 6)")
.getExpressionTree();
assertEquals(
expr.toString(),
"((avg(foo) > 1.0 AND avg(bar) < 2.0 AND avg(baz) > 3.0) OR (avg(foo) > 4.0 AND avg(bar) < 5.0 AND avg(baz) > 6.0))");
assertEquals(alarms.get(0), expected1);
assertEquals(alarms.get(1), expected2);
}
expr = AlarmExpression.of(
"(avg(foo) > 1 and (avg(bar) < 2 or avg(baz) > 3)) and (avg(foo) > 4 or avg(bar) < 5 or avg(baz) > 6)")
.getExpressionTree();
assertEquals(
expr.toString(),
"(avg(foo) > 1.0 AND (avg(bar) < 2.0 OR avg(baz) > 3.0) AND (avg(foo) > 4.0 OR avg(bar) < 5.0 OR avg(baz) > 6.0))");
}
public void shouldEvaluateExpression() {
AlarmExpression expr = new AlarmExpression(
"sum(hpcs.compute{instance_id=5,metric_name=disk}, 1) > 33 or (avg(hpcs.compute{instance_id=5,metric_name=cpu,device=1}, 1) > 5 times 3 and avg(hpcs.compute{flavor_id=3,metric_name=mem}, 2) < 4 times 3)");
List<AlarmSubExpression> alarms = expr.getSubExpressions();
@Test(enabled = false)
public void testExpressionEquality() {
AlarmExpression expr1 = new AlarmExpression(
"avg(hpcs.compute{instance_id=5,metric_name=cpu,device=a}, 1) lt 5 times 3 and avg(hpcs.compute{flavor_id=3,metric_name=mem}, 2) < 4 times 3");
AlarmExpression expr2 = new AlarmExpression(
"avg(hpcs.compute{flavor_id=3,metric_name=mem}, 2) gt 3 times 3 && avg(hpcs.compute{instance_id=5,metric_name=cpu,device=a}, 1) lt 5 times 3");
assertEquals(expr1, expr2);
AlarmSubExpression alarm1 = alarms.get(0);
AlarmSubExpression alarm2 = alarms.get(1);
AlarmSubExpression alarm3 = alarms.get(2);
AlarmExpression expr3 = new AlarmExpression(
"avg(hpcs.compute{instance_id=5,metric_name=cpu,device=a}, 1) lt 5 times 444 and avg(hpcs.compute{flavor_id=3,metric_name=mem}, 2) < 4 times 3");
assertNotEquals(expr1, expr3);
}
assertTrue(expr.evaluate(ImmutableMap.<AlarmSubExpression, Boolean>builder()
.put(alarm1, true)
.put(alarm2, false)
.put(alarm3, false)
.build()));
assertTrue(expr.evaluate(ImmutableMap.<AlarmSubExpression, Boolean>builder()
.put(alarm1, false)
.put(alarm2, true)
.put(alarm3, true)
.build()));
assertFalse(expr.evaluate(ImmutableMap.<AlarmSubExpression, Boolean>builder()
.put(alarm1, false)
.put(alarm2, false)
.put(alarm3, true)
.build()));
assertFalse(expr.evaluate(ImmutableMap.<AlarmSubExpression, Boolean>builder()
.put(alarm1, false)
.put(alarm2, true)
.put(alarm3, false)
.build()));
}
public void shouldDefaultPeriodAndPeriods() {
AlarmExpression expr = new AlarmExpression(
"avg(hpcs.compute{instance_id=5,metric_name=cpu,device=1}) > 5");
AlarmSubExpression alarm = expr.getSubExpressions().get(0);
assertEquals(alarm.getPeriod(), 60);
assertEquals(alarm.getPeriods(), 1);
}
@Test(expectedExceptions = IllegalArgumentException.class)
public void shouldThrowOnEvaluateInvalidSubExpressions() {
AlarmExpression expr = new AlarmExpression(
"avg(hpcs.compute{instance_id=5,metric_name=cpu,device=2}, 1) > 5 times 3 and avg(hpcs.compute{flavor_id=3,metric_name=mem}, 2) < 4 times 3");
expr.evaluate(ImmutableMap.<AlarmSubExpression, Boolean>builder()
.put(
new AlarmSubExpression(AggregateFunction.AVG, new MetricDefinition("hpcs.compute",
ImmutableMap.<String, String>builder()
.put("flavor_id", "3")
.put("metric_name", "mem")
.build()), AlarmOperator.LT, 4, 2, 3), true)
.build());
}
public void shouldGetAlarmExpressionTree() {
Object expr = AlarmExpression.of(
"(avg(foo) > 1 and avg(bar) < 2 and avg(baz) > 3) or (avg(foo) > 4 and avg(bar) < 5 and avg(baz) > 6)")
.getExpressionTree();
assertEquals(
expr.toString(),
"((avg(foo) > 1.0 AND avg(bar) < 2.0 AND avg(baz) > 3.0) OR (avg(foo) > 4.0 AND avg(bar) < 5.0 AND avg(baz) > 6.0))");
expr = AlarmExpression.of(
"(avg(foo) > 1 and (avg(bar) < 2 or avg(baz) > 3)) and (avg(foo) > 4 or avg(bar) < 5 or avg(baz) > 6)")
.getExpressionTree();
assertEquals(
expr.toString(),
"(avg(foo) > 1.0 AND (avg(bar) < 2.0 OR avg(baz) > 3.0) AND (avg(foo) > 4.0 OR avg(bar) < 5.0 OR avg(baz) > 6.0))");
}
@Test(enabled = false)
public void testExpressionEquality() {
AlarmExpression expr1 = new AlarmExpression(
"avg(hpcs.compute{instance_id=5,metric_name=cpu,device=a}, 1) lt 5 times 3 and avg(hpcs.compute{flavor_id=3,metric_name=mem}, 2) < 4 times 3");
AlarmExpression expr2 = new AlarmExpression(
"avg(hpcs.compute{flavor_id=3,metric_name=mem}, 2) gt 3 times 3 && avg(hpcs.compute{instance_id=5,metric_name=cpu,device=a}, 1) lt 5 times 3");
assertEquals(expr1, expr2);
AlarmExpression expr3 = new AlarmExpression(
"avg(hpcs.compute{instance_id=5,metric_name=cpu,device=a}, 1) lt 5 times 444 and avg(hpcs.compute{flavor_id=3,metric_name=mem}, 2) < 4 times 3");
assertNotEquals(expr1, expr3);
}
}