Fix order of arguments in assertEquals

Part 3

Related to: bug #1277104

Change-Id: Ia31f8f90b4b5f8edfa04091cc7e987c7e1f24383
Ensure alarm rule conform to alarm type

Threshold_rule or combination_rule must be set to an Alarm object,
and they cannot be set at the same time.
Alarm's type must be one of threshold and combination.
Threshold_rule and combination_rule should be validated according alarm's
type.

Change-Id: I97bf82defeaf0dc1a0e897e10886fd736361041d
Closes-bug: #1288677
Fix the type of the disk IO rate measurements

The type of the following measurements should be Gauge:
disk.write.requests.rate
disk.write.bytes.rate
disk.read.bytes.rate

Closes-bug: #1295088
Change-Id: Ia11f8ca36a02ca2e5f74de275df80faeaa5b7d39
Merge "Fix order of arguments in assertEquals"
Merge "Ensure alarm rule conform to alarm type"
Merge "Fix the type of the disk IO rate measurements"