tree 3f1a3317fe9d12aa7070580809a6fab318e711a6
parent 978223fab120d080083edd1074f0d0d780ef89ee
author Konstantinos Kanonakis <kanonakisk@gmail.com> 1457973083 -0500
committer Jon Hall <jhall@onlab.us> 1463445007 +0000

Fixes to solve Jira Issues ONOS-4173 and ONOS-4174

- Using Pair<DeviceId, MeterId> instead of MeterId in storedMeterMap to avoid duplicate key IllegalStateException
- Replaced ADD operation with MODIFY in pushMeterMetrics method to avoid METER_EXISTS errors

Change-Id: I80d3ccededa452445b11bb09b949fb2a208293a4
(cherry picked from commit a45755d78847f97b6c9aa82ff96456736df9267b)