Enforce naming convention regarding abbreviations
Change-Id: Ic81038d3869268a55624ccbbf66048545158b0da
diff --git a/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/DefaultIpDeviceDescription.java b/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/DefaultIpDeviceDescription.java
index 889e48a..fe91829 100644
--- a/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/DefaultIpDeviceDescription.java
+++ b/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/DefaultIpDeviceDescription.java
@@ -60,7 +60,7 @@
* @param annotations Annotations to use.
*/
public DefaultIpDeviceDescription(IpDeviceDescription base, SparseAnnotations... annotations) {
- this(base.deviceURI(), base.type(), base.deviceIdentifier(),
+ this(base.deviceUri(), base.type(), base.deviceIdentifier(),
base.deviceTed(), annotations);
}
@@ -71,12 +71,12 @@
* @param annotations Annotations to use.
*/
public DefaultIpDeviceDescription(IpDeviceDescription base, Type type, SparseAnnotations... annotations) {
- this(base.deviceURI(), type, base.deviceIdentifier(),
+ this(base.deviceUri(), type, base.deviceIdentifier(),
base.deviceTed(), annotations);
}
@Override
- public URI deviceURI() {
+ public URI deviceUri() {
return uri;
}
diff --git a/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/IpDeviceDescription.java b/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/IpDeviceDescription.java
index c0a4391..a8dfff2 100644
--- a/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/IpDeviceDescription.java
+++ b/apps/iptopology-api/src/main/java/org/onosproject/iptopology/api/device/IpDeviceDescription.java
@@ -35,7 +35,7 @@
*
* @return provider specific URI for the ip device
*/
- URI deviceURI();
+ URI deviceUri();
/**
* Returns the type of the ip device. For ex: Psuedo or actual
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;
}
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
+}
diff --git a/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepLinkListener.java b/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepLinkListener.java
index 608ef1b..71e5672 100644
--- a/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepLinkListener.java
+++ b/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepLinkListener.java
@@ -26,5 +26,5 @@
*
* @param link pcep link
*/
- void handlePCEPlink(PcepLink link);
+ void handlePceplink(PcepLink link);
}
diff --git a/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepTunnel.java b/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepTunnel.java
index 6b0a7e6..03a6a95 100644
--- a/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepTunnel.java
+++ b/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepTunnel.java
@@ -69,7 +69,7 @@
DIAMOND
}
- enum PATHTYPE {
+ enum PathType {
/**
* Indicates path is the preferred path.
@@ -179,7 +179,7 @@
*
* @return the type of a path, the preferred or alternate.
*/
- PATHTYPE getPathType();
+ PathType getPathType();
/**
* Get the under lay tunnel id of VLAN tunnel.
diff --git a/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepTunnelListener.java b/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepTunnelListener.java
index 8b64b92..802257e 100644
--- a/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepTunnelListener.java
+++ b/apps/pcep-api/src/main/java/org/onosproject/pcep/api/PcepTunnelListener.java
@@ -26,7 +26,7 @@
*
* @param tunnel a pceptunnel.
*/
- void handlePCEPTunnel(PcepTunnel tunnel);
+ void handlePcepTunnel(PcepTunnel tunnel);
/**
* Notify that get a tunnel statistic data from the network.
diff --git a/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/forwarder/ServiceFunctionForwarderService.java b/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/forwarder/ServiceFunctionForwarderService.java
index 0ed42fc..069cfd1 100644
--- a/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/forwarder/ServiceFunctionForwarderService.java
+++ b/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/forwarder/ServiceFunctionForwarderService.java
@@ -28,24 +28,24 @@
* Install Forwarding rule.
*
* @param portChain port-chain
- * @param nshSPI nsh spi
+ * @param nshSpi nsh spi
*/
- void installForwardingRule(PortChain portChain, NshServicePathId nshSPI);
+ void installForwardingRule(PortChain portChain, NshServicePathId nshSpi);
/**
* Uninstall Forwarding rule.
*
* @param portChain port-chain
- * @param nshSPI nsh spi
+ * @param nshSpi nsh spi
*/
- void unInstallForwardingRule(PortChain portChain, NshServicePathId nshSPI);
+ void unInstallForwardingRule(PortChain portChain, NshServicePathId nshSpi);
/**
* Prepare forwarding object for Service Function.
*
* @param portChain port-chain
- * @param nshSPI nsh spi
+ * @param nshSpi nsh spi
* @param type forwarding objective operation type
*/
- void prepareServiceFunctionForwarder(PortChain portChain, NshServicePathId nshSPI, Objective.Operation type);
+ void prepareServiceFunctionForwarder(PortChain portChain, NshServicePathId nshSpi, Objective.Operation type);
}
diff --git a/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/forwarder/impl/ServiceFunctionForwarderImpl.java b/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/forwarder/impl/ServiceFunctionForwarderImpl.java
index 82c7bcb..4eab2bf 100644
--- a/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/forwarder/impl/ServiceFunctionForwarderImpl.java
+++ b/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/forwarder/impl/ServiceFunctionForwarderImpl.java
@@ -15,58 +15,56 @@
*/
package org.onosproject.sfc.forwarder.impl;
-import static org.slf4j.LoggerFactory.getLogger;
-import static org.onosproject.net.flow.criteria.ExtensionSelectorType.ExtensionSelectorTypes.NICIRA_MATCH_NSH_SPI;
-import static com.google.common.base.Preconditions.checkNotNull;
-
-import java.util.List;
-import java.util.ListIterator;
-
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-
import org.onlab.osgi.DefaultServiceDirectory;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
import org.onosproject.core.ApplicationId;
-import org.onosproject.net.behaviour.ExtensionSelectorResolver;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Host;
import org.onosproject.net.HostId;
import org.onosproject.net.NshServicePathId;
import org.onosproject.net.PortNumber;
+import org.onosproject.net.behaviour.ExtensionSelectorResolver;
import org.onosproject.net.driver.DriverHandler;
import org.onosproject.net.driver.DriverService;
import org.onosproject.net.flow.DefaultTrafficSelector;
import org.onosproject.net.flow.DefaultTrafficTreatment;
-import org.onosproject.net.flow.criteria.ExtensionSelector;
import org.onosproject.net.flow.TrafficSelector;
import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.net.flow.criteria.ExtensionSelector;
import org.onosproject.net.flowobjective.DefaultForwardingObjective;
import org.onosproject.net.flowobjective.FlowObjectiveService;
import org.onosproject.net.flowobjective.ForwardingObjective;
+import org.onosproject.net.flowobjective.ForwardingObjective.Flag;
import org.onosproject.net.flowobjective.Objective;
import org.onosproject.net.host.HostService;
-import org.onosproject.net.flowobjective.ForwardingObjective.Flag;
-import org.onosproject.vtnrsc.VirtualPortId;
-import org.onosproject.vtnrsc.service.VtnRscService;
+import org.onosproject.sfc.forwarder.ServiceFunctionForwarderService;
import org.onosproject.vtnrsc.PortChain;
import org.onosproject.vtnrsc.PortPair;
import org.onosproject.vtnrsc.PortPairGroup;
import org.onosproject.vtnrsc.PortPairGroupId;
import org.onosproject.vtnrsc.PortPairId;
-import org.onosproject.vtnrsc.virtualport.VirtualPortService;
-import org.onosproject.vtnrsc.portpair.PortPairService;
-import org.onosproject.vtnrsc.portpairgroup.PortPairGroupService;
+import org.onosproject.vtnrsc.VirtualPortId;
import org.onosproject.vtnrsc.flowclassifier.FlowClassifierService;
import org.onosproject.vtnrsc.portchain.PortChainService;
-import org.onosproject.sfc.forwarder.ServiceFunctionForwarderService;
-
+import org.onosproject.vtnrsc.portpair.PortPairService;
+import org.onosproject.vtnrsc.portpairgroup.PortPairGroupService;
+import org.onosproject.vtnrsc.service.VtnRscService;
+import org.onosproject.vtnrsc.virtualport.VirtualPortService;
import org.slf4j.Logger;
+import java.util.List;
+import java.util.ListIterator;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onosproject.net.flow.criteria.ExtensionSelectorType.ExtensionSelectorTypes.NICIRA_MATCH_NSH_SPI;
+import static org.slf4j.LoggerFactory.getLogger;
+
/**
* Provides Service Function Forwarder implementation.
*/
@@ -119,19 +117,19 @@
}
@Override
- public void installForwardingRule(PortChain portChain, NshServicePathId nshSPI) {
+ public void installForwardingRule(PortChain portChain, NshServicePathId nshSpi) {
checkNotNull(portChain, PORT_CHAIN_NOT_NULL);
- prepareServiceFunctionForwarder(portChain, nshSPI, Objective.Operation.ADD);
+ prepareServiceFunctionForwarder(portChain, nshSpi, Objective.Operation.ADD);
}
@Override
- public void unInstallForwardingRule(PortChain portChain, NshServicePathId nshSPI) {
+ public void unInstallForwardingRule(PortChain portChain, NshServicePathId nshSpi) {
checkNotNull(portChain, PORT_CHAIN_NOT_NULL);
- prepareServiceFunctionForwarder(portChain, nshSPI, Objective.Operation.REMOVE);
+ prepareServiceFunctionForwarder(portChain, nshSpi, Objective.Operation.REMOVE);
}
@Override
- public void prepareServiceFunctionForwarder(PortChain portChain, NshServicePathId nshSPI,
+ public void prepareServiceFunctionForwarder(PortChain portChain, NshServicePathId nshSpi,
Objective.Operation type) {
// Go through the port pair group list
@@ -153,7 +151,7 @@
PortPairGroup nextPortPairGroup = portPairGroupService.getPortPairGroup(portPairGrpId);
// push SFF to OVS
- pushServiceFunctionForwarder(currentPortPairGroup, nextPortPairGroup, listGrpIterator, nshSPI, type);
+ pushServiceFunctionForwarder(currentPortPairGroup, nextPortPairGroup, listGrpIterator, nshSpi, type);
}
/**
@@ -162,11 +160,11 @@
* @param currentPortPairGroup current port-pair-group
* @param nextPortPairGroup next port-pair-group
* @param listGrpIterator pointer to port-pair-group list
- * @param nshSPI nsh service path id
+ * @param nshSpi nsh service path id
* @param type objective type
*/
public void pushServiceFunctionForwarder(PortPairGroup currentPortPairGroup, PortPairGroup nextPortPairGroup,
- ListIterator<PortPairGroupId> listGrpIterator, NshServicePathId nshSPI, Objective.Operation type) {
+ ListIterator<PortPairGroupId> listGrpIterator, NshServicePathId nshSpi, Objective.Operation type) {
DeviceId deviceId = null;
DeviceId currentDeviceId = null;
DeviceId nextDeviceId = null;
@@ -185,13 +183,13 @@
PortPairId portPairId = portPLIterator.next();
PortPair portPair = portPairService.getPortPair(portPairId);
- currentDeviceId = vtnRscService.getSFToSFFMaping(VirtualPortId.portId(portPair.ingress()));
+ currentDeviceId = vtnRscService.getSfToSffMaping(VirtualPortId.portId(portPair.ingress()));
if (deviceId == null) {
deviceId = currentDeviceId;
}
// pack traffic selector
- TrafficSelector.Builder selector = packTrafficSelector(deviceId, portPair, nshSPI);
+ TrafficSelector.Builder selector = packTrafficSelector(deviceId, portPair, nshSpi);
// Get the required information on port pairs from destination port
// pair group
@@ -204,7 +202,7 @@
portPairId = portPLIterator.next();
portPair = portPairService.getPortPair(portPairId);
- nextDeviceId = vtnRscService.getSFToSFFMaping(VirtualPortId.portId(portPair.ingress()));
+ nextDeviceId = vtnRscService.getSfToSffMaping(VirtualPortId.portId(portPair.ingress()));
// pack traffic treatment
TrafficTreatment.Builder treatment = packTrafficTreatment(currentDeviceId, nextDeviceId, portPair);
@@ -228,10 +226,10 @@
*
* @param deviceId device id
* @param portPair port-pair
- * @param nshSPI nsh spi
+ * @param nshSpi nsh spi
* @return traffic treatment
*/
- public TrafficSelector.Builder packTrafficSelector(DeviceId deviceId, PortPair portPair, NshServicePathId nshSPI) {
+ public TrafficSelector.Builder packTrafficSelector(DeviceId deviceId, PortPair portPair, NshServicePathId nshSpi) {
TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
MacAddress dstMacAddress = virtualPortService.getPort(VirtualPortId.portId(portPair.egress())).macAddress();
Host host = hostService.getHost(HostId.hostId(dstMacAddress));
@@ -243,7 +241,7 @@
ExtensionSelector nspSpiSelector = resolver.getExtensionSelector(NICIRA_MATCH_NSH_SPI.type());
try {
- nspSpiSelector.setPropertyValue("nshSpi", nshSPI);
+ nspSpiSelector.setPropertyValue("nshSpi", nshSpi);
} catch (Exception e) {
log.error("Failed to get extension instruction to set Nsh Spi Id {}", deviceId);
}
diff --git a/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/installer/impl/FlowClassifierInstallerImpl.java b/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/installer/impl/FlowClassifierInstallerImpl.java
index b628c21..caebbd9 100644
--- a/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/installer/impl/FlowClassifierInstallerImpl.java
+++ b/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/installer/impl/FlowClassifierInstallerImpl.java
@@ -15,20 +15,10 @@
*/
package org.onosproject.sfc.installer.impl;
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.onosproject.net.flow.instructions.ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_SET_NSH_SI;
-import static org.onosproject.net.flow.instructions.ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_SET_NSH_SPI;
-import static org.slf4j.LoggerFactory.getLogger;
-
+import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-
-import org.apache.felix.scr.annotations.Component;
import org.onlab.osgi.DefaultServiceDirectory;
import org.onlab.osgi.ServiceDirectory;
import org.onlab.packet.Ethernet;
@@ -41,8 +31,8 @@
import org.onosproject.net.HostId;
import org.onosproject.net.NshServicePathId;
import org.onosproject.net.PortNumber;
-import org.onosproject.net.device.DeviceService;
import org.onosproject.net.behaviour.ExtensionTreatmentResolver;
+import org.onosproject.net.device.DeviceService;
import org.onosproject.net.driver.DriverHandler;
import org.onosproject.net.driver.DriverService;
import org.onosproject.net.flow.DefaultTrafficSelector;
@@ -72,9 +62,17 @@
import org.onosproject.vtnrsc.portpairgroup.PortPairGroupService;
import org.onosproject.vtnrsc.service.VtnRscService;
import org.onosproject.vtnrsc.virtualport.VirtualPortService;
-
import org.slf4j.Logger;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onosproject.net.flow.instructions.ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_SET_NSH_SI;
+import static org.onosproject.net.flow.instructions.ExtensionTreatmentType.ExtensionTreatmentTypes.NICIRA_SET_NSH_SPI;
+import static org.slf4j.LoggerFactory.getLogger;
+
/**
* Provides flow classifier installer implementation.
*/
@@ -175,7 +173,7 @@
}
@Override
- public void prepareFlowClassification(FlowClassifier flowClassifier, PortPair portPair, NshServicePathId nshSPI,
+ public void prepareFlowClassification(FlowClassifier flowClassifier, PortPair portPair, NshServicePathId nshSpi,
Operation type) {
DeviceId deviceId = null;
// device id if virtual ports are set in flow classifier.
@@ -187,10 +185,10 @@
TpPort nshDstPort = TpPort.tpPort(6633);
if ((flowClassifier.srcPort() != null) && (!flowClassifier.srcPort().portId().isEmpty())) {
- deviceIdfromFc = vtnRscService.getSFToSFFMaping(flowClassifier.srcPort());
+ deviceIdfromFc = vtnRscService.getSfToSffMaping(flowClassifier.srcPort());
deviceId = deviceIdfromFc;
} else {
- deviceIdfromPp = vtnRscService.getSFToSFFMaping(VirtualPortId.portId(portPair.ingress()));
+ deviceIdfromPp = vtnRscService.getSfToSffMaping(VirtualPortId.portId(portPair.ingress()));
srcMacAddress = virtualPortService.getPort(VirtualPortId.portId(portPair.egress())).macAddress();
deviceId = deviceIdfromPp;
}
@@ -200,7 +198,7 @@
// Build traffic treatment.
TrafficTreatment.Builder treatment = packTrafficTreatment(deviceId, srcMacAddress, nshDstPort, deviceIdfromFc,
- deviceIdfromPp, nshSPI, flowClassifier);
+ deviceIdfromPp, nshSpi, flowClassifier);
// Build forwarding objective and send to OVS.
sendServiceFunctionForwarder(selector, treatment, deviceId, type);
@@ -266,13 +264,13 @@
* @param nshDstPort vxlan tunnel port for nsh header
* @param deviceIdfromFc device id if virtual ports are set in flow classifier.
* @param deviceIdfromPp device id if port pair is used to fetch device id.
- * @param nshSPI nsh spi
+ * @param nshSpi nsh spi
* @param flowClassifier flow-classifier
* @return traffic treatment
*/
public TrafficTreatment.Builder packTrafficTreatment(DeviceId deviceId, MacAddress srcMacAddress,
TpPort nshDstPort, DeviceId deviceIdfromFc, DeviceId deviceIdfromPp,
- NshServicePathId nshSPI, FlowClassifier flowClassifier) {
+ NshServicePathId nshSpi, FlowClassifier flowClassifier) {
TrafficTreatment.Builder treatmentBuilder = DefaultTrafficTreatment.builder();
Host host = hostService.getHost(HostId.hostId(srcMacAddress));
@@ -295,7 +293,7 @@
treatmentBuilder.setUdpDst(nshDstPort);
try {
- nspIdTreatment.setPropertyValue("nshSpi", nshSPI);
+ nspIdTreatment.setPropertyValue("nshSpi", nshSpi);
} catch (Exception e) {
log.error("Failed to get extension instruction to set Nsh Spi Id {}", deviceId);
}
diff --git a/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/manager/impl/SfcManager.java b/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/manager/impl/SfcManager.java
index c841266..02eda21 100644
--- a/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/manager/impl/SfcManager.java
+++ b/apps/vtn/sfcmgr/src/main/java/org/onosproject/sfc/manager/impl/SfcManager.java
@@ -15,20 +15,14 @@
*/
package org.onosproject.sfc.manager.impl;
-import static org.slf4j.LoggerFactory.getLogger;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
-
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ConcurrentHashMap;
-
-import org.onlab.util.KryoNamespace;
import org.onlab.util.ItemNotFoundException;
+import org.onlab.util.KryoNamespace;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.net.NshServicePathId;
@@ -38,22 +32,26 @@
import org.onosproject.sfc.installer.impl.FlowClassifierInstallerImpl;
import org.onosproject.sfc.manager.NshSpiIdGenerators;
import org.onosproject.sfc.manager.SfcService;
-import org.onosproject.vtnrsc.PortPair;
-import org.onosproject.vtnrsc.PortPairId;
-import org.onosproject.vtnrsc.PortPairGroup;
-import org.onosproject.vtnrsc.PortPairGroupId;
import org.onosproject.vtnrsc.FlowClassifier;
import org.onosproject.vtnrsc.FlowClassifierId;
import org.onosproject.vtnrsc.PortChain;
import org.onosproject.vtnrsc.PortChainId;
+import org.onosproject.vtnrsc.PortPair;
+import org.onosproject.vtnrsc.PortPairGroup;
+import org.onosproject.vtnrsc.PortPairGroupId;
+import org.onosproject.vtnrsc.PortPairId;
import org.onosproject.vtnrsc.TenantId;
import org.onosproject.vtnrsc.event.VtnRscEvent;
import org.onosproject.vtnrsc.event.VtnRscEventFeedback;
import org.onosproject.vtnrsc.event.VtnRscListener;
import org.onosproject.vtnrsc.service.VtnRscService;
-
import org.slf4j.Logger;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
/**
* Provides implementation of SFC Service.
*/
@@ -192,18 +190,18 @@
@Override
public void onPortChainCreated(PortChain portChain) {
- NshServicePathId nshSPI;
+ NshServicePathId nshSpi;
log.info("onPortChainCreated");
if (nshSpiPortChainMap.containsKey(portChain.portChainId())) {
- nshSPI = nshSpiPortChainMap.get(portChain.portChainId());
+ nshSpi = nshSpiPortChainMap.get(portChain.portChainId());
} else {
- nshSPI = NshServicePathId.of(NshSpiIdGenerators.create());
- nshSpiPortChainMap.put(portChain.portChainId(), nshSPI);
+ nshSpi = NshServicePathId.of(NshSpiIdGenerators.create());
+ nshSpiPortChainMap.put(portChain.portChainId(), nshSpi);
}
// install in OVS.
- flowClassifierInstallerService.installFlowClassifier(portChain, nshSPI);
- serviceFunctionForwarderService.installForwardingRule(portChain, nshSPI);
+ flowClassifierInstallerService.installFlowClassifier(portChain, nshSpi);
+ serviceFunctionForwarderService.installForwardingRule(portChain, nshSpi);
}
@Override
@@ -213,12 +211,12 @@
throw new ItemNotFoundException("Unable to find NSH SPI");
}
- NshServicePathId nshSPI = nshSpiPortChainMap.get(portChain.portChainId());
+ NshServicePathId nshSpi = nshSpiPortChainMap.get(portChain.portChainId());
// uninstall from OVS.
- flowClassifierInstallerService.unInstallFlowClassifier(portChain, nshSPI);
- serviceFunctionForwarderService.unInstallForwardingRule(portChain, nshSPI);
+ flowClassifierInstallerService.unInstallFlowClassifier(portChain, nshSpi);
+ serviceFunctionForwarderService.unInstallForwardingRule(portChain, nshSpi);
// remove SPI. No longer it will be used.
- nshSpiPortChainMap.remove(nshSPI);
+ nshSpiPortChainMap.remove(nshSpi);
}
}
diff --git a/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/util/VtnRscManagerTestImpl.java b/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/util/VtnRscManagerTestImpl.java
index 18f8053..4c761e9 100644
--- a/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/util/VtnRscManagerTestImpl.java
+++ b/apps/vtn/sfcmgr/src/test/java/org/onosproject/sfc/util/VtnRscManagerTestImpl.java
@@ -51,7 +51,7 @@
}
@Override
- public Iterator<Device> getSFFOfTenant(TenantId tenantId) {
+ public Iterator<Device> getSffOfTenant(TenantId tenantId) {
return null;
}
@@ -67,7 +67,7 @@
}
@Override
- public DeviceId getSFToSFFMaping(VirtualPortId portId) {
+ public DeviceId getSfToSffMaping(VirtualPortId portId) {
return DeviceId.deviceId("www.google.com");
}
diff --git a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/cli/VtnCommand.java b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/cli/VtnCommand.java
index 92900f2..8607a48 100644
--- a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/cli/VtnCommand.java
+++ b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/cli/VtnCommand.java
@@ -18,7 +18,7 @@
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
import org.onosproject.cli.AbstractShellCommand;
-import org.onosproject.vtn.manager.impl.VTNManager;
+import org.onosproject.vtn.manager.impl.VtnManager;
/**
* Supports for updating the external gateway virtualPort.
@@ -33,6 +33,6 @@
@Override
protected void execute() {
- VTNManager.setExPortName(exPortName);
+ VtnManager.setExPortName(exPortName);
}
}
diff --git a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/VTNService.java b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/VtnService.java
similarity index 98%
rename from apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/VTNService.java
rename to apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/VtnService.java
index d7ee360..387bb8a 100644
--- a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/VTNService.java
+++ b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/VtnService.java
@@ -22,7 +22,7 @@
/**
* VTN application that applies configuration and flows to the device.
*/
-public interface VTNService {
+public interface VtnService {
/**
* Creates a vxlan tunnel and creates the ovs when a ovs controller node is
diff --git a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VTNManager.java b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VtnManager.java
similarity index 99%
rename from apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VTNManager.java
rename to apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VtnManager.java
index 252dcf0..f360afc 100644
--- a/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VTNManager.java
+++ b/apps/vtn/vtnmgr/src/main/java/org/onosproject/vtn/manager/impl/VtnManager.java
@@ -82,7 +82,7 @@
import org.onosproject.store.service.Serializer;
import org.onosproject.store.service.StorageService;
import org.onosproject.store.service.Versioned;
-import org.onosproject.vtn.manager.VTNService;
+import org.onosproject.vtn.manager.VtnService;
import org.onosproject.vtn.table.ArpService;
import org.onosproject.vtn.table.ClassifierService;
import org.onosproject.vtn.table.DnatService;
@@ -131,7 +131,7 @@
*/
@Component(immediate = true)
@Service
-public class VTNManager implements VTNService {
+public class VtnManager implements VtnService {
private final Logger log = getLogger(getClass());
private static final String APP_ID = "org.onosproject.app.vtn";
diff --git a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/service/VtnRscService.java b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/service/VtnRscService.java
index 4c68d76..76e3582 100644
--- a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/service/VtnRscService.java
+++ b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/service/VtnRscService.java
@@ -15,8 +15,6 @@
*/
package org.onosproject.vtnrsc.service;
-import java.util.Iterator;
-
import org.onlab.packet.MacAddress;
import org.onosproject.event.ListenerService;
import org.onosproject.net.Device;
@@ -29,6 +27,8 @@
import org.onosproject.vtnrsc.event.VtnRscEvent;
import org.onosproject.vtnrsc.event.VtnRscListener;
+import java.util.Iterator;
+
/**
* Service for interacting with the inventory of Vtn resource.
*/
@@ -55,7 +55,7 @@
* @param tenantId tenant identifier
* @return iterable collection of Device
*/
- Iterator<Device> getSFFOfTenant(TenantId tenantId);
+ Iterator<Device> getSffOfTenant(TenantId tenantId);
/**
* Returns gateway mac address of the specific host.
@@ -79,7 +79,7 @@
* @param portId port identifier
* @return device identifier
*/
- DeviceId getSFToSFFMaping(VirtualPortId portId);
+ DeviceId getSfToSffMaping(VirtualPortId portId);
/**
* Adds specify Device identifier to Service Function Forward OvsMap
diff --git a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/service/impl/VtnRscManager.java b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/service/impl/VtnRscManager.java
index 417881c..fea298c 100644
--- a/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/service/impl/VtnRscManager.java
+++ b/apps/vtn/vtnrsc/src/main/java/org/onosproject/vtnrsc/service/impl/VtnRscManager.java
@@ -389,7 +389,7 @@
}
@Override
- public Iterator<Device> getSFFOfTenant(TenantId tenantId) {
+ public Iterator<Device> getSffOfTenant(TenantId tenantId) {
checkNotNull(tenantId, TENANTID_NOT_NULL);
Set<DeviceId> deviceIdSet = sffOvsMap.get(tenantId);
Set<Device> deviceSet = new HashSet<>();
@@ -430,7 +430,7 @@
}
@Override
- public DeviceId getSFToSFFMaping(VirtualPortId portId) {
+ public DeviceId getSfToSffMaping(VirtualPortId portId) {
checkNotNull(portId, "portId cannot be null");
VirtualPort vmPort = virtualPortService.getPort(portId);
Set<Host> hostSet = hostService.getHostsByMac(vmPort.macAddress());