Code Review
/
groupbasedpolicy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
apply checkstyle check during build for neutron-ovsdb
[groupbasedpolicy.git]
/
neutron-ovsdb
/
src
/
main
/
java
/
org
/
opendaylight
/
groupbasedpolicy
/
neutron
/
ovsdb
/
VxlanGpeTunnelType.java
diff --git
a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanGpeTunnelType.java
b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanGpeTunnelType.java
index 6f7155814b13cbf4ceefff9e6d2e7da859aee77f..568faa86bc46240067c4454886e87924cc36ac78 100644
(file)
--- a/
neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanGpeTunnelType.java
+++ b/
neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanGpeTunnelType.java
@@
-13,7
+13,7
@@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.List;
import java.util.Map;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev1
00924
.PortNumber;
+import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev1
30715
.PortNumber;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.overlay.rev150105.TunnelTypeBase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.overlay.rev150105.TunnelTypeVxlanGpe;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeVxlan;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.overlay.rev150105.TunnelTypeBase;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.overlay.rev150105.TunnelTypeVxlanGpe;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeVxlan;
@@
-42,14
+42,15
@@
public class VxlanGpeTunnelType extends AbstractTunnelType {
private final PortNumber udpTunnelPort;
private final List<Options> optionsList;
private final PortNumber udpTunnelPort;
private final List<Options> optionsList;
- private static final Class<? extends TunnelTypeBase>
tunnelType
= TunnelTypeVxlanGpe.class;
+ private static final Class<? extends TunnelTypeBase>
TUNNEL_TYPE_VXLAN_GPE
= TunnelTypeVxlanGpe.class;
public VxlanGpeTunnelType() {
public VxlanGpeTunnelType() {
- optionsList = createOptionsList(
optsMap
);
+ optionsList = createOptionsList(
OPTS_MAP
);
udpTunnelPort = new PortNumber(VXLAN_GPE_PORT_NUMBER);
}
udpTunnelPort = new PortNumber(VXLAN_GPE_PORT_NUMBER);
}
- private static final Map<String, String> optsMap;
+ private static final Map<String, String> OPTS_MAP;
+
static {
Map<String, String> opts = new HashMap<String, String>();
opts.put(VNID_KEY, VNID_VALUE);
static {
Map<String, String> opts = new HashMap<String, String>();
opts.put(VNID_KEY, VNID_VALUE);
@@
-61,7
+62,7
@@
public class VxlanGpeTunnelType extends AbstractTunnelType {
opts.put(NSH_NSHC3_KEY, NSH_NSHC3_VALUE);
opts.put(NSH_NSHC4_KEY, NSH_NSHC4_VALUE);
opts.put(DESTPORT_KEY, DESTPORT_VALUE);
opts.put(NSH_NSHC3_KEY, NSH_NSHC3_VALUE);
opts.put(NSH_NSHC4_KEY, NSH_NSHC4_VALUE);
opts.put(DESTPORT_KEY, DESTPORT_VALUE);
-
optsMap
= Collections.unmodifiableMap(opts);
+
OPTS_MAP
= Collections.unmodifiableMap(opts);
}
@Override
}
@Override
@@
-71,7
+72,7
@@
public class VxlanGpeTunnelType extends AbstractTunnelType {
@Override
public Class<? extends TunnelTypeBase> getTunnelType() {
@Override
public Class<? extends TunnelTypeBase> getTunnelType() {
- return
tunnelType
;
+ return
TUNNEL_TYPE_VXLAN_GPE
;
}
@Override
}
@Override
@@
-96,7
+97,7
@@
public class VxlanGpeTunnelType extends AbstractTunnelType {
*/
@Override
public boolean isValidTunnelPort(OvsdbTerminationPointAugmentation tpAugmentation) {
*/
@Override
public boolean isValidTunnelPort(OvsdbTerminationPointAugmentation tpAugmentation) {
- if (hasTunnelOptions(tpAugmentation,
optsMap
)
+ if (hasTunnelOptions(tpAugmentation,
OPTS_MAP
)
&& InterfaceTypeVxlan.class.equals(tpAugmentation.getInterfaceType())
&& getDestPort(tpAugmentation).equals(VXLAN_GPE_PORT_NUMBER.toString())) {
return true;
&& InterfaceTypeVxlan.class.equals(tpAugmentation.getInterfaceType())
&& getDestPort(tpAugmentation).equals(VXLAN_GPE_PORT_NUMBER.toString())) {
return true;