Enforce naming convention regarding abbreviations
Change-Id: Ic81038d3869268a55624ccbbf66048545158b0da
diff --git a/apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackExternalGateway.java b/apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackExternalGateway.java
index 6b4d1ea..c435ab7 100644
--- a/apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackExternalGateway.java
+++ b/apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackExternalGateway.java
@@ -25,13 +25,13 @@
public final class OpenstackExternalGateway {
private String networkId;
- private boolean enablePNAT;
+ private boolean enablePnat;
private HashMap<String, Ip4Address> externalFixedIps;
- private OpenstackExternalGateway(String networkId, boolean enablePNAT,
+ private OpenstackExternalGateway(String networkId, boolean enablePnat,
HashMap externalFixedIps) {
this.networkId = networkId;
- this.enablePNAT = enablePNAT;
+ this.enablePnat = enablePnat;
this.externalFixedIps = externalFixedIps;
}
@@ -49,8 +49,8 @@
*
* @return PNAT status
*/
- public boolean isEnablePNAT() {
- return enablePNAT;
+ public boolean isEnablePnat() {
+ return enablePnat;
}
/**
@@ -58,11 +58,11 @@
*/
public static final class Builder {
private String networkId;
- private boolean enablePNAT;
- private HashMap<String, Ip4Address> externalFixedIPs;
+ private boolean enablePnat;
+ private HashMap<String, Ip4Address> externalFixedIps;
Builder() {
- externalFixedIPs = new HashMap<>();
+ externalFixedIps = new HashMap<>();
}
/**
@@ -79,11 +79,11 @@
/**
* Sets whether PNAT status is enabled or not.
*
- * @param enablePNAT true if PNAT status is enabled, false otherwise
+ * @param enablePnat true if PNAT status is enabled, false otherwise
* @return Builder object
*/
- public Builder enablePNAT(boolean enablePNAT) {
- this.enablePNAT = enablePNAT;
+ public Builder enablePnat(boolean enablePnat) {
+ this.enablePnat = enablePnat;
return this;
}
@@ -93,8 +93,8 @@
* @param externalFixedIPs External fixed IP information
* @return Builder object
*/
- public Builder externalFixedIPs(HashMap<String, Ip4Address> externalFixedIPs) {
- this.externalFixedIPs.putAll(externalFixedIPs);
+ public Builder externalFixedIps(HashMap<String, Ip4Address> externalFixedIPs) {
+ this.externalFixedIps.putAll(externalFixedIPs);
return this;
}
@@ -104,7 +104,7 @@
* @return OpenstackExternalGateway object
*/
public OpenstackExternalGateway build() {
- return new OpenstackExternalGateway(networkId, enablePNAT, externalFixedIPs);
+ return new OpenstackExternalGateway(networkId, enablePnat, externalFixedIps);
}
}
diff --git a/apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackICMPHandler.java b/apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackIcmpHandler.java
similarity index 89%
rename from apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackICMPHandler.java
rename to apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackIcmpHandler.java
index fdc0ef97..7186903 100644
--- a/apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackICMPHandler.java
+++ b/apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackIcmpHandler.java
@@ -20,10 +20,10 @@
/**
* Handle ICMP packet processing for Managing Flow Rules In Openstack Nodes.
*/
-public class OpenstackICMPHandler implements Runnable {
+public class OpenstackIcmpHandler implements Runnable {
volatile PacketContext context;
- OpenstackICMPHandler(PacketContext context) {
+ OpenstackIcmpHandler(PacketContext context) {
this.context = context;
}
diff --git a/apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackPNATHandler.java b/apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackPnatHandler.java
similarity index 89%
rename from apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackPNATHandler.java
rename to apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackPnatHandler.java
index 2db73e3..60ec31b 100644
--- a/apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackPNATHandler.java
+++ b/apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackPnatHandler.java
@@ -20,10 +20,10 @@
/**
* Handle NAT packet processing for Managing Flow Rules In Openstack Nodes.
*/
-public class OpenstackPNATHandler implements Runnable {
+public class OpenstackPnatHandler implements Runnable {
volatile PacketContext context;
- OpenstackPNATHandler(PacketContext context) {
+ OpenstackPnatHandler(PacketContext context) {
this.context = context;
}
diff --git a/apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackRoutingManager.java b/apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackRoutingManager.java
index 87a6c99..ae41bf2 100644
--- a/apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackRoutingManager.java
+++ b/apps/openstackrouting/src/main/java/org/onosproject/openstackrouting/OpenstackRoutingManager.java
@@ -57,8 +57,8 @@
protected DriverService driverService;
private ApplicationId appId;
- private OpenstackICMPHandler icmpHandler;
- private OpenstackPNATHandler natHandler;
+ private OpenstackIcmpHandler icmpHandler;
+ private OpenstackPnatHandler natHandler;
private OpenstackFloatingIPHandler floatingIPHandler;
private OpenstackRoutingRulePopulator openstackRoutingRulePopulator;
@@ -144,10 +144,10 @@
IPv4 iPacket = (IPv4) ethernet.getPayload();
switch (iPacket.getProtocol()) {
case IPv4.PROTOCOL_ICMP:
- icmpEventExcutorService.execute(new OpenstackICMPHandler(context));
+ icmpEventExcutorService.execute(new OpenstackIcmpHandler(context));
break;
default:
- l3EventExcutorService.execute(new OpenstackPNATHandler(context));
+ l3EventExcutorService.execute(new OpenstackPnatHandler(context));
break;
}