Merge "ONOS-22 - Add Constraints to CLI Commands"