package org.opendaylight.ovsdb.openstack.netvirt.impl;
import org.opendaylight.neutron.spi.NeutronNetwork;
-import org.opendaylight.ovsdb.openstack.netvirt.MdsalUtils;
+import org.opendaylight.ovsdb.openstack.netvirt.ConfigInterface;
import org.opendaylight.ovsdb.openstack.netvirt.NetworkHandler;
import org.opendaylight.ovsdb.openstack.netvirt.api.BridgeConfigurationManager;
import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService;
+import org.opendaylight.ovsdb.openstack.netvirt.api.Constants;
import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProviderManager;
import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbTables;
+import org.opendaylight.ovsdb.openstack.netvirt.api.Southbound;
import org.opendaylight.ovsdb.utils.config.ConfigProperties;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation;
+import org.opendaylight.ovsdb.utils.servicehelper.ServiceHelper;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeAugmentation;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.node.attributes.ConnectionInfo;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
+
import java.net.InetAddress;
import java.net.NetworkInterface;
import java.net.UnknownHostException;
import java.util.Enumeration;
import java.util.List;
+
import org.apache.commons.lang3.tuple.ImmutablePair;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.ServiceReference;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
* @author Brent Salisbury
* @author Sam Hague (shague@redhat.com)
*/
-public class BridgeConfigurationManagerImpl implements BridgeConfigurationManager {
- static final Logger LOGGER = LoggerFactory.getLogger(BridgeConfigurationManagerImpl.class);
+public class BridgeConfigurationManagerImpl implements BridgeConfigurationManager, ConfigInterface {
+ private static final Logger LOG = LoggerFactory.getLogger(BridgeConfigurationManagerImpl.class);
// The implementation for each of these services is resolved by the OSGi Service Manager
private volatile ConfigurationService configurationService;
private volatile NetworkingProviderManager networkingProviderManager;
+ private volatile Southbound southbound;
- void init() {
- LOGGER.info(">>>>>> init {}", this.getClass());
+ public void setConfigurationService(ConfigurationService configurationService) {
+ this.configurationService = configurationService;
+ }
+
+ public void setSouthbound(Southbound southbound) {
+ this.southbound = southbound;
}
@Override
public String getBridgeUuid(Node node, String bridgeName) {
- return MdsalUtils.getBridgeUuid(node, bridgeName).toString();
+ return southbound.getBridgeUuid(node, bridgeName);
}
@Override
public boolean isNodeNeutronReady(Node node) {
Preconditions.checkNotNull(configurationService);
- return MdsalUtils.getBridge(node, configurationService.getIntegrationBridgeName()) != null;
+ return southbound.getBridge(node, configurationService.getIntegrationBridgeName()) != null;
}
@Override
public boolean isNodeOverlayReady(Node node) {
Preconditions.checkNotNull(configurationService);
return isNodeNeutronReady(node)
- && MdsalUtils.getBridge(node, configurationService.getNetworkBridgeName()) != null;
+ && southbound.getBridge(node, configurationService.getNetworkBridgeName()) != null;
}
@Override
- public boolean isPortOnBridge (Node node, String portName) {
- return MdsalUtils.extractTerminationPointAugmentation(node, portName) != null;
+ public boolean isPortOnBridge (Node bridgeNode, String portName) {
+ return southbound.extractTerminationPointAugmentation(bridgeNode, portName) != null;
}
@Override
- public boolean isNodeTunnelReady(Node node) {
+ public boolean isNodeTunnelReady(Node bridgeNode, Node ovsdbNode) {
Preconditions.checkNotNull(configurationService);
- return MdsalUtils.getBridge(node, configurationService.getIntegrationBridgeName()) != null;
+ if (!southbound.isBridgeOnOvsdbNode(ovsdbNode, configurationService.getIntegrationBridgeName())) {
+ LOG.trace("isNodeTunnelReady: node: {}, {} missing",
+ bridgeNode, configurationService.getIntegrationBridgeName());
+ return false;
+ }
+
+ return isNodeL3Ready(bridgeNode, ovsdbNode);
}
@Override
- public boolean isNodeVlanReady(Node node, NeutronNetwork network) {
- Preconditions.checkNotNull(networkingProviderManager);
+ public boolean isNodeVlanReady(Node bridgeNode, Node ovsdbNode, NeutronNetwork network) {
+ Preconditions.checkNotNull(configurationService);
- /* is br-int created */
- OvsdbBridgeAugmentation intBridge = MdsalUtils.getBridge(node, configurationService.getIntegrationBridgeName());
- if (intBridge == null) {
- LOGGER.trace("isNodeVlanReady: node: {}, br-int missing", node);
+ final String brInt = configurationService.getIntegrationBridgeName();
+ if (!southbound.isBridgeOnOvsdbNode(ovsdbNode, brInt)) {
+ LOG.trace("isNodeVlanReady: node: {}, {} missing", bridgeNode, brInt);
return false;
}
/* Check if physical device is added to br-int. */
- String phyNetName = this.getPhysicalInterfaceName(node, network.getProviderPhysicalNetwork());
- if (MdsalUtils.extractTerminationPointAugmentation(node, phyNetName) == null) {
- LOGGER.trace("isNodeVlanReady: node: {}, eth missing", node);
+ String phyNetName = getPhysicalInterfaceName(ovsdbNode, network.getProviderPhysicalNetwork());
+ if (!isPortOnBridge(bridgeNode, phyNetName)) {
+ LOG.trace("isNodeVlanReady: node: {}, eth missing", bridgeNode);
return false;
}
- return true;
+ return isNodeL3Ready(bridgeNode, ovsdbNode);
+ }
+
+ public boolean isNodeL3Ready(Node bridgeNode, Node ovsdbNode) {
+ Preconditions.checkNotNull(configurationService);
+ boolean ready = false;
+ if (configurationService.isL3ForwardingEnabled()) {
+ final String brInt = configurationService.getIntegrationBridgeName();
+ final String brExt = configurationService.getExternalBridgeName();
+ final String portNameInt = configurationService.getPatchPortName(new ImmutablePair<>(brInt, brExt));
+ final String portNameExt = configurationService.getPatchPortName(new ImmutablePair<>(brExt, brInt));
+ Preconditions.checkNotNull(portNameInt);
+ Preconditions.checkNotNull(portNameExt);
+
+ if (southbound.isBridgeOnOvsdbNode(ovsdbNode, brExt)) {
+ //this would look better if used a method like isNetworkPatchCreated()
+ if (isPortOnBridge(bridgeNode, portNameInt)) {
+ Node extBridgeNode = southbound.readBridgeNode(ovsdbNode, brExt);
+ if (isPortOnBridge(extBridgeNode, portNameExt)) {
+ ready = true;
+ } else {
+ LOG.trace("isNodeL3Ready: node: {}, {} missing",
+ bridgeNode, portNameExt);
+ }
+ } else {
+ LOG.trace("isNodeL3Ready: node: {}, {} missing",
+ bridgeNode, portNameInt);
+ }
+ } else {
+ LOG.trace("isNodeL3Ready: node: {}, {} missing",
+ bridgeNode, brExt);
+ }
+ } else {
+ ready = true;
+ }
+ return ready;
}
@Override
- public void prepareNode(Node node) {
- Preconditions.checkNotNull(networkingProviderManager);
+ public void prepareNode(Node ovsdbNode) {
+ Preconditions.checkNotNull(configurationService);
try {
- createIntegrationBridge(node);
+ createIntegrationBridge(ovsdbNode);
} catch (Exception e) {
- LOGGER.error("Error creating Integration Bridge on {}", node, e);
+ LOG.error("Error creating Integration Bridge on {}", ovsdbNode, e);
+ return;
+ }
+
+ try {
+ if (configurationService.isL3ForwardingEnabled()) {
+ createExternalBridge(ovsdbNode);
+ }
+ } catch (Exception e) {
+ LOG.error("Error creating External Bridge on {}", ovsdbNode, e);
return;
}
// this node is an ovsdb node so it doesn't have a bridge
* Check if the full network setup is available. If not, create it.
*/
@Override
- public boolean createLocalNetwork (Node node, NeutronNetwork network) {
+ public boolean createLocalNetwork (Node bridgeNode, NeutronNetwork network) {
boolean isCreated = false;
+ Node ovsdbNode = southbound.readOvsdbNode(bridgeNode);
+ if (ovsdbNode == null) {
+ //this should never happen
+ LOG.error("createLocalNetwork could not find ovsdbNode from bridge node " + bridgeNode);
+ return false;
+ }
if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VLAN)) {
- if (!isNodeVlanReady(node, network)) {
+ if (!isNodeVlanReady(bridgeNode, ovsdbNode, network)) {
try {
- isCreated = createBridges(node, network);
+ isCreated = createBridges(bridgeNode, ovsdbNode, network);
} catch (Exception e) {
- LOGGER.error("Error creating internal net network " + node, e);
+ LOG.error("Error creating internal vlan net network " + bridgeNode, e);
}
} else {
isCreated = true;
}
} else if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN) ||
network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE)) {
- if (!isNodeTunnelReady(node)) {
+ if (!isNodeTunnelReady(bridgeNode, ovsdbNode)) {
try {
- isCreated = createBridges(node, network);
+ isCreated = createBridges(bridgeNode, ovsdbNode, network);
} catch (Exception e) {
- LOGGER.error("Error creating internal net network " + node, e);
+ LOG.error("Error creating internal vxlan/gre net network " + bridgeNode, e);
}
} else {
isCreated = true;
@Override
public String getPhysicalInterfaceName (Node node, String physicalNetwork) {
String phyIf = null;
- String providerMaps = MdsalUtils.getOtherConfig(node, OvsdbTables.OPENVSWITCH,
+ String providerMaps = southbound.getOtherConfig(node, OvsdbTables.OPENVSWITCH,
configurationService.getProviderMappingsKey());
if (providerMaps == null) {
providerMaps = configurationService.getDefaultProviderMapping();
}
if (phyIf == null) {
- LOGGER.error("Physical interface not found for Node: {}, Network {}",
- node, physicalNetwork);
+ LOG.error("Physical interface not found for Node: {}, Network {}",
+ node, physicalNetwork);
}
return phyIf;
@Override
public List<String> getAllPhysicalInterfaceNames(Node node) {
List<String> phyIfName = Lists.newArrayList();
- String phyIf = null;
- String providerMaps = MdsalUtils.getOtherConfig(node, OvsdbTables.OPENVSWITCH,
+ String providerMaps = southbound.getOtherConfig(node, OvsdbTables.OPENVSWITCH,
configurationService.getProviderMappingsKey());
if (providerMaps == null) {
providerMaps = configurationService.getDefaultProviderMapping();
/**
* Creates the Integration Bridge
*/
- private void createIntegrationBridge(Node node) throws Exception {
+ private boolean createIntegrationBridge(Node ovsdbNode) throws Exception {
Preconditions.checkNotNull(configurationService);
- String brIntName = configurationService.getIntegrationBridgeName();
+ if (!addBridge(ovsdbNode, configurationService.getIntegrationBridgeName())) {
+ LOG.debug("Integration Bridge Creation failed");
+ return false;
+ }
+ return true;
+ }
+
+ private boolean createExternalBridge(Node ovsdbNode) throws Exception {
+ Preconditions.checkNotNull(configurationService);
- if (!addBridge(node, brIntName, null, null)) {
- LOGGER.debug("Integration Bridge Creation failed");
+ if (!addBridge(ovsdbNode, configurationService.getExternalBridgeName())) {
+ LOG.debug("External Bridge Creation failed");
+ return false;
}
+ return true;
}
/**
Interface br-int
type: internal
*/
- private boolean createBridges(Node node, NeutronNetwork network) throws Exception {
+ private boolean createBridges(Node bridgeNode, Node ovsdbNode, NeutronNetwork network) throws Exception {
Preconditions.checkNotNull(configurationService);
Preconditions.checkNotNull(networkingProviderManager);
- LOGGER.debug("createBridges: node: {}, network type: {}", node, network.getProviderNetworkType());
+ LOG.debug("createBridges: node: {}, network type: {}", bridgeNode, network.getProviderNetworkType());
- String brInt = configurationService.getIntegrationBridgeName();
- if (!addBridge(node, brInt, null, null)) {
- LOGGER.debug("{} Bridge creation failed", brInt);
+ final String brInt = configurationService.getIntegrationBridgeName();
+ if (! createIntegrationBridge(ovsdbNode)) {
+ LOG.debug("{} Bridge creation failed", brInt);
return false;
}
+ if (configurationService.isL3ForwardingEnabled()) {
+ final String brExt = configurationService.getExternalBridgeName();
+ if (! createExternalBridge(ovsdbNode)) {
+ LOG.error("{} Bridge creation failed", brExt);
+ return false;
+ }
+
+ //get two patch port names
+ final String portNameInt = configurationService.getPatchPortName(new ImmutablePair<>(brInt, brExt));
+ final String portNameExt = configurationService.getPatchPortName(new ImmutablePair<>(brExt, brInt));
+ Preconditions.checkNotNull(portNameInt);
+ Preconditions.checkNotNull(portNameExt);
+
+ if (!addPatchPort(bridgeNode, brInt, portNameInt, portNameExt)) {
+ LOG.error("Add Port {} to Bridge {} failed", portNameInt, brInt);
+ return false;
+ }
+ Node extBridgeNode = southbound.readBridgeNode(ovsdbNode, brExt);
+ Preconditions.checkNotNull(extBridgeNode);
+ if (!addPatchPort(extBridgeNode, brExt, portNameExt, portNameInt)) {
+ LOG.error("Add Port {} to Bridge {} failed", portNameExt, brExt);
+ return false;
+ }
+ }
+
/* For vlan network types add physical port to br-int. */
if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VLAN)) {
- String phyNetName = this.getPhysicalInterfaceName(node, network.getProviderPhysicalNetwork());
- if (!addPortToBridge(node, brInt, phyNetName)) {
- LOGGER.debug("Add Port {} to Bridge {} failed", phyNetName, brInt);
+ String phyNetName = this.getPhysicalInterfaceName(bridgeNode, network.getProviderPhysicalNetwork());
+ if (!addPortToBridge(bridgeNode, brInt, phyNetName)) {
+ LOG.debug("Add Port {} to Bridge {} failed", phyNetName, brInt);
return false;
}
}
- LOGGER.debug("createNetNetwork: node: {}, status: success", node);
+ LOG.debug("createBridges: node: {}, status: success", bridgeNode);
return true;
}
private boolean addPortToBridge (Node node, String bridgeName, String portName) throws Exception {
boolean rv = true;
- if (MdsalUtils.extractTerminationPointAugmentation(node, portName) == null) {
- rv = MdsalUtils.addTerminationPoint(node, bridgeName, portName, null);
+ if (southbound.extractTerminationPointAugmentation(node, portName) == null) {
+ rv = southbound.addTerminationPoint(node, bridgeName, portName, null);
+
+ if (rv) {
+ LOG.info("addPortToBridge: node: {}, bridge: {}, portname: {} status: success",
+ node.getNodeId().getValue(), bridgeName, portName);
+ } else {
+ LOG.error("addPortToBridge: node: {}, bridge: {}, portname: {} status: FAILED",
+ node.getNodeId().getValue(), bridgeName, portName);
+ }
+ } else {
+ LOG.trace("addPortToBridge: node: {}, bridge: {}, portname: {} status: not_needed",
+ node.getNodeId().getValue(), bridgeName, portName);
}
return rv;
private boolean addPatchPort (Node node, String bridgeName, String portName, String peerPortName) throws Exception {
boolean rv = true;
- if (MdsalUtils.extractTerminationPointAugmentation(node, portName) == null) {
- rv = MdsalUtils.addPatchTerminationPoint(node, bridgeName, portName, peerPortName);
+ if (southbound.extractTerminationPointAugmentation(node, portName) == null) {
+ rv = southbound.addPatchTerminationPoint(node, bridgeName, portName, peerPortName);
+
+ if (rv) {
+ LOG.info("addPatchPort: node: {}, bridge: {}, portname: {} peer: {} status: success",
+ node.getNodeId().getValue(), bridgeName, portName, peerPortName);
+ } else {
+ LOG.error("addPatchPort: node: {}, bridge: {}, portname: {} peer: {} status: FAILED",
+ node.getNodeId().getValue(), bridgeName, portName, peerPortName);
+ }
+ } else {
+ LOG.trace("addPatchPort: node: {}, bridge: {}, portname: {} peer: {} status: not_needed",
+ node.getNodeId().getValue(), bridgeName, portName, peerPortName);
}
return rv;
/**
* Add Bridge to a Node
*/
- private boolean addBridge(Node node, String bridgeName,
- String localPatchName, String remotePatchName) throws Exception {
+ private boolean addBridge(Node ovsdbNode, String bridgeName) throws Exception {
boolean rv = true;
- if (MdsalUtils.getBridge(node, bridgeName) == null) {
- rv = MdsalUtils.addBridge(node, bridgeName, getControllerTarget(node));
+ if (!southbound.isBridgeOnOvsdbNode(ovsdbNode, bridgeName)) {
+ rv = southbound.addBridge(ovsdbNode, bridgeName, getControllerTarget(ovsdbNode));
}
return rv;
}
- private InetAddress getControllerIPAddress() {
+ private String getControllerIPAddress() {
InetAddress controllerIP = null;
String addressString = ConfigProperties.getProperty(this.getClass(), "ovsdb.controller.address");
try {
controllerIP = InetAddress.getByName(addressString);
if (controllerIP != null) {
- return controllerIP;
+ return addressString;
}
} catch (UnknownHostException e) {
- LOGGER.error("Host {} is invalid", addressString);
+ LOG.error("Host {} is invalid", addressString);
}
}
try {
controllerIP = InetAddress.getByName(addressString);
if (controllerIP != null) {
- return controllerIP;
- }
- } catch (UnknownHostException e) {
- LOGGER.error("Host {} is invalid", addressString);
- }
- }
-
- /*
- try {
- controllerIP = connection.getClient().getConnectionInfo().getLocalAddress();
- return controllerIP;
- } catch (Exception e) {
- LOGGER.debug("Invalid connection provided to getControllerIPAddresses", e);
- }
- */
-
- if (addressString != null) {
- try {
- controllerIP = InetAddress.getByName(addressString);
- if (controllerIP != null) {
- return controllerIP;
+ return addressString;
}
} catch (UnknownHostException e) {
- LOGGER.error("Host {} is invalid", addressString);
+ LOG.error("Host {} is invalid", addressString);
}
}
- return controllerIP;
+ return null;
}
private short getControllerOFPort() {
- Short defaultOpenFlowPort = 6633;
- Short openFlowPort = defaultOpenFlowPort;
+ short openFlowPort = Constants.OPENFLOW_PORT;
String portString = ConfigProperties.getProperty(this.getClass(), "of.listenPort");
if (portString != null) {
try {
- openFlowPort = Short.decode(portString).shortValue();
+ openFlowPort = Short.parseShort(portString);
} catch (NumberFormatException e) {
- LOGGER.warn("Invalid port:{}, use default({})", portString,
+ LOG.warn("Invalid port:{}, use default({})", portString,
openFlowPort);
}
}
}
private String getControllerTarget(Node node) {
- String target = null;
- OvsdbNodeAugmentation ovsdbNodeAugmentation = MdsalUtils.extractOvsdbNode(node);
- if (ovsdbNodeAugmentation != null) {
- ConnectionInfo connectionInfo = ovsdbNodeAugmentation.getConnectionInfo();
- String addressStr = new String(connectionInfo.getLocalIp().getValue());
- target = "tcp:" + addressStr + ":6633";
- } else{
- target = getControllerTarget();
+ String setControllerStr = null;
+ short openflowPort = Constants.OPENFLOW_PORT;
+ //Look at user configuration.
+ //TODO: In case we move to config subsystem to expose these user facing parameter,
+ // we will have to modify this code.
+
+ String controllerIpStr = getControllerIPAddress();
+
+ if(controllerIpStr == null){
+ // Check if ovsdb node has connection info
+ OvsdbNodeAugmentation ovsdbNodeAugmentation = southbound.extractOvsdbNode(node);
+ if (ovsdbNodeAugmentation != null) {
+ ConnectionInfo connectionInfo = ovsdbNodeAugmentation.getConnectionInfo();
+ if(connectionInfo != null && connectionInfo.getLocalIp() != null) {
+ controllerIpStr = new String(connectionInfo.getLocalIp().getValue());
+ }else{
+ LOG.warn("Ovsdb Node does not contains connection info : {}", node);
+ }
+ }
+ }else {
+ openflowPort = getControllerOFPort();
}
- return target;
+
+ if(controllerIpStr == null) {
+ // Neither user provided ip nor ovsdb node has controller ip, Lets use local machine ip address
+ LOG.debug("Use local machine ip address as a OpenFlow Controller ip address");
+ controllerIpStr = getLocalControllerHostIpAddress();
+ }
+ if(controllerIpStr != null){
+ LOG.debug("Targe OpenFlow Controller found : {}", controllerIpStr);
+ setControllerStr = Constants.OPENFLOW_CONNECTION_PROTOCOL + ":" + controllerIpStr + ":" + openflowPort;
+ }else {
+ LOG.warn("Failed to determine OpenFlow controller ip address");
+ }
+ return setControllerStr;
}
- private String getControllerTarget() {
- /* TODO SB_MIGRATION
- * hardcoding value, need to find better way to get local ip
- */
- //String target = "tcp:" + getControllerIPAddress() + ":" + getControllerOFPort();
- //TODO: dirty fix, need to remove it once we have proper solution
+ private String getLocalControllerHostIpAddress() {
String ipaddress = null;
try{
- for (Enumeration ifaces = NetworkInterface.getNetworkInterfaces();ifaces.hasMoreElements();){
- NetworkInterface iface = (NetworkInterface) ifaces.nextElement();
-
- for (Enumeration inetAddrs = iface.getInetAddresses(); inetAddrs.hasMoreElements();) {
- InetAddress inetAddr = (InetAddress) inetAddrs.nextElement();
- if (!inetAddr.isLoopbackAddress()) {
- if (inetAddr.isSiteLocalAddress()) {
- ipaddress = inetAddr.getHostAddress();
- break;
- }
+ for (Enumeration<NetworkInterface> ifaces = NetworkInterface.getNetworkInterfaces();ifaces.hasMoreElements();){
+ NetworkInterface iface = ifaces.nextElement();
+
+ for (Enumeration<InetAddress> inetAddrs = iface.getInetAddresses(); inetAddrs.hasMoreElements();) {
+ InetAddress inetAddr = inetAddrs.nextElement();
+ if (!inetAddr.isLoopbackAddress() && inetAddr.isSiteLocalAddress()) {
+ ipaddress = inetAddr.getHostAddress();
+ break;
}
}
}
}catch (Exception e){
- LOGGER.warn("ROYALLY SCREWED : Exception while fetching local host ip address ",e);
+ LOG.warn("Exception while fetching local host ip address ", e);
}
- return "tcp:"+ipaddress+":6633";
+ return ipaddress;
+ }
+
+ @Override
+ public void setDependencies(BundleContext bundleContext, ServiceReference serviceReference) {
+ configurationService =
+ (ConfigurationService) ServiceHelper.getGlobalInstance(ConfigurationService.class, this);
+ networkingProviderManager =
+ (NetworkingProviderManager) ServiceHelper.getGlobalInstance(NetworkingProviderManager.class, this);
+ southbound =
+ (Southbound) ServiceHelper.getGlobalInstance(Southbound.class, this);
+ }
+
+ @Override
+ public void setDependencies(Object impl) {
}
}
Code Review / netvirt.git / blobdiff