| commit | 51539b85d3107c79601129f48041dc72f118e003 | [log] [tgz] |
|---|---|---|
| author | Jonathan Hart <jono@onlab.us> | Thu Oct 29 09:53:04 2015 -0700 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Thu Jan 28 17:32:37 2016 +0000 |
| tree | 0f9e3b076a260b9c202b5dd84d386b6983c6182c | |
| parent | f95b96eaa39c3a87cab5ed505425160bbe7f9087 [diff] |
Enforce naming convention regarding abbreviations Change-Id: Ic81038d3869268a55624ccbbf66048545158b0da
diff --git a/apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/impl/OpenstackPortInfo.java b/apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/impl/OpenstackPortInfo.java index 5a23800..6207228 100644 --- a/apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/impl/OpenstackPortInfo.java +++ b/apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/impl/OpenstackPortInfo.java
@@ -67,7 +67,7 @@ return this; } - public Builder setVNI(long vni) { + public Builder setVni(long vni) { this.vni = checkNotNull(vni, "vni cannot be null"); return this; }
diff --git a/apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/impl/OpenstackSwitchingManager.java b/apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/impl/OpenstackSwitchingManager.java index 96da749..a1b2f06 100644 --- a/apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/impl/OpenstackSwitchingManager.java +++ b/apps/openstackswitching/app/src/main/java/org/onosproject/openstackswitching/impl/OpenstackSwitchingManager.java
@@ -327,7 +327,7 @@ OpenstackPortInfo.Builder portBuilder = OpenstackPortInfo.builder() .setDeviceId(deviceId) .setHostIp((Ip4Address) openstackPort.fixedIps().values().stream().findFirst().orElse(null)) - .setVNI(vni); + .setVni(vni); openstackPortInfoMap.putIfAbsent(port.annotations().value(PORTNAME), portBuilder.build()); @@ -496,4 +496,4 @@ } } } -} \ No newline at end of file +}