- added some logging along happy path
Change-Id: I4918aa9e107d143b2a09138294c5109aad827f98
Signed-off-by: Dana Kutenicsova <dkutenic@cisco.com>
}
private void processRoute(final DOMDataWriteTransaction tx, final RIBSupport ribSupport, final AbstractImportPolicy policy, final YangInstanceIdentifier routesPath, final DataTreeCandidateNode route) {
}
private void processRoute(final DOMDataWriteTransaction tx, final RIBSupport ribSupport, final AbstractImportPolicy policy, final YangInstanceIdentifier routesPath, final DataTreeCandidateNode route) {
+ LOG.debug("Process route {}", route);
switch (route.getModificationType()) {
case DELETE:
// Delete has already been affected by the store in caller, so this is a no-op.
switch (route.getModificationType()) {
case DELETE:
// Delete has already been affected by the store in caller, so this is a no-op.
@Override
public void onDataTreeChanged(final Collection<DataTreeCandidate> changes) {
@Override
public void onDataTreeChanged(final Collection<DataTreeCandidate> changes) {
+ LOG.trace("Data changed called to effective RIB. Change : {}", changes);
final DOMDataWriteTransaction tx = this.chain.newWriteOnlyTransaction();
for (final DataTreeCandidate tc : changes) {
final DOMDataWriteTransaction tx = this.chain.newWriteOnlyTransaction();
for (final DataTreeCandidate tc : changes) {
private final BindingTransactionChain chain;
private final AsNumber localAs;
private final Ipv4Address bgpIdentifier;
private final BindingTransactionChain chain;
private final AsNumber localAs;
private final Ipv4Address bgpIdentifier;
- private final Ipv4Address clusterId;
+ private final ClusterIdentifier clusterId;
private final Set<BgpTableType> localTables;
private final RIBTables tables;
private final BlockingQueue<Peer> peers;
private final Set<BgpTableType> localTables;
private final RIBTables tables;
private final BlockingQueue<Peer> peers;
public RIBImpl(final RibId ribId, final AsNumber localAs, final Ipv4Address localBgpId, final Ipv4Address clusterId, final RIBExtensionConsumerContext extensions,
final BGPDispatcher dispatcher, final ReconnectStrategyFactory tcpStrategyFactory, final BindingCodecTreeFactory codecFactory,
public RIBImpl(final RibId ribId, final AsNumber localAs, final Ipv4Address localBgpId, final Ipv4Address clusterId, final RIBExtensionConsumerContext extensions,
final BGPDispatcher dispatcher, final ReconnectStrategyFactory tcpStrategyFactory, final BindingCodecTreeFactory codecFactory,
- final ReconnectStrategyFactory sessionStrategyFactory, final DataBroker dps, final DOMDataBroker domDataBroker, final List<BgpTableType> localTables, GeneratedClassLoadingStrategy classStrategy) {
+ final ReconnectStrategyFactory sessionStrategyFactory, final DataBroker dps, final DOMDataBroker domDataBroker, final List<BgpTableType> localTables, final GeneratedClassLoadingStrategy classStrategy) {
super(InstanceIdentifier.create(BgpRib.class).child(Rib.class, new RibKey(Preconditions.checkNotNull(ribId))));
this.chain = dps.createTransactionChain(this);
this.localAs = Preconditions.checkNotNull(localAs);
this.comparator = new BGPObjectComparator(localAs);
this.bgpIdentifier = Preconditions.checkNotNull(localBgpId);
super(InstanceIdentifier.create(BgpRib.class).child(Rib.class, new RibKey(Preconditions.checkNotNull(ribId))));
this.chain = dps.createTransactionChain(this);
this.localAs = Preconditions.checkNotNull(localAs);
this.comparator = new BGPObjectComparator(localAs);
this.bgpIdentifier = Preconditions.checkNotNull(localBgpId);
- this.clusterId = clusterId == null ? localBgpId : clusterId;
+ this.clusterId = (clusterId == null) ? new ClusterIdentifier(localBgpId) : new ClusterIdentifier(clusterId);
this.dispatcher = Preconditions.checkNotNull(dispatcher);
this.sessionStrategyFactory = Preconditions.checkNotNull(sessionStrategyFactory);
this.tcpStrategyFactory = Preconditions.checkNotNull(tcpStrategyFactory);
this.dispatcher = Preconditions.checkNotNull(dispatcher);
this.sessionStrategyFactory = Preconditions.checkNotNull(sessionStrategyFactory);
this.tcpStrategyFactory = Preconditions.checkNotNull(tcpStrategyFactory);
final WriteTransaction trans = this.chain.newWriteOnlyTransaction();
final WriteTransaction trans = this.chain.newWriteOnlyTransaction();
- final PolicyDatabase pd = new PolicyDatabase(localAs.getValue(), localBgpId, new ClusterIdentifier(localBgpId));
- /*if (clusterId == null) {
- clusterId is not present, fallback to bgpId
- pd = new PolicyDatabase(localAs.getValue(), localBgpId, new ClusterIdentifier(localBgpId));
- } else {
- pd = new PolicyDatabase(as, bgpId, clusterId);
- } */
+ final PolicyDatabase pd = new PolicyDatabase(localAs.getValue(), localBgpId, this.clusterId);
final DOMDataBrokerExtension service = this.domDataBroker.getSupportedExtensions().get(DOMDataTreeChangeService.class);
final DOMTransactionChain domChain = this.createPeerChain(this);
final DOMDataBrokerExtension service = this.domDataBroker.getSupportedExtensions().get(DOMDataTreeChangeService.class);
final DOMTransactionChain domChain = this.createPeerChain(this);
EffectiveRibInWriter.create((DOMDataTreeChangeService) service, domChain, getYangRibId(), pd, this.ribContextRegistry);
EffectiveRibInWriter.create((DOMDataTreeChangeService) service, domChain, getYangRibId(), pd, this.ribContextRegistry);
+ LOG.debug("Effective RIB created.");
// put empty BgpRib if not exists
trans.put(LogicalDatastoreType.OPERATIONAL, getInstanceIdentifier(),
// put empty BgpRib if not exists
trans.put(LogicalDatastoreType.OPERATIONAL, getInstanceIdentifier(),