import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import javax.annotation.Nullable;
-
import org.apache.thrift.TException;
import org.opendaylight.controller.config.api.osgi.WaitingServiceTracker;
import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
-
public class BgpConfigurationManager {
private static final Logger LOG = LoggerFactory.getLogger(BgpConfigurationManager.class);
private static DataBroker dataBroker;
private String getProperty(String var, String def) {
String property = bundleContext.getProperty(var);
- return (property == null ? def : property);
+ return property == null ? def : property;
}
static boolean ignoreClusterDcnEventForFollower() {
return;
}
Long label = val.getLabel();
- int lbl = (label == null) ? qbgpConstants.LBL_NO_LABEL
+ int lbl = label == null ? qbgpConstants.LBL_NO_LABEL
: label.intValue();
- int l3vni = (val.getL3vni() == null) ? qbgpConstants.LBL_NO_LABEL
+ int l3vni = val.getL3vni() == null ? qbgpConstants.LBL_NO_LABEL
: val.getL3vni().intValue();
- int l2vni = (val.getL2vni() == null) ? qbgpConstants.LBL_NO_LABEL
+ int l2vni = val.getL2vni() == null ? qbgpConstants.LBL_NO_LABEL
: val.getL2vni().intValue();
BgpControlPlaneType protocolType = val.getBgpControlPlaneType();
return;
}
Long label = val.getLabel();
- int lbl = (label == null) ? 0 : label.intValue();
+ int lbl = label == null ? 0 : label.intValue();
int afiInt = testValueAFI(pfxlen);
if (rd == null && lbl > 0) {
//LU prefix is being deleted.
return cHostStartup;
}
ConfigServer ts = config.getConfigServer();
- return (ts == null ? cHostStartup : ts.getHost().getValue());
+ return ts == null ? cHostStartup : ts.getHost().getValue();
}
public static int getConfigPort() {
return Integer.parseInt(cPortStartup);
}
ConfigServer ts = config.getConfigServer();
- return (ts == null ? Integer.parseInt(cPortStartup) :
- ts.getPort().intValue());
+ return ts == null ? Integer.parseInt(cPortStartup) :
+ ts.getPort().intValue();
}
public static Bgp getConfig() {
IpAddress routerId = asId.getRouterId();
Long spt = asId.getStalepathTime();
Boolean afb = asId.isAnnounceFbit();
- String rid = (routerId == null) ? "" : new String(routerId.getValue());
+ String rid = routerId == null ? "" : new String(routerId.getValue());
int stalepathTime = (int) getStalePathtime(RESTART_DEFAULT_GR, config.getAsId());
boolean announceFbit = true;
try {
String pfxlen = net.getPrefixLen();
String nh = net.getNexthop().getValue();
Long label = net.getLabel();
- int lbl = (label == null) ? 0 : label.intValue();
- int l3vni = (net.getL3vni() == null) ? 0 : net.getL3vni().intValue();
- int l2vni = (net.getL2vni() == null) ? 0 : net.getL2vni().intValue();
+ int lbl = label == null ? 0 : label.intValue();
+ int l3vni = net.getL3vni() == null ? 0 : net.getL3vni().intValue();
+ int l2vni = net.getL2vni() == null ? 0 : net.getL2vni().intValue();
Long afi = net.getAfi();
- int afint = (afi == null) ? (int) af_afi.AFI_IP.getValue() : afi.intValue();
+ int afint = afi == null ? (int) af_afi.AFI_IP.getValue() : afi.intValue();
if (rd == null && lbl > 0) {
//LU prefix is being deleted.
rd = Integer.toString(lbl);
}
public void startBgp(long as, String routerId, int spt, boolean fbit) {
- IpAddress rid = (routerId == null) ? null : new IpAddress(routerId.toCharArray());
+ IpAddress rid = routerId == null ? null : new IpAddress(routerId.toCharArray());
Long staleTime = (long) spt;
InstanceIdentifier.InstanceIdentifierBuilder<AsId> iib =
InstanceIdentifier.builder(Bgp.class).child(AsId.class);
* to complete (or)wait for max timeout value of STALE_FIB_WAIT Seconds.
*/
int retry = STALE_FIB_WAIT;
- while ((BgpUtil.getGetPendingWrTransaction() != 0) && (retry > 0)) {
+ while (BgpUtil.getGetPendingWrTransaction() != 0 && retry > 0) {
Thread.sleep(1000);
retry--;
if (retry == 0) {
*/
int retry = STALE_FIB_WAIT;
String rd;
- while ((BgpUtil.getGetPendingWrTransaction() != 0) && (retry > 0)) {
+ while (BgpUtil.getGetPendingWrTransaction() != 0 && retry > 0) {
Thread.sleep(1000);
retry--;
if (retry == 0) {
package org.opendaylight.netvirt.bgpmanager.commands;
-
import org.apache.karaf.shell.commands.Argument;
import org.apache.karaf.shell.commands.Command;
import org.apache.karaf.shell.commands.Option;
description = "rd",
required = false,
multiValued = false)
- String rd = null;
+ String rd;
@Option(name = MAXPATH, aliases = { "-n" },
description = "max number of paths",
required = false,
multiValued = false)
- String maxpath = null;
+ String maxpath;
@Option(name = AF, aliases = {"-f"},
description = "Address family",
required = true, multiValued = false)
- String addrFamily = null;
+
+ String addrFamily;
@Argument(name = "enable|disable|setmaxpath",
description = "The desired operation",
required = true, multiValued = false)
- private String multipathEnable = null;
+
+ String multipathEnable;
@Override
protected Object doExecute() throws Exception {
default:
return usage();
}
-
}
return null;
+ "odl:multipath -f lu -r <rd> -n <maxpath> setmaxpath");
return null;
}
-
}
import static org.mockito.Mockito.inOrder;
import static org.mockito.Mockito.when;
-
-
import com.google.common.truth.Expect;
import org.apache.thrift.TException;
import org.junit.Before;
*/
package org.opendaylight.netvirt.elan.internal;
-
import java.math.BigInteger;
-
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
*/
package org.opendaylight.netvirt.elan.l2gw.ha.merge;
-
import org.opendaylight.netvirt.elan.l2gw.ha.commands.LocalMcastCmd;
import org.opendaylight.netvirt.elan.l2gw.ha.commands.LocalUcastCmd;
import org.opendaylight.netvirt.elan.l2gw.ha.commands.LogicalSwitchesCmd;
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.netvirt.elan.utils;
-
-
import com.google.common.base.Optional;
import javax.inject.Inject;
import javax.inject.Singleton;
package org.opendaylight.netvirt.ipv6service;
-
import java.util.ArrayList;
import java.util.List;
package org.opendaylight.netvirt.policyservice;
-
import com.google.common.base.Optional;
-
import java.math.BigInteger;
import java.util.Collections;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;
import java.util.stream.Stream;
-
import javax.inject.Inject;
import javax.inject.Singleton;
-
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
import org.opendaylight.genius.datastoreutils.DataStoreJobCoordinator;
return;
}
- List<InstructionInfo> instructions = (addOrRemove == NwConstants.ADD_FLOW)
+ List<InstructionInfo> instructions = addOrRemove == NwConstants.ADD_FLOW
? getPolicyClassifierInstructions(policyClassifierOpt.get()) : null;
programAceFlows(ace, instructions, dpId, addOrRemove);
}
public void programAceFlows(Ace ace, String policyClassifierName, List<BigInteger> dpIds, int addOrRemove) {
- List<InstructionInfo> instructions = (addOrRemove == NwConstants.ADD_FLOW)
+ List<InstructionInfo> instructions = addOrRemove == NwConstants.ADD_FLOW
? getPolicyClassifierInstructions(policyClassifierName) : null;
dpIds.forEach(dpId -> {
programAceFlows(ace, instructions, dpId, addOrRemove);
package org.opendaylight.netvirt.policyservice.listeners;
-
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
-
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.inject.Singleton;
-
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.genius.datastoreutils.AsyncDataTreeChangeListenerBase;
package org.opendaylight.netvirt.qosservice;
-
import com.google.common.base.Optional;
import com.google.common.util.concurrent.FutureCallback;
import com.google.common.util.concurrent.Futures;
package org.opendaylight.netvirt.qosservice;
-
import java.math.BigInteger;
import org.opendaylight.netvirt.neutronvpn.interfaces.INeutronVpnManager;
import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.ports.attributes.ports.Port;
import org.slf4j.LoggerFactory;
public class QosAlertPortData {
- private Port port;
+ private final Port port;
private static INeutronVpnManager neutronVpnManager;
private BigInteger rxPackets;
private BigInteger rxDroppedPackets;
* and is available at http://www.eclipse.org/legal/epl-v10.html
*/
-
package org.opendaylight.netvirt.qosservice;
-
-
import com.google.common.base.Optional;
import javax.annotation.PostConstruct;
import javax.inject.Inject;
*/
package org.opendaylight.netvirt.qosservice;
-
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.inject.Singleton;
*/
package org.opendaylight.netvirt.qosservice;
-
import javax.annotation.PostConstruct;
import javax.inject.Inject;
import javax.inject.Singleton;
*/
package org.opendaylight.netvirt.qosservice;
-
import com.google.common.base.Optional;
import com.google.common.util.concurrent.ListenableFuture;
import java.math.BigInteger;
Network network, Uuid qosUuid) {
LOG.trace("Handling Network QoS update: net: {} qosservice: {}", network.getUuid(), qosUuid);
QosPolicy qosPolicy = QosNeutronUtils.qosPolicyMap.get(qosUuid);
- if (qosPolicy == null || ((qosPolicy.getBandwidthLimitRules() == null
+ if (qosPolicy == null || (qosPolicy.getBandwidthLimitRules() == null
|| qosPolicy.getBandwidthLimitRules().isEmpty())
&& (qosPolicy.getDscpmarkingRules() == null
- || qosPolicy.getDscpmarkingRules().isEmpty()))) {
+ || qosPolicy.getDscpmarkingRules().isEmpty())) {
return;
}
List<Uuid> subnetIds = QosNeutronUtils.getSubnetIdsFromNetworkId(db, network.getUuid());
*/
package org.opendaylight.netvirt.qosservice;
-
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
*/
package org.opendaylight.netvirt.qosservice;
-
import com.google.common.util.concurrent.ListenableFuture;
import java.math.BigInteger;
import java.util.ArrayList;
}
}
+ @Override
protected void add(InstanceIdentifier<QosPolicy> identifier, QosPolicy input) {
LOG.trace("Adding QosPolicy : key: {}, value={}", identifier, input);
QosNeutronUtils.addToQosPolicyCache(input);
}
+ @Override
protected void remove(InstanceIdentifier<QosPolicy> identifier, QosPolicy input) {
LOG.trace("Removing QosPolicy : key: {}, value={}", identifier, input);
QosNeutronUtils.removeFromQosPolicyCache(input);
}
}
+ @Override
protected void update(InstanceIdentifier<QosPolicy> identifier, QosPolicy original, QosPolicy update) {
LOG.trace("Updating QosPolicy : key: {}, original value={}, update value={}", identifier, original, update);
QosNeutronUtils.addToQosPolicyCache(update);
private void supportedQoSRuleTypes() {
QosRuleTypesBuilder qrtBuilder = new QosRuleTypesBuilder();
- List<RuleTypes> value = new ArrayList<RuleTypes>();
+ List<RuleTypes> value = new ArrayList<>();
value.add(getRuleTypes("bandwidth_limit_rules"));
value.add(getRuleTypes("dscp_marking_rules"));
Code Review / netvirt.git / commitdiff