From: Michal Cmarada Date: Mon, 13 Nov 2017 13:53:24 +0000 (+0100) Subject: apply checkstyle check during build for neutron-ovsdb X-Git-Tag: release/oxygen~7 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=groupbasedpolicy.git;a=commitdiff_plain;h=02dd576a2ff7d7a8c304bd74a239c150be1ddd2b apply checkstyle check during build for neutron-ovsdb enabling checkstyle checks on build which should prevent checkstyle violations in future. Change-Id: I090928f68c18615672681f67ba368ac73271447c Signed-off-by: Michal Cmarada --- diff --git a/neutron-ovsdb/pom.xml b/neutron-ovsdb/pom.xml index 10895f2ae..2462a2d1d 100644 --- a/neutron-ovsdb/pom.xml +++ b/neutron-ovsdb/pom.xml @@ -105,6 +105,22 @@ + + maven-checkstyle-plugin + + org/opendaylight/yang/gen/**,**/yang/** + true + checkstyle.violationSeverity=error + + + + + check + + process-sources + + + diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/AbstractTunnelType.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/AbstractTunnelType.java index 8260c159c..8aaf7fade 100644 --- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/AbstractTunnelType.java +++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/AbstractTunnelType.java @@ -40,16 +40,17 @@ public abstract class AbstractTunnelType { return Collections.unmodifiableList(options); } - protected boolean hasTunnelOptions(OvsdbTerminationPointAugmentation tpAugmentation, Map optionsMap) { + protected boolean hasTunnelOptions(OvsdbTerminationPointAugmentation tpAugmentation, + Map optionsMap) { Map foundOpts = new HashMap(); List options = tpAugmentation.getOptions(); if (options != null) { for (Options opt : options) { // skip invalid options - if (opt.getOption() == null || opt.getValue() == null) + if (opt.getOption() == null || opt.getValue() == null) { continue; - + } if (optionsMap.containsKey(opt.getOption()) && optionsMap.get(opt.getOption()).equals(opt.getValue())) { foundOpts.put(opt.getOption(), opt.getValue()); } @@ -75,14 +76,14 @@ public abstract class AbstractTunnelType { } /** - * Return the list of {@link Options} valid for this tunnel type + * Return the list of {@link Options} valid for this tunnel type. * * @return list of {@link Options} for the tunnel, null if not supported */ public abstract List getOptions(); /** - * Check if a TerminationPoint is a tunnel port that meets + * Check if a TerminationPoint is a tunnel port that meets. * requirements * * @param tpAugmentation the {@link OvsdbTerminationPointAugmentation} @@ -106,7 +107,7 @@ public abstract class AbstractTunnelType { public abstract PortNumber getPortNumber(); /** - * Get the prefix used to create the tunnel name for any tunnels of this type + * Get the prefix used to create the tunnel name for any tunnels of this type. * * @return The tunnel prefix */ diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/NeutronOvsdb.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/NeutronOvsdb.java index 175b5c769..0f115816d 100644 --- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/NeutronOvsdb.java +++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/NeutronOvsdb.java @@ -31,6 +31,8 @@ public class NeutronOvsdb implements AutoCloseable { } /** + * Used to properly close running instance. + * * @see java.lang.AutoCloseable#close() */ @Override diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/OvsdbNodeListener.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/OvsdbNodeListener.java index 18018fe1c..09f8c2a23 100644 --- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/OvsdbNodeListener.java +++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/OvsdbNodeListener.java @@ -7,15 +7,6 @@ */ package org.opendaylight.groupbasedpolicy.neutron.ovsdb; -import javax.annotation.Nonnull; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.Set; - - import com.google.common.base.Function; import com.google.common.base.Strings; import com.google.common.collect.ImmutableList; @@ -24,6 +15,15 @@ import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.MoreExecutors; +import java.util.HashMap; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; + +import javax.annotation.Nonnull; + import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier; @@ -92,7 +92,8 @@ public class OvsdbNodeListener extends DataTreeChangeHandler { OvsdbNodeAugmentation ovsdbNode = node.getAugmentation(OvsdbNodeAugmentation.class); if (ovsdbNode != null) { LOG.trace("OVSDB node created: {} \n {}", rootIdentifier, node); - DataObjectModification ovsOtherConfigModification = getProviderMappingsModification(rootNode); + DataObjectModification + ovsOtherConfigModification = getProviderMappingsModification(rootNode); boolean integrationBridgePresent = false; if (isProviderPortNameChanged(ovsOtherConfigModification) && ovsdbNode.getManagedNodeEntry() != null) { String newProviderPortName = getProviderPortName(ovsOtherConfigModification.getDataAfter()); @@ -103,7 +104,8 @@ public class OvsdbNodeListener extends DataTreeChangeHandler { LOG.trace("Added Provider port name {} by OVSDB bridge ref {}", newProviderPortName, mngdNodeEntry.getBridgeRef()); NodeKey managedNodeKey = bridgeRef.getValue().firstKeyOf(Node.class); - if (intBrSettings != null && managedNodeKey.getNodeId().getValue().equals(intBrSettings.getName())) { + if (intBrSettings != null && managedNodeKey.getNodeId().getValue() + .equals(intBrSettings.getName())) { integrationBridgePresent = true; } } @@ -113,9 +115,9 @@ public class OvsdbNodeListener extends DataTreeChangeHandler { managerToControllerEntries(ovsdbNode.getManagerEntry()), intBrSettings.getName()); InstanceIdentifier bridgeNodeIid = NeutronOvsdbIidFactory.nodeIid( rootIdentifier.firstKeyOf(Topology.class).getTopologyId(), bridge.getNodeId()); - WriteTransaction wTx = dataProvider.newWriteOnlyTransaction(); - wTx.merge(LogicalDatastoreType.CONFIGURATION, bridgeNodeIid, bridge, true); - Futures.addCallback(wTx.submit(), new FutureCallback() { + WriteTransaction writeTx = dataProvider.newWriteOnlyTransaction(); + writeTx.merge(LogicalDatastoreType.CONFIGURATION, bridgeNodeIid, bridge, true); + Futures.addCallback(writeTx.submit(), new FutureCallback() { @Override public void onSuccess(Void result) { @@ -123,9 +125,9 @@ public class OvsdbNodeListener extends DataTreeChangeHandler { } @Override - public void onFailure(Throwable t) { + public void onFailure(Throwable throwable) { LOG.error("Failed to write bridge {}. Message: {}" + bridge.getNodeId().getValue(), - t.getMessage()); + throwable.getMessage()); } }, MoreExecutors.directExecutor()); } @@ -331,7 +333,7 @@ public class OvsdbNodeListener extends DataTreeChangeHandler { } /** - * Extracts IP address from URI + * Extracts IP address from URI. * * @param uri in format protocol:ip:port * @return IPv4 or IPv6 address as {@link String}. diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/PortByEndpointListener.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/PortByEndpointListener.java index 764567e8d..34269f01e 100644 --- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/PortByEndpointListener.java +++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/PortByEndpointListener.java @@ -7,6 +7,8 @@ */ package org.opendaylight.groupbasedpolicy.neutron.ovsdb; +import com.google.common.base.Optional; + import java.util.List; import org.opendaylight.controller.md.sal.binding.api.DataBroker; @@ -36,8 +38,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; - /** * Listens on PortByEndpoint created events. port-name is augmented to endpoint and endpoint-l3 (IFF * they exist in DS). diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/ProviderPhysicalNetworkListener.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/ProviderPhysicalNetworkListener.java index 4407b402f..7fbd84b72 100644 --- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/ProviderPhysicalNetworkListener.java +++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/ProviderPhysicalNetworkListener.java @@ -7,6 +7,8 @@ */ package org.opendaylight.groupbasedpolicy.neutron.ovsdb; +import com.google.common.base.Strings; + import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.DataObjectModification; import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier; @@ -28,8 +30,6 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Strings; - public class ProviderPhysicalNetworkListener extends DataTreeChangeHandler { private static final Logger LOG = LoggerFactory.getLogger(ProviderPhysicalNetworkListener.class); @@ -89,10 +89,10 @@ public class ProviderPhysicalNetworkListener extends DataTreeChangeHandler, NodeId> nodeIdByTerminPoint = + private static final Map, NodeId> NODE_ID_BY_TERMIN_POINT = new HashMap<>(); @Override @@ -112,14 +113,14 @@ public class TerminationPointDataChangeListener implements DataTreeChangeListene OvsdbTerminationPointAugmentation updatedOvsdbTp = rootNode.getDataAfter(); OvsdbBridgeAugmentation ovsdbBridge = getOvsdbBridgeFromTerminationPoint(ovsdbTpIid, dataBroker); if (origOvsdbTp == null) { - nodeIdByTerminPoint.put(ovsdbTpIid, + NODE_ID_BY_TERMIN_POINT.put(ovsdbTpIid, new NodeId(getInventoryNodeIdString(ovsdbBridge, ovsdbTpIid, dataBroker))); } processOvsdbBridge(ovsdbBridge, updatedOvsdbTp, ovsdbTpIid); break; case DELETE: - processRemovedTp(nodeIdByTerminPoint.get(ovsdbTpIid), origOvsdbTp, ovsdbTpIid); + processRemovedTp(NODE_ID_BY_TERMIN_POINT.get(ovsdbTpIid), origOvsdbTp, ovsdbTpIid); break; default: break; @@ -173,9 +174,8 @@ public class TerminationPointDataChangeListener implements DataTreeChangeListene ReadOnlyTransaction transaction = dataBroker.newReadOnlyTransaction(); ep = lookupEndpoint(epKey, transaction); if (ep == null) { - LOG.warn( - "TerminationPoint {} with external ID {} is in Neutron Map, but corresponding Endpoint {} isn't in Endpoint Repository", - ovsdbTp, externalId, epKey); + LOG.warn("TerminationPoint {} with external ID {} is in Neutron Map, " + + "but corresponding Endpoint {} isn't in Endpoint Repository", ovsdbTp, externalId, epKey); return; } /* @@ -215,8 +215,8 @@ public class TerminationPointDataChangeListener implements DataTreeChangeListene /** * If removed termination point was a tunnel port, - * removes attached tunnels (namely Vxlan-type) from OVSDB bridge; - * else removes location info from TP + * removes attached tunnels (namely Vxlan-type) from OVSDB bridge, + * else removes location info from TP. * * @param nodeId {@link NodeId} * @param ovsdbTp {@link OvsdbTerminationPointAugmentation} @@ -232,7 +232,7 @@ public class TerminationPointDataChangeListener implements DataTreeChangeListene } /** - * Delete location on EP for given TP + * Delete location on EP for given TP. * * @param ovsdbTp {@link OvsdbTerminationPointAugmentation} */ @@ -248,9 +248,8 @@ public class TerminationPointDataChangeListener implements DataTreeChangeListene Endpoint ep = lookupEndpoint(epKey, readOnlyTransaction); readOnlyTransaction.close(); if (ep == null) { - LOG.warn( - "TerminationPoint {} with external ID {} is in Neutron Map, but corresponding Endpoint {} isn't in Endpoint Repository.", - ovsdbTp, externalId, epKey); + LOG.warn("TerminationPoint {} with external ID {} is in Neutron Map," + + " but corresponding Endpoint {} isn't in Endpoint Repository.", ovsdbTp, externalId, epKey); return; } updateEndpointRemoveLocation(ep, dataBroker.newReadWriteTransaction()); 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 740ba60ec..568faa86b 100644 --- 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 @@ -42,14 +42,15 @@ public class VxlanGpeTunnelType extends AbstractTunnelType { private final PortNumber udpTunnelPort; private final List optionsList; - private static final Class tunnelType = TunnelTypeVxlanGpe.class; + private static final Class TUNNEL_TYPE_VXLAN_GPE = TunnelTypeVxlanGpe.class; public VxlanGpeTunnelType() { - optionsList = createOptionsList(optsMap); + optionsList = createOptionsList(OPTS_MAP); udpTunnelPort = new PortNumber(VXLAN_GPE_PORT_NUMBER); } - private static final Map optsMap; + private static final Map OPTS_MAP; + static { Map opts = new HashMap(); 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); - optsMap = Collections.unmodifiableMap(opts); + OPTS_MAP = Collections.unmodifiableMap(opts); } @Override @@ -71,7 +72,7 @@ public class VxlanGpeTunnelType extends AbstractTunnelType { @Override public Class getTunnelType() { - return tunnelType; + return TUNNEL_TYPE_VXLAN_GPE; } @Override @@ -96,7 +97,7 @@ public class VxlanGpeTunnelType extends AbstractTunnelType { */ @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; diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanTunnelType.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanTunnelType.java index 5ab7e1b2e..786db5ef6 100644 --- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanTunnelType.java +++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/VxlanTunnelType.java @@ -1,6 +1,6 @@ /* * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved. - * + * * This program and the accompanying materials are made available under the * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html @@ -22,8 +22,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.re public class VxlanTunnelType extends AbstractTunnelType { - private static final Map optsMap; - private static final Class tunnelType = TunnelTypeVxlan.class; + private static final Map OPTS_MAP; + private static final Class TUNNEL_TYPE_VXLAN = TunnelTypeVxlan.class; private static final Integer VXLAN_PORT_NUMBER = 4789; private static final String VXLAN_TUNNEL_PREFIX = "vxlan-"; private final PortNumber udpTunnelPort; @@ -33,11 +33,11 @@ public class VxlanTunnelType extends AbstractTunnelType { Map opts = new HashMap(); opts.put(VNID_KEY, VNID_VALUE); opts.put(REMOTE_IP_KEY, REMOTE_IP_VALUE); - optsMap = Collections.unmodifiableMap(opts); + OPTS_MAP = Collections.unmodifiableMap(opts); } public VxlanTunnelType() { - optionsList = createOptionsList(optsMap); + optionsList = createOptionsList(OPTS_MAP); udpTunnelPort = new PortNumber(VXLAN_PORT_NUMBER); } @@ -48,7 +48,7 @@ public class VxlanTunnelType extends AbstractTunnelType { @Override public Class getTunnelType() { - return tunnelType; + return TUNNEL_TYPE_VXLAN; } @Override @@ -72,7 +72,7 @@ public class VxlanTunnelType extends AbstractTunnelType { */ @Override public boolean isValidTunnelPort(OvsdbTerminationPointAugmentation tpAugmentation) { - if (hasTunnelOptions(tpAugmentation, optsMap) + if (hasTunnelOptions(tpAugmentation, OPTS_MAP) && InterfaceTypeVxlan.class.equals(tpAugmentation.getInterfaceType()) && (getDestPort(tpAugmentation) == null || getDestPort(tpAugmentation).equals( VXLAN_PORT_NUMBER.toString()))) { diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/EndpointHelper.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/EndpointHelper.java index f4a586527..979c11717 100755 --- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/EndpointHelper.java +++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/EndpointHelper.java @@ -10,6 +10,8 @@ package org.opendaylight.groupbasedpolicy.neutron.ovsdb.util; import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.readFromDs; import static org.opendaylight.groupbasedpolicy.util.IidFactory.endpointIid; +import com.google.common.base.Optional; + import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction; import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; @@ -23,8 +25,6 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay. import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId; import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId; -import com.google.common.base.Optional; - public class EndpointHelper { @@ -37,7 +37,9 @@ public class EndpointHelper { */ public static Endpoint lookupEndpoint(EndpointKey epKey, ReadOnlyTransaction transaction) { - Optional optionalEp = readFromDs(LogicalDatastoreType.OPERATIONAL, endpointIid(epKey.getL2Context(),epKey.getMacAddress()), transaction ); + Optional optionalEp = + readFromDs(LogicalDatastoreType.OPERATIONAL, endpointIid(epKey.getL2Context(), epKey.getMacAddress()), + transaction); if (optionalEp.isPresent()) { return optionalEp.get(); } @@ -46,7 +48,6 @@ public class EndpointHelper { /** * Updates an {@link Endpoint} location based on OVSDB Termination point notification. - * * Note this updates the datastore directly. It does not use the Endpoint RPC, as this has * unfortunate side-effects on EndpointL3 augmentations. * @@ -70,7 +71,8 @@ public class EndpointHelper { EndpointBuilder epBuilder = new EndpointBuilder(endpoint); Endpoint newEp = epBuilder.build(); epBuilder.removeAugmentation(OfOverlayContext.class); - rwTx.put(LogicalDatastoreType.OPERATIONAL, IidFactory.endpointIid(newEp.getL2Context(), newEp.getMacAddress()), newEp); + rwTx.put(LogicalDatastoreType.OPERATIONAL, IidFactory.endpointIid(newEp.getL2Context(), newEp.getMacAddress()), + newEp); DataStoreHelper.submitToDs(rwTx); } diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelper.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelper.java index 5621ca00c..807ad1c8e 100755 --- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelper.java +++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelper.java @@ -12,6 +12,8 @@ import static org.opendaylight.groupbasedpolicy.neutron.ovsdb.util.OvsdbHelper.g import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.readFromDs; import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.submitToDs; +import com.google.common.base.Optional; + import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -44,15 +46,13 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; - public class InventoryHelper { private static final Logger LOG = LoggerFactory.getLogger(InventoryHelper.class); private static final String HEX = "0x"; /** - * Convert an OpenFlow Datapath ID to a Long + * Convert an OpenFlow Datapath ID to a Long. * * @param dpid The OpenFlow Datapath ID * @return The Long representation of the DPID @@ -140,7 +140,7 @@ public class InventoryHelper { /** * Read the {@link OfOverlayNodeConfig} augmentation from the * Inventory Node, and verify that the tunnel types we need - * are present + * are present. * * @param nodeIdString The inventory node id string * @param requiredTunnelTypes the list of tunnel types @@ -174,7 +174,8 @@ public class InventoryHelper { return true; } - public static InstanceIdentifier addOfOverlayExternalPort(NodeId nodeId, NodeConnectorId ncId, DataBroker dataBroker) { + public static InstanceIdentifier addOfOverlayExternalPort(NodeId nodeId, NodeConnectorId ncId, + DataBroker dataBroker) { InstanceIdentifier nodeExternalInterfacesIid = InstanceIdentifier.builder(Nodes.class) .child(Node.class, new NodeKey(nodeId)) .augmentation(OfOverlayNodeConfig.class) @@ -234,7 +235,7 @@ public class InventoryHelper { Set existingTunnels = new HashSet(); if (ofConfig != null) { ofOverlayNodeConfigBuilder = new OfOverlayNodeConfigBuilder(ofConfig); - if(ofConfig.getTunnel() != null) { + if (ofConfig.getTunnel() != null) { existingTunnels.addAll(ofConfig.getTunnel()); } } else { @@ -280,8 +281,8 @@ public class InventoryHelper { } OfOverlayNodeConfig newConfig = ofOverlayNodeConfigBuilder.build(); if (addOfOverlayConfig(newConfig, new NodeId(nodeIdString), dataBroker)) { - LOG.trace("updateOfOverlayConfig - Added Tunnel: {} to Node: {} at NodeConnector: {}",tunnelBuilder.build(), nodeIdString, nodeConnectorIdString); - return; + LOG.trace("updateOfOverlayConfig - Added Tunnel: {} to Node: {} at NodeConnector: {}", + tunnelBuilder.build(), nodeIdString, nodeConnectorIdString); } else { LOG.error("updateOfOverlayConfig - could not write OfOverlayNodeConfig: {} to datastore.", newConfig); } @@ -311,42 +312,42 @@ public class InventoryHelper { // runs only if some tunnels were really removed if (existingTunnels.removeAll(tunnelsToRemove)) { - ReadWriteTransaction wTx = dataBroker.newReadWriteTransaction(); + ReadWriteTransaction writeTx = dataBroker.newReadWriteTransaction(); for (Tunnel tunnel : tunnelsToRemove) { InstanceIdentifier tunnelIid = InstanceIdentifier.builder(Nodes.class) .child(Node.class, new NodeKey(new NodeId(nodeIdString))) .augmentation(OfOverlayNodeConfig.class) .child(Tunnel.class, tunnel.getKey()) .build(); - wTx.delete(LogicalDatastoreType.CONFIGURATION, tunnelIid); + writeTx.delete(LogicalDatastoreType.CONFIGURATION, tunnelIid); LOG.trace("Removing tunnel: {} from node {}",tunnel, nodeIdString); } - submitToDs(wTx); + submitToDs(writeTx); } } private static boolean addOfOverlayConfig(OfOverlayNodeConfig newConfig, NodeId nodeId, DataBroker dataBroker) { - ReadWriteTransaction wTx = dataBroker.newReadWriteTransaction(); + ReadWriteTransaction writeTx = dataBroker.newReadWriteTransaction(); InstanceIdentifier ofOverlayNodeIid = InstanceIdentifier.builder(Nodes.class) .child(Node.class, new NodeKey(nodeId)) .augmentation(OfOverlayNodeConfig.class) .build(); - wTx.put(LogicalDatastoreType.CONFIGURATION, ofOverlayNodeIid, newConfig, true); + writeTx.put(LogicalDatastoreType.CONFIGURATION, ofOverlayNodeIid, newConfig, true); LOG.trace("Adding tunnel: {} to node {}", newConfig, nodeId.getValue()); - return submitToDs(wTx); + return submitToDs(writeTx); } private static boolean addTunnelsOfOverlayConfig(List tunnels, NodeId nodeId, DataBroker dataBroker) { - ReadWriteTransaction wTx = dataBroker.newReadWriteTransaction(); + ReadWriteTransaction writeTx = dataBroker.newReadWriteTransaction(); for (Tunnel tunnel : tunnels) { InstanceIdentifier tunnelIid = InstanceIdentifier.builder(Nodes.class) .child(Node.class, new NodeKey(nodeId)) .augmentation(OfOverlayNodeConfig.class) .child(Tunnel.class, tunnel.getKey()) .build(); - wTx.put(LogicalDatastoreType.CONFIGURATION, tunnelIid, tunnel, true); + writeTx.put(LogicalDatastoreType.CONFIGURATION, tunnelIid, tunnel, true); LOG.trace("Adding tunnel: {} to node {}",tunnel, nodeId.getValue()); } - return submitToDs(wTx); + return submitToDs(writeTx); } } diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronHelper.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronHelper.java index 92b3bb53a..6c7de96f0 100644 --- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronHelper.java +++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronHelper.java @@ -10,6 +10,8 @@ package org.opendaylight.groupbasedpolicy.neutron.ovsdb.util; import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.readFromDs; +import com.google.common.base.Optional; + import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; @@ -22,13 +24,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gb import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.gbp.mapper.rev150513.mappings.gbp.by.neutron.mappings.endpoints.by.ports.EndpointByPortKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import com.google.common.base.Optional; - public class NeutronHelper { /** * This looks up the Endpoint L2 key from an - * operational data store kept in neutron-mapper + * operational data store kept in neutron-mapper. * * @param externalId The neutron port UUID * @param dataBroker {@link DataBroker} to use for the transaction diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronOvsdbIidFactory.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronOvsdbIidFactory.java index 4133b61c3..ce0d3b007 100644 --- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronOvsdbIidFactory.java +++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronOvsdbIidFactory.java @@ -64,6 +64,7 @@ public class NeutronOvsdbIidFactory { return topologyIid(ovsdbTopologyId).child(Node.class, new NodeKey(nodeId)); } + @SuppressWarnings("checkstyle:LineLength") // Longer lines in this method are caused by long package names. public static InstanceIdentifier nodeIid( org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId nodeId) { return InstanceIdentifier.builder(Nodes.class) diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/OvsdbHelper.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/OvsdbHelper.java index 1224f763b..d4354bc94 100755 --- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/OvsdbHelper.java +++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/OvsdbHelper.java @@ -11,6 +11,8 @@ package org.opendaylight.groupbasedpolicy.neutron.ovsdb.util; import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.readFromDs; import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.submitToDs; +import com.google.common.base.Optional; + import java.util.ArrayList; import java.util.List; @@ -42,15 +44,13 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import com.google.common.base.Optional; - public class OvsdbHelper { private static final Logger LOG = LoggerFactory.getLogger(OvsdbHelper.class); private static final String OF_PORT = "6653"; /** * Look up the {@link OvsdbBridgeAugmentation} from the data store - * given a child {@link InstanceIdentifier} of {@link OvsdbTerminationPointAugmentation} + * given a child {@link InstanceIdentifier} of {@link OvsdbTerminationPointAugmentation}. * * @param tpIid The InstanceIdentifier for a child TerminationPoint augmentation * @param dataBroker the {@link DataBroker} @@ -60,7 +60,8 @@ public class OvsdbHelper { InstanceIdentifier tpIid, DataBroker dataBroker) { InstanceIdentifier nodeIid = tpIid.firstIdentifierOf(Node.class); if (nodeIid != null) { - InstanceIdentifier ovsdbBridgeIid = nodeIid.augmentation(OvsdbBridgeAugmentation.class); + InstanceIdentifier + ovsdbBridgeIid = nodeIid.augmentation(OvsdbBridgeAugmentation.class); if (ovsdbBridgeIid != null) { ReadTransaction transaction = dataBroker.newReadOnlyTransaction(); Optional ovsdbBridge = @@ -76,11 +77,10 @@ public class OvsdbHelper { public static Node getNodeFromBridgeRef(OvsdbBridgeRef bridgeRef, DataBroker dataBroker) { InstanceIdentifier nodeIid = bridgeRef.getValue().firstIdentifierOf(Node.class); ReadTransaction transaction = dataBroker.newReadOnlyTransaction(); - Optional node = - readFromDs(LogicalDatastoreType.OPERATIONAL, nodeIid, transaction ); + Optional node = readFromDs(LogicalDatastoreType.OPERATIONAL, nodeIid, transaction); if (node.isPresent()) { if (node.get() instanceof Node) { - return (Node)node.get(); + return (Node) node.get(); } } return null; @@ -89,8 +89,8 @@ public class OvsdbHelper { public static OvsdbTerminationPointAugmentation getOvsdbTerminationPoint( InstanceIdentifier tpIid, DataBroker dataBroker) { ReadTransaction transaction = dataBroker.newReadOnlyTransaction(); - Optional ovsdbTp = - readFromDs(LogicalDatastoreType.OPERATIONAL, tpIid, transaction ); + Optional + ovsdbTp = readFromDs(LogicalDatastoreType.OPERATIONAL, tpIid, transaction); if (ovsdbTp.isPresent()) { return ovsdbTp.get(); } @@ -137,8 +137,8 @@ public class OvsdbHelper { return tunnelType.getTunnelPrefix() + bridge.getBridgeName().getValue(); } - public static OvsdbTerminationPointAugmentation buildOvsdbTerminationPointAugmentation(OvsdbBridgeAugmentation bridge, - List options, AbstractTunnelType tunnelType) { + public static OvsdbTerminationPointAugmentation buildOvsdbTerminationPointAugmentation( + OvsdbBridgeAugmentation bridge, List options, AbstractTunnelType tunnelType) { OvsdbTerminationPointAugmentationBuilder ovsdbTpBuilder = new OvsdbTerminationPointAugmentationBuilder(); ovsdbTpBuilder.setName(generateTpName(bridge, tunnelType)); ovsdbTpBuilder.setOptions(options); @@ -182,7 +182,7 @@ public class OvsdbHelper { } /** - * Get the manager node for this bridge node + * Get the manager node for this bridge node. * * @param bridge the bridge node * @param dataBroker the {@link DataBroker} @@ -191,19 +191,19 @@ public class OvsdbHelper { */ public static OvsdbNodeAugmentation getManagerNode(OvsdbBridgeAugmentation bridge, DataBroker dataBroker) { OvsdbNodeRef bareIId = bridge.getManagedBy(); - if(bareIId != null) { - if(bareIId.getValue().getTargetType().equals(Node.class)) { + if (bareIId != null) { + if (bareIId.getValue().getTargetType().equals(Node.class)) { ReadWriteTransaction transaction = dataBroker.newReadWriteTransaction(); InstanceIdentifier iid = (InstanceIdentifier) bareIId.getValue(); Optional nodeOptional = readFromDs(LogicalDatastoreType.OPERATIONAL, iid, transaction); - if(nodeOptional.isPresent() - && nodeOptional.get().getAugmentation(OvsdbNodeAugmentation.class) != null) { + if (nodeOptional.isPresent() + && nodeOptional.get().getAugmentation(OvsdbNodeAugmentation.class) != null) { return nodeOptional.get().getAugmentation(OvsdbNodeAugmentation.class); } else { - LOG.warn("Could not find ovsdb-node for connection for {}",bridge); + LOG.warn("Could not find ovsdb-node for connection for {}", bridge); } } else { - LOG.warn("Bridge 'managedBy' non-ovsdb-node. bridge {} getManagedBy() {}",bridge,bareIId.getValue()); + LOG.warn("Bridge 'managedBy' non-ovsdb-node. bridge {} getManagedBy() {}", bridge, bareIId.getValue()); } } else { LOG.debug("Bridge 'managedBy' is null. bridge {}",bridge); @@ -213,8 +213,7 @@ public class OvsdbHelper { public static Node getTopologyNode(InstanceIdentifier nodeIid, DataBroker dataBroker) { ReadTransaction transaction = dataBroker.newReadOnlyTransaction(); - Optional nodeOptional = - readFromDs(LogicalDatastoreType.OPERATIONAL, nodeIid, transaction ); + Optional nodeOptional = readFromDs(LogicalDatastoreType.OPERATIONAL, nodeIid, transaction); if (nodeOptional.isPresent()) { return nodeOptional.get(); } @@ -232,7 +231,6 @@ public class OvsdbHelper { */ public static void createTunnelPort(InstanceIdentifier nodeIid, Node node, AbstractTunnelType tunnelType, DataBroker dataBroker) { - ReadWriteTransaction transaction = dataBroker.newReadWriteTransaction(); OvsdbBridgeAugmentation bridge = node.getAugmentation(OvsdbBridgeAugmentation.class); if (bridge == null) { LOG.warn("No OvsdbBridgeAugmentationfor Node {}", node); @@ -240,20 +238,19 @@ public class OvsdbHelper { } OvsdbNodeAugmentation managerNode = getManagerNode(bridge, dataBroker); - if(managerNode == null) { + if (managerNode == null) { LOG.warn("Couldn't create tunnel port for Node {}, no manager", node); return; } List options = tunnelType.getOptions(); - OvsdbTerminationPointAugmentation ovsdbTp = - buildOvsdbTerminationPointAugmentation(bridge,options, tunnelType); + OvsdbTerminationPointAugmentation ovsdbTp = buildOvsdbTerminationPointAugmentation(bridge, options, tunnelType); List tps = buildTerminationPoints(bridge,ovsdbTp, tunnelType); - OvsdbBridgeAugmentation ovsdbBridgeAugmentation = - buildOvsdbBridgeAugmentation(bridge,managerNode); + OvsdbBridgeAugmentation ovsdbBridgeAugmentation = buildOvsdbBridgeAugmentation(bridge,managerNode); Node configNode = getNode(node, tps,ovsdbBridgeAugmentation); LOG.info("About to write nodeId {} node {}",nodeIid,configNode); - transaction.merge(LogicalDatastoreType.CONFIGURATION, nodeIid, configNode); - submitToDs(transaction); + ReadWriteTransaction rwTx = dataBroker.newReadWriteTransaction(); + rwTx.merge(LogicalDatastoreType.CONFIGURATION, nodeIid, configNode); + submitToDs(rwTx); } diff --git a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/OvsdbNodeListenerTest.java b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/OvsdbNodeListenerTest.java index 4c7c27aa6..a262ee123 100644 --- a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/OvsdbNodeListenerTest.java +++ b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/OvsdbNodeListenerTest.java @@ -15,12 +15,13 @@ import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import static org.opendaylight.groupbasedpolicy.neutron.ovsdb.OvsdbNodeListener.BRIDGE_SEPARATOR; -import java.util.Collection; -import java.util.HashSet; - import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.util.concurrent.CheckedFuture; + +import java.util.Collection; +import java.util.HashSet; + import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.md.sal.binding.api.DataBroker; @@ -66,9 +67,9 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class OvsdbNodeListenerTest { private static final String OVSDB_BRIDGE_NAME = "ovsdbBridgeName"; - private static final String NODE_ID = "nodeId"; - private static final NodeId nodeId = new NodeId(NODE_ID); - private static final TopologyId topologyId = new TopologyId("topologyId"); + private static final String NODE_ID_STIRNG = "nodeId"; + private static final NodeId NODE_ID = new NodeId(NODE_ID_STIRNG); + private static final TopologyId TOPOLOGY_ID = new TopologyId("topologyId"); private DataBroker dataBroker; private IntegrationBridgeSetting integrationBridgeSetting; @@ -79,7 +80,7 @@ public class OvsdbNodeListenerTest { private ImmutableSet> changes; private Node nodeBefore; private Node nodeAfter; - private WriteTransaction wTx; + private WriteTransaction writeTx; private InstanceIdentifier bridgeNodeIid; private Node bridge; @@ -94,7 +95,7 @@ public class OvsdbNodeListenerTest { .build(); rootNode = mock(DataObjectModification.class); - rootIdentifier = NeutronOvsdbIidFactory.nodeIid(topologyId, nodeId); + rootIdentifier = NeutronOvsdbIidFactory.nodeIid(TOPOLOGY_ID, NODE_ID); DataTreeIdentifier rootPath = new DataTreeIdentifier<>(LogicalDatastoreType.CONFIGURATION, rootIdentifier); @@ -106,7 +107,7 @@ public class OvsdbNodeListenerTest { changes = ImmutableSet.of(change); bridgeNodeIid = NeutronOvsdbIidFactory.nodeIid( - rootIdentifier.firstKeyOf(Topology.class).getTopologyId(), nodeId); + rootIdentifier.firstKeyOf(Topology.class).getTopologyId(), NODE_ID); ManagerEntry managerEntry = new ManagerEntryBuilder() .setTarget(new Uri("something:192.168.50.9:1234")) @@ -138,15 +139,15 @@ public class OvsdbNodeListenerTest { .addAugmentation(OvsdbNodeAugmentation.class, ovsdbNode) .addAugmentation(OvsdbBridgeAugmentation.class, ovsdbBridge).build(); - wTx = mock(WriteTransaction.class); - when(dataBroker.newWriteOnlyTransaction()).thenReturn(wTx); + writeTx = mock(WriteTransaction.class); + when(dataBroker.newWriteOnlyTransaction()).thenReturn(writeTx); DataObjectModification modifiedOvsdbNode = mock(DataObjectModification.class); DataObjectModification ovsOtherConfigModification = mock(DataObjectModification.class); OpenvswitchOtherConfigs newConfig = new OpenvswitchOtherConfigsBuilder() .setOtherConfigKey(OvsdbNodeListener.NEUTRON_PROVIDER_MAPPINGS_KEY) - .setOtherConfigValue("otherConfigValue:" + NODE_ID) + .setOtherConfigValue("otherConfigValue:" + NODE_ID_STIRNG) .build(); when(ovsOtherConfigModification.getDataBefore()).thenReturn(null); when(ovsOtherConfigModification.getDataAfter()).thenReturn(newConfig); @@ -161,9 +162,9 @@ public class OvsdbNodeListenerTest { bridge = new NodeBuilder() .setNodeId(nodeId) .build(); - //doNothing().when(wTx).merge(LogicalDatastoreType.CONFIGURATION, bridgeNodeIid, bridge, true); + //doNothing().when(writeTx).merge(LogicalDatastoreType.CONFIGURATION, bridgeNodeIid, bridge, true); CheckedFuture fut = mock(CheckedFuture.class); - when(wTx.submit()).thenReturn(fut); + when(writeTx.submit()).thenReturn(fut); OvsdbTerminationPointAugmentation ovsdbTerminationPointAugmentation = new OvsdbTerminationPointAugmentationBuilder().build(); @@ -173,7 +174,7 @@ public class OvsdbNodeListenerTest { mock(DataObjectModification.class); OvsdbTerminationPointAugmentation newOvsdbTp = new OvsdbTerminationPointAugmentationBuilder() - .setName(NODE_ID) + .setName(NODE_ID_STIRNG) .setOfport(1234L) .build(); when(modifiedOvsdbTerminationPointAugmentation.getDataAfter()).thenReturn(newOvsdbTp); @@ -199,7 +200,8 @@ public class OvsdbNodeListenerTest { listener.onDataTreeChanged(changes); - verify(wTx).merge(eq(LogicalDatastoreType.CONFIGURATION), any(InstanceIdentifier.class), any(Node.class), eq(true)); + verify(writeTx).merge(eq(LogicalDatastoreType.CONFIGURATION), any(InstanceIdentifier.class), any(Node.class), + eq(true)); } @Test diff --git a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/TerminationPointDataChangeListenerTest.java b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/TerminationPointDataChangeListenerTest.java index e6bb32572..873ee252a 100644 --- a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/TerminationPointDataChangeListenerTest.java +++ b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/TerminationPointDataChangeListenerTest.java @@ -87,12 +87,6 @@ public class TerminationPointDataChangeListenerTest { when(dataBroker.registerDataTreeChangeListener(any(DataTreeIdentifier.class), any(DataTreeChangeListener.class))).thenReturn(registration); - InstanceIdentifier ovsdbTpIid = InstanceIdentifier.create( - NetworkTopology.class) - .child(Topology.class, new TopologyKey(SouthboundConstants.OVSDB_TOPOLOGY_ID)) - .child(Node.class) - .child(TerminationPoint.class) - .augmentation(OvsdbTerminationPointAugmentation.class); ovsdbTp = mock(OvsdbTerminationPointAugmentation.class); when(ovsdbTp.getInterfaceType()).thenReturn((Class) Object.class); InterfaceExternalIds externalId = mock(InterfaceExternalIds.class); @@ -172,6 +166,13 @@ public class TerminationPointDataChangeListenerTest { mock(DataTreeModification.class); mockModification = mock(DataObjectModification.class); doReturn(mockModification).when(mockDataTreeModification).getRootNode(); + + InstanceIdentifier ovsdbTpIid = InstanceIdentifier.create( + NetworkTopology.class) + .child(Topology.class, new TopologyKey(SouthboundConstants.OVSDB_TOPOLOGY_ID)) + .child(Node.class) + .child(TerminationPoint.class) + .augmentation(OvsdbTerminationPointAugmentation.class); doReturn(new DataTreeIdentifier<>(LogicalDatastoreType.OPERATIONAL, ovsdbTpIid)) .when(mockDataTreeModification).getRootPath(); changeEvent = Collections.singletonList(mockDataTreeModification); diff --git a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/TunnelTypeTest.java b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/TunnelTypeTest.java index 214186cac..4fa2d1d40 100644 --- a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/TunnelTypeTest.java +++ b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/TunnelTypeTest.java @@ -46,47 +46,38 @@ public class TunnelTypeTest { private List nshOptions = null; private List ofOverlayOptions = null; - @Before - public void setUp() throws Exception { + + @Before public void setUp() throws Exception { nshOptions = new ArrayList(); ofOverlayOptions = new ArrayList(); OptionsBuilder ob = new OptionsBuilder(); - ob.setOption(VNID_KEY) - .setValue(VNID_VALUE); + ob.setOption(VNID_KEY).setValue(VNID_VALUE); nshOptions.add(ob.build()); ofOverlayOptions.add(ob.build()); ob = new OptionsBuilder(); - ob.setOption(REMOTE_IP_KEY) - .setValue(REMOTE_IP_VALUE); + ob.setOption(REMOTE_IP_KEY).setValue(REMOTE_IP_VALUE); nshOptions.add(ob.build()); ofOverlayOptions.add(ob.build()); ob = new OptionsBuilder(); - ob.setOption(NSH_NSI_KEY) - .setValue(NSH_NSI_VALUE); + ob.setOption(NSH_NSI_KEY).setValue(NSH_NSI_VALUE); nshOptions.add(ob.build()); ob = new OptionsBuilder(); - ob.setOption(NSH_NSP_KEY) - .setValue(NSH_NSP_VALUE); + ob.setOption(NSH_NSP_KEY).setValue(NSH_NSP_VALUE); nshOptions.add(ob.build()); ob = new OptionsBuilder(); - ob.setOption(NSH_NSHC1_KEY) - .setValue(NSH_NSHC1_VALUE); + ob.setOption(NSH_NSHC1_KEY).setValue(NSH_NSHC1_VALUE); nshOptions.add(ob.build()); ob = new OptionsBuilder(); - ob.setOption(NSH_NSHC2_KEY) - .setValue(NSH_NSHC2_VALUE); + ob.setOption(NSH_NSHC2_KEY).setValue(NSH_NSHC2_VALUE); nshOptions.add(ob.build()); ob = new OptionsBuilder(); - ob.setOption(NSH_NSHC3_KEY) - .setValue(NSH_NSHC3_VALUE); + ob.setOption(NSH_NSHC3_KEY).setValue(NSH_NSHC3_VALUE); nshOptions.add(ob.build()); ob = new OptionsBuilder(); - ob.setOption(NSH_NSHC4_KEY) - .setValue(NSH_NSHC4_VALUE); + ob.setOption(NSH_NSHC4_KEY).setValue(NSH_NSHC4_VALUE); nshOptions.add(ob.build()); ob = new OptionsBuilder(); - ob.setOption(DESTPORT_KEY) - .setValue(DESTPORT_VALUE); + ob.setOption(DESTPORT_KEY).setValue(DESTPORT_VALUE); nshOptions.add(ob.build()); } diff --git a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelperTest.java b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelperTest.java index 98695d6df..d7b23e2a8 100644 --- a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelperTest.java +++ b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelperTest.java @@ -18,10 +18,11 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; -import java.util.Collections; - import com.google.common.base.Optional; import com.google.common.util.concurrent.CheckedFuture; + +import java.util.Collections; + import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.md.sal.binding.api.DataBroker; @@ -325,8 +326,6 @@ public class InventoryHelperTest { @SuppressWarnings({"unchecked", "rawtypes"}) @Test public void testUpdateOfOverlayConfig() throws Exception { - IpAddress ip = mock(IpAddress.class); - String nodeConnectorIdString = "nodeConnectorIdString"; AbstractTunnelType tunnelType = mock(AbstractTunnelType.class); when(writeTransaction.read(any(LogicalDatastoreType.class), any(InstanceIdentifier.class))) @@ -344,6 +343,8 @@ public class InventoryHelperTest { CheckedFuture submitFuture = mock(CheckedFuture.class); when(writeTransaction.submit()).thenReturn(submitFuture); + IpAddress ip = mock(IpAddress.class); + String nodeConnectorIdString = "nodeConnectorIdString"; InventoryHelper.updateOfOverlayConfig(ip, nodeIdString, nodeConnectorIdString, tunnelType, dataBroker); verify(writeTransaction).submit(); } @@ -363,10 +364,6 @@ public class InventoryHelperTest { @SuppressWarnings("unchecked") @Test public void testUpdateOfOverlayConfig_OfConfigNull() throws Exception { - IpAddress ip = mock(IpAddress.class); - String nodeConnectorIdString = "nodeConnectorIdString"; - AbstractTunnelType tunnelType = mock(AbstractTunnelType.class); - when(writeTransaction.read(any(LogicalDatastoreType.class), any(InstanceIdentifier.class))) .thenReturn(nodeConfigFuture); when(nodeConfigOptional.isPresent()).thenReturn(false); @@ -374,6 +371,9 @@ public class InventoryHelperTest { CheckedFuture submitFuture = mock(CheckedFuture.class); when(writeTransaction.submit()).thenReturn(submitFuture); + IpAddress ip = mock(IpAddress.class); + String nodeConnectorIdString = "nodeConnectorIdString"; + AbstractTunnelType tunnelType = mock(AbstractTunnelType.class); InventoryHelper.updateOfOverlayConfig(ip, nodeIdString, nodeConnectorIdString, tunnelType, dataBroker); verify(writeTransaction).submit(); } diff --git a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronOvsdbIidFactoryTest.java b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronOvsdbIidFactoryTest.java index 442bd6e44..24ef9232c 100644 --- a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronOvsdbIidFactoryTest.java +++ b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/NeutronOvsdbIidFactoryTest.java @@ -57,7 +57,8 @@ public class NeutronOvsdbIidFactoryTest { InstanceIdentifier iid = NeutronOvsdbIidFactory.neutronGbpExternalGatewayIidWildcard(); assertNotNull(iid); - Class[] expectedTypes = {Mappings.class, NeutronByGbpMappings.class, ExternalGatewaysAsL3Endpoints.class, + Class[] expectedTypes = + {Mappings.class, NeutronByGbpMappings.class, ExternalGatewaysAsL3Endpoints.class, ExternalGatewayAsL3Endpoint.class}; assertPathArgumentTypes(iid.getPathArguments(), expectedTypes); assertEquals(ExternalGatewayAsL3Endpoint.class, iid.getTargetType()); @@ -70,7 +71,7 @@ public class NeutronOvsdbIidFactoryTest { InstanceIdentifier iid = NeutronOvsdbIidFactory.endpointByPortIid(new UniqueId(portId)); assertNotNull(iid); Class[] expectedTypes = - {Mappings.class, GbpByNeutronMappings.class, EndpointsByPorts.class, EndpointByPort.class}; + {Mappings.class, GbpByNeutronMappings.class, EndpointsByPorts.class, EndpointByPort.class}; assertPathArgumentTypes(iid.getPathArguments(), expectedTypes); assertEquals(EndpointByPort.class, iid.getTargetType()); assertFalse(iid.isWildcarded()); @@ -81,7 +82,7 @@ public class NeutronOvsdbIidFactoryTest { public void test_NeutronGbpMappingsIidWildcard() { InstanceIdentifier iid = NeutronOvsdbIidFactory.neutronGbpMappingsIidWildcard(); assertNotNull(iid); - + Class[] expectedTypes = {Mappings.class, NeutronByGbpMappings.class}; assertPathArgumentTypes(iid.getPathArguments(), expectedTypes); assertEquals(NeutronByGbpMappings.class, iid.getTargetType()); @@ -107,7 +108,7 @@ public class NeutronOvsdbIidFactoryTest { NeutronOvsdbIidFactory.nodeIid(nodeId); assertNotNull(iid); Class[] expectedTypes = - {Nodes.class, org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node.class}; + {Nodes.class, org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node.class}; assertPathArgumentTypes(iid.getPathArguments(), expectedTypes); assertEquals(org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node.class, iid.getTargetType()); diff --git a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/OvsdbHelperTest.java b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/OvsdbHelperTest.java index 782f5dac2..e907996ed 100644 --- a/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/OvsdbHelperTest.java +++ b/neutron-ovsdb/src/test/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/OvsdbHelperTest.java @@ -18,12 +18,13 @@ import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import com.google.common.base.Optional; +import com.google.common.util.concurrent.CheckedFuture; + import java.util.ArrayList; import java.util.Collections; import java.util.List; -import com.google.common.base.Optional; -import com.google.common.util.concurrent.CheckedFuture; import org.junit.Before; import org.junit.Test; import org.opendaylight.controller.md.sal.binding.api.DataBroker;