Toggle navigation
Toggle navigation
This project
Loading...
Sign in
홍길동
/
onos
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
alshabib
2015-09-27 10:59:50 +0200
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
5196e863928bb78a096b5c69cf873d0687fbc877
5196e863
1 parent
70aaa1b9
cleaning up some meter code
Change-Id: Ie901d51cf6ade2c497f90fadb093179404967d13
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
core/api/src/main/java/org/onosproject/net/meter/MeterKey.java
incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java
core/api/src/main/java/org/onosproject/net/meter/MeterKey.java
View file @
5196e86
...
...
@@ -18,6 +18,8 @@ package org.onosproject.net.meter;
import
com.google.common.base.Objects
;
import
org.onosproject.net.DeviceId
;
import
static
com
.
google
.
common
.
base
.
MoreObjects
.
toStringHelper
;
/**
* A meter key represents a meter uniquely.
*/
...
...
@@ -57,6 +59,13 @@ public final class MeterKey {
return
Objects
.
hashCode
(
deviceId
,
id
);
}
@Override
public
String
toString
()
{
return
toStringHelper
(
this
)
.
add
(
"deviceId"
,
deviceId
)
.
add
(
"meterId"
,
id
).
toString
();
}
public
static
MeterKey
key
(
DeviceId
deviceId
,
MeterId
id
)
{
return
new
MeterKey
(
deviceId
,
id
);
}
...
...
incubator/net/src/main/java/org/onosproject/incubator/net/meter/impl/MeterManager.java
View file @
5196e86
...
...
@@ -80,9 +80,6 @@ public class MeterManager extends AbstractListenerProviderRegistry<MeterEvent, M
@Activate
public
void
activate
()
{
/*meterIdCounter = storageService.atomicCounterBuilder()
.withName(METERCOUNTERIDENTIFIER)
.build();*/
store
.
setDelegate
(
delegate
);
...
...
Please
register
or
login
to post a comment