- UnimgrUtils.deleteNode(dataBroker, bridgeIid, LogicalDatastoreType.CONFIGURATION);
- UnimgrUtils.createBridgeNode(dataBroker,
- ovsdbNodeIid,
- uniAugmentation,
- UnimgrConstants.DEFAULT_BRIDGE_NAME);
+ Optional<Node> optBridgeNode = UnimgrUtils.readNode(dataBroker, bridgeIid);
+ if (optBridgeNode.isPresent()) {
+ Node bridgeNode = optBridgeNode.get();
+ InstanceIdentifier<TerminationPoint> iidGreTermPoint = UnimgrMapper.getTerminationPointIid(bridgeNode,
+ UnimgrConstants.DEFAULT_GRE_TUNNEL_NAME);
+ InstanceIdentifier<TerminationPoint> iidEthTermPoint = UnimgrMapper.getTerminationPointIid(bridgeNode,
+ UnimgrConstants.DEFAULT_TUNNEL_IFACE);
+ UnimgrUtils.deleteNode(dataBroker, iidGreTermPoint, LogicalDatastoreType.CONFIGURATION);
+ UnimgrUtils.deleteNode(dataBroker, iidEthTermPoint, LogicalDatastoreType.CONFIGURATION);
+ }