commit 51539b85d3107c79601129f48041dc72f118e003
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

Enforce naming convention regarding abbreviations

Change-Id: Ic81038d3869268a55624ccbbf66048545158b0da

drivers/default/src/main/java/org/onosproject/driver/DefaultDriversLoader.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/DefaultDriversLoader.java b/drivers/default/src/main/java/org/onosproject/driver/DefaultDriversLoader.java
index ad7d4a8..d7d13f6 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/DefaultDriversLoader.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/DefaultDriversLoader.java
@@ -33,7 +33,7 @@
     private static final String DRIVERS_XML = "/onos-drivers.xml";
 
     @Override
-    protected InputStream loadXMLDriversStream() {
+    protected InputStream loadXmlDriversStream() {
        return getClassLoaderInstance().getResourceAsStream(DRIVERS_XML);
     }
 

drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
index 8980733..c6d9f2b 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
@@ -149,7 +149,7 @@
             IPProtocolCriterion ipProto = (IPProtocolCriterion)
                     filterForCriterion(filter.conditions(), Criterion.Type.IP_PROTO);
             if (ipProto.protocol() == IPv4.PROTOCOL_IGMP) {
-                provisionIGMP(filter, ethType, ipProto, output);
+                provisionIgmp(filter, ethType, ipProto, output);
             } else {
                 log.error("OLT can only filter igmp");
                 fail(filter, ObjectiveError.UNSUPPORTED);
@@ -377,7 +377,7 @@
 
     }
 
-    private void provisionIGMP(FilteringObjective filter, EthTypeCriterion ethType,
+    private void provisionIgmp(FilteringObjective filter, EthTypeCriterion ethType,
                                IPProtocolCriterion ipProto,
                                Instructions.OutputInstruction output) {
         TrafficSelector selector = buildSelector(filter.key(), ethType, ipProto);

drivers/default/src/main/java/org/onosproject/driver/pipeline/OpenstackPipeline.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OpenstackPipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OpenstackPipeline.java
index 058283d..7b1a156 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OpenstackPipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OpenstackPipeline.java
@@ -134,11 +134,11 @@
     }
 
     private void initializePipeline() {
-        processVNITable(true);
+        processVniTable(true);
         processForwardingTable(true);
     }
 
-    private void processVNITable(boolean install) {
+    private void processVniTable(boolean install) {
         TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
         TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder();