MD-SAL API integration
[ovsdb.git] / southbound / southbound-impl / src / main / java / org / opendaylight / ovsdb / southbound / ovsdb / transact / TerminationPointCreateCommand.java
index 895b66b331919edb5471b12d9d177dc2bb52822e..e043b764355902823bb7154707bc9d4e7a089950 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 Brocade Communications Systems, Inc. and others.  All rights reserved.
+ * Copyright © 2015, 2017 Brocade Communications 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,
 package org.opendaylight.ovsdb.southbound.ovsdb.transact;
 
 import static org.opendaylight.ovsdb.lib.operations.Operations.op;
+import static org.opendaylight.ovsdb.southbound.SouthboundUtil.schemaMismatchLog;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Optional;
 import java.util.Set;
-
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
+import org.opendaylight.mdsal.binding.api.DataTreeModification;
+import org.opendaylight.ovsdb.lib.error.SchemaVersionMismatchException;
 import org.opendaylight.ovsdb.lib.notation.Mutator;
 import org.opendaylight.ovsdb.lib.notation.UUID;
+import org.opendaylight.ovsdb.lib.operations.Mutate;
 import org.opendaylight.ovsdb.lib.operations.TransactionBuilder;
-import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils;
 import org.opendaylight.ovsdb.schema.openvswitch.Bridge;
 import org.opendaylight.ovsdb.schema.openvswitch.Interface;
 import org.opendaylight.ovsdb.schema.openvswitch.Port;
+import org.opendaylight.ovsdb.southbound.InstanceIdentifierCodec;
+import org.opendaylight.ovsdb.southbound.SouthboundConstants;
 import org.opendaylight.ovsdb.southbound.SouthboundMapper;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation;
+import org.opendaylight.ovsdb.southbound.SouthboundUtil;
+import org.opendaylight.ovsdb.utils.yang.YangUtils;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeBase;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbPortInterfaceAttributes.VlanMode;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.InterfaceBfd;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.InterfaceExternalIds;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.InterfaceLldp;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.InterfaceOtherConfigs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.Options;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.PortExternalIds;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.PortOtherConfigs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.Trunks;
 import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-import org.opendaylight.yangtools.yang.binding.DataObject;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.Uint16;
+import org.opendaylight.yangtools.yang.common.Uint32;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Sets;
-
 public class TerminationPointCreateCommand implements TransactCommand {
-    private AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes;
+
     private static final Logger LOG = LoggerFactory.getLogger(TerminationPointCreateCommand.class);
 
-    public TerminationPointCreateCommand(AsyncDataChangeEvent<InstanceIdentifier<?>,
-            DataObject> changes) {
-        this.changes = changes;
+    @Override
+    public void execute(final TransactionBuilder transaction, final BridgeOperationalState state,
+            final DataChangeEvent events, final InstanceIdentifierCodec instanceIdentifierCodec) {
+        execute(transaction, state, TransactUtils.extractCreated(events, OvsdbTerminationPointAugmentation.class),
+                TransactUtils.extractCreatedOrUpdated(events, Node.class), instanceIdentifierCodec);
     }
 
     @Override
-    public void execute(TransactionBuilder transaction) {
-        for (Entry<InstanceIdentifier<?>, DataObject> entry: changes.getCreatedData().entrySet()) {
-            DataObject dataObject = entry.getValue();
-            if (dataObject instanceof OvsdbTerminationPointAugmentation) {
-                OvsdbTerminationPointAugmentation terminationPoint = (OvsdbTerminationPointAugmentation) dataObject;
-                LOG.debug("Received request to create termination point {}",
-                        terminationPoint.getName());
-
+    public void execute(final TransactionBuilder transaction, final BridgeOperationalState state,
+            final Collection<DataTreeModification<Node>> modifications,
+            final InstanceIdentifierCodec instanceIdentifierCodec) {
+        execute(transaction, state,
+                TransactUtils.extractCreated(modifications, OvsdbTerminationPointAugmentation.class),
+                TransactUtils.extractCreatedOrUpdated(modifications, Node.class), instanceIdentifierCodec);
+    }
 
+    private void execute(final TransactionBuilder transaction, final BridgeOperationalState state,
+            final Map<InstanceIdentifier<OvsdbTerminationPointAugmentation>, OvsdbTerminationPointAugmentation>
+                    createdTerminationPoints,
+            final Map<InstanceIdentifier<Node>, Node> nodes, final InstanceIdentifierCodec instanceIdentifierCodec) {
+        for (Entry<InstanceIdentifier<OvsdbTerminationPointAugmentation>, OvsdbTerminationPointAugmentation> entry :
+                createdTerminationPoints.entrySet()) {
+            OvsdbTerminationPointAugmentation terminationPoint = entry.getValue();
+            LOG.debug("Received request to create termination point {}",
+                    terminationPoint.getName());
+            InstanceIdentifier terminationPointIid = entry.getKey();
+            Optional<TerminationPoint> terminationPointOptional =
+                    state.getBridgeTerminationPoint(terminationPointIid);
+            if (!terminationPointOptional.isPresent()) {
                 // Configure interface
-                String interfaceUuid = "Interface_" + SouthboundMapper.getRandomUUID();;
-                Interface ovsInterface =
-                        TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Interface.class);
-                ovsInterface.setName(terminationPoint.getName());
-                ovsInterface.setType(SouthboundMapper.createOvsdbInterfaceType(terminationPoint.getInterfaceType()));
-                Long ofPort = terminationPoint.getOfport();
-                if (ofPort != null) {
-                    ovsInterface.setOpenFlowPort(Sets.newHashSet(ofPort));
-                }
-                Integer ofPortRequest = terminationPoint.getOfportRequest();
-                if (ofPortRequest != null) {
-                    ovsInterface.setOpenFlowPortRequest(Sets.newHashSet(ofPortRequest.longValue()));
-                }
-
-                //Configure optional input
-                if (terminationPoint.getOptions() != null) {
-                    HashMap<String, String> optionsMap = new HashMap<String, String>();
-                    for (Options option : terminationPoint.getOptions()) {
-                        optionsMap.put(option.getOption(), option.getValue());
-                    }
-                    try {
-                        ovsInterface.setOptions(ImmutableMap.copyOf(optionsMap));
-                    } catch (NullPointerException e) {
-                        LOG.warn("Incomplete OVSDB interface options");
-                    }
-                }
-
-                List<InterfaceExternalIds> interfaceExternalIds =
-                        terminationPoint.getInterfaceExternalIds();
-                if (interfaceExternalIds != null && !interfaceExternalIds.isEmpty()) {
-                    HashMap<String, String> externalIdsMap = new HashMap<String, String>();
-                    for (InterfaceExternalIds externalId: interfaceExternalIds) {
-                        externalIdsMap.put(externalId.getExternalIdKey(), externalId.getExternalIdValue());
-                    }
-                    try {
-                        ovsInterface.setExternalIds(ImmutableMap.copyOf(externalIdsMap));
-                    } catch (NullPointerException e) {
-                        LOG.warn("Incomplete OVSDB interface external_ids");
-                    }
-                }
+                String interfaceUuid = "Interface_" + SouthboundMapper.getRandomUuid();
+                Interface ovsInterface = transaction.getTypedRowWrapper(Interface.class);
+                createInterface(terminationPoint, ovsInterface);
                 transaction.add(op.insert(ovsInterface).withId(interfaceUuid));
 
+                stampInstanceIdentifier(transaction, entry.getKey(), ovsInterface.getName(), instanceIdentifierCodec);
+
                 // Configure port with the above interface details
-                String portUuid = "Port_" + SouthboundMapper.getRandomUUID();;
-                Port port = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Port.class);
-                port.setName(terminationPoint.getName());
-                port.setInterfaces(Sets.newHashSet(new UUID(interfaceUuid)));
-                if (terminationPoint.getVlanTag() != null) {
-                    Set<Long> vlanTag = new HashSet<Long>();
-                    vlanTag.add(terminationPoint.getVlanTag().getValue().longValue());
-                    port.setTag(vlanTag);
+                String portUuid = "Port_" + SouthboundMapper.getRandomUuid();
+                Port port = transaction.getTypedRowWrapper(Port.class);
+                final String opendaylightIid = instanceIdentifierCodec.serialize(terminationPointIid);
+                createPort(terminationPoint, port, interfaceUuid, opendaylightIid);
+                transaction.add(op.insert(port).withId(portUuid));
+                LOG.info("Created Termination Point : {} with Uuid : {}",
+                        terminationPoint.getName(),portUuid);
+                //Configure bridge with the above port details
+                Bridge bridge = transaction.getTypedRowWrapper(Bridge.class);
+                String bridgeName = SouthboundUtil
+                    .getBridgeNameFromOvsdbNodeId(entry.getKey().firstIdentifierOf(Node.class));
+                if (bridgeName != null) {
+                    LOG.trace("Updating bridge {} for newly added port {}", bridgeName, terminationPoint.getName());
+                    bridge.setName(bridgeName);
+                    bridge.setPorts(Collections.singleton(new UUID(portUuid)));
+
+                    transaction.add(op.mutate(bridge)
+                            .addMutation(bridge.getPortsColumn().getSchema(),
+                                    Mutator.INSERT, bridge.getPortsColumn().getData())
+                            .where(bridge.getNameColumn().getSchema()
+                                    .opEqual(bridge.getNameColumn().getData())).build());
+                } else {
+                    LOG.error("Missing BridgeName for Node {} during creation of port {}",
+                            entry.getKey().firstIdentifierOf(Node.class), terminationPoint.getName());
                 }
-                if (terminationPoint.getTrunks() != null && terminationPoint.getTrunks().size() > 0) {
-                    Set<Long> portTrunks = new HashSet<Long>();
-                    List<Trunks> modelTrunks = terminationPoint.getTrunks();
-                    for (Trunks trunk: modelTrunks) {
-                        if (trunk.getTrunk() != null) {
-                            portTrunks.add(trunk.getTrunk().getValue().longValue());
-                        }
-                    }
-                    port.setTrunks(portTrunks);
+            }
+        }
+
+    }
+
+    private void createInterface(
+            final OvsdbTerminationPointAugmentation terminationPoint,
+            final Interface ovsInterface) {
+        ovsInterface.setName(terminationPoint.getName());
+
+        createInterfaceType(terminationPoint, ovsInterface);
+        createOfPort(terminationPoint, ovsInterface);
+        createOfPortRequest(terminationPoint, ovsInterface);
+        createInterfaceOptions(terminationPoint, ovsInterface);
+        createInterfaceOtherConfig(terminationPoint, ovsInterface);
+        createInterfaceExternalIds(terminationPoint, ovsInterface);
+        createInterfaceLldp(terminationPoint, ovsInterface);
+        createInterfaceBfd(terminationPoint, ovsInterface);
+    }
+
+    private static void createInterfaceType(final OvsdbTerminationPointAugmentation terminationPoint,
+            final Interface ovsInterface) {
+        Class<? extends InterfaceTypeBase> mdsaltype = terminationPoint.getInterfaceType();
+        if (mdsaltype != null) {
+            ovsInterface.setType(SouthboundMapper.createOvsdbInterfaceType(mdsaltype));
+        }
+    }
+
+    private void createPort(
+            final OvsdbTerminationPointAugmentation terminationPoint,
+            final Port port, final String interfaceUuid, final String opendaylightIid) {
+
+        port.setName(terminationPoint.getName());
+        port.setInterfaces(Collections.singleton(new UUID(interfaceUuid)));
+        createPortOtherConfig(terminationPoint, port);
+        createPortVlanTag(terminationPoint, port);
+        createPortVlanTrunk(terminationPoint, port);
+        createPortVlanMode(terminationPoint, port);
+        createPortExternalIds(terminationPoint, port, opendaylightIid);
+    }
+
+    private void createOfPort(
+            final OvsdbTerminationPointAugmentation terminationPoint,
+            final Interface ovsInterface) {
+
+        Uint32 ofPort = terminationPoint.getOfport();
+        if (ofPort != null) {
+            ovsInterface.setOpenFlowPort(Collections.singleton(ofPort.toJava()));
+        }
+    }
+
+    private void createOfPortRequest(
+            final OvsdbTerminationPointAugmentation terminationPoint,
+            final Interface ovsInterface) {
+
+        Uint16 ofPortRequest = terminationPoint.getOfportRequest();
+        if (ofPortRequest != null) {
+            ovsInterface.setOpenFlowPortRequest(Collections.singleton(ofPortRequest.longValue()));
+        }
+    }
+
+    private void createInterfaceOptions(
+            final OvsdbTerminationPointAugmentation terminationPoint,
+            final Interface ovsInterface) {
+
+        //Configure optional input
+        if (terminationPoint.getOptions() != null) {
+            try {
+                ovsInterface.setOptions(YangUtils.convertYangKeyValueListToMap(terminationPoint.getOptions(),
+                        Options::getOption, Options::getValue));
+            } catch (NullPointerException e) {
+                LOG.warn("Incomplete OVSDB interface options", e);
+            }
+        }
+    }
+
+    private void createInterfaceExternalIds(
+            final OvsdbTerminationPointAugmentation terminationPoint,
+            final Interface ovsInterface) {
+
+        List<InterfaceExternalIds> interfaceExternalIds =
+                terminationPoint.getInterfaceExternalIds();
+        if (interfaceExternalIds != null && !interfaceExternalIds.isEmpty()) {
+            interfaceExternalIds.add(SouthboundUtil.createExternalIdsForInterface(
+                SouthboundConstants.CREATED_BY, SouthboundConstants.ODL));
+        } else {
+            interfaceExternalIds = Arrays.asList(SouthboundUtil.createExternalIdsForInterface(
+                SouthboundConstants.CREATED_BY, SouthboundConstants.ODL));
+        }
+        try {
+            ovsInterface.setExternalIds(YangUtils.convertYangKeyValueListToMap(interfaceExternalIds,
+                    InterfaceExternalIds::getExternalIdKey, InterfaceExternalIds::getExternalIdValue));
+        } catch (NullPointerException e) {
+            LOG.warn("Incomplete OVSDB interface external_ids", e);
+        }
+    }
+
+    private void createInterfaceOtherConfig(
+            final OvsdbTerminationPointAugmentation terminationPoint,
+            final Interface ovsInterface) {
+
+        List<InterfaceOtherConfigs> interfaceOtherConfigs =
+                terminationPoint.getInterfaceOtherConfigs();
+        if (interfaceOtherConfigs != null && !interfaceOtherConfigs.isEmpty()) {
+            Map<String, String> otherConfigsMap = new HashMap<>();
+            for (InterfaceOtherConfigs interfaceOtherConfig : interfaceOtherConfigs) {
+                otherConfigsMap.put(interfaceOtherConfig.getOtherConfigKey(),
+                        interfaceOtherConfig.getOtherConfigValue());
+            }
+            try {
+                ovsInterface.setOtherConfig(otherConfigsMap);
+            } catch (NullPointerException e) {
+                LOG.warn("Incomplete OVSDB interface other_config", e);
+            }
+        }
+    }
+
+    private void createInterfaceLldp(
+            final OvsdbTerminationPointAugmentation terminationPoint,
+            final Interface ovsInterface) {
+
+        try {
+            List<InterfaceLldp> interfaceLldpList =
+                    terminationPoint.getInterfaceLldp();
+            if (interfaceLldpList != null && !interfaceLldpList.isEmpty()) {
+                try {
+                    ovsInterface.setLldp(YangUtils.convertYangKeyValueListToMap(interfaceLldpList,
+                            InterfaceLldp::getLldpKey, InterfaceLldp::getLldpValue));
+                } catch (NullPointerException e) {
+                    LOG.warn("Incomplete OVSDB interface lldp", e);
                 }
+            }
+        } catch (SchemaVersionMismatchException e) {
+            schemaMismatchLog("lldp", "Interface", e);
+        }
+    }
+
+    private void createInterfaceBfd(final OvsdbTerminationPointAugmentation terminationPoint,
+                    final Interface ovsInterface) {
 
-                List<PortExternalIds> portExternalIds = terminationPoint.getPortExternalIds();
-                if (portExternalIds != null && !portExternalIds.isEmpty()) {
-                    HashMap<String, String> externalIdsMap = new HashMap<String, String>();
-                    for (PortExternalIds externalId: portExternalIds) {
-                        externalIdsMap.put(externalId.getExternalIdKey(), externalId.getExternalIdValue());
-                    }
-                    try {
-                        port.setExternalIds(ImmutableMap.copyOf(externalIdsMap));
-                    } catch (NullPointerException e) {
-                        LOG.warn("Incomplete OVSDB port external_ids");
-                    }
+        try {
+            List<InterfaceBfd> interfaceBfdList = terminationPoint.getInterfaceBfd();
+            if (interfaceBfdList != null && !interfaceBfdList.isEmpty()) {
+                try {
+                    ovsInterface.setBfd(YangUtils.convertYangKeyValueListToMap(interfaceBfdList,
+                                    InterfaceBfd::getBfdKey, InterfaceBfd::getBfdValue));
+                } catch (NullPointerException e) {
+                    LOG.warn("Incomplete OVSDB interface bfd", e);
                 }
-                transaction.add(op.insert(port).withId(portUuid));
+            }
+        } catch (SchemaVersionMismatchException e) {
+            schemaMismatchLog("bfd", "Interface", e);
+        }
+    }
 
-                //Configure bridge with the above port details
-                Bridge bridge = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Bridge.class);
-                bridge.setName(getBridge(entry.getKey()).getBridgeName().getValue());
-                bridge.setPorts(Sets.newHashSet(new UUID(portUuid)));
-
-                transaction.add(op.mutate(bridge)
-                        .addMutation(bridge.getPortsColumn().getSchema(),
-                                Mutator.INSERT,bridge.getPortsColumn().getData())
-                        .where(bridge.getNameColumn().getSchema()
-                                .opEqual(bridge.getNameColumn().getData())).build());
+    private void createPortExternalIds(
+            final OvsdbTerminationPointAugmentation terminationPoint,
+            final Port port, final String opendaylightIid) {
+
+        // Set the iid external_id
+        List<PortExternalIds> portExternalIds = terminationPoint.getPortExternalIds();
+        if (portExternalIds != null && !portExternalIds.isEmpty()) {
+            portExternalIds.add(SouthboundUtil.createExternalIdsForPort(
+                SouthboundConstants.CREATED_BY, SouthboundConstants.ODL));
+            portExternalIds.add(SouthboundUtil.createExternalIdsForPort(
+                SouthboundConstants.IID_EXTERNAL_ID_KEY, opendaylightIid));
+        } else {
+            portExternalIds = new ArrayList<>();
+            portExternalIds.add(SouthboundUtil.createExternalIdsForPort(
+                SouthboundConstants.CREATED_BY, SouthboundConstants.ODL));
+            portExternalIds.add(SouthboundUtil.createExternalIdsForPort(
+                SouthboundConstants.IID_EXTERNAL_ID_KEY, opendaylightIid));
+        }
+        try {
+            port.setExternalIds(YangUtils.convertYangKeyValueListToMap(portExternalIds,
+                PortExternalIds::getExternalIdKey, PortExternalIds::getExternalIdValue));
+            //YangUtils.copyYangKeyValueListToMap(externalIdMap, terminationPoint.getPortExternalIds(),
+             //       PortExternalIds::getExternalIdKey, PortExternalIds::getExternalIdValue);
+        } catch (NullPointerException e) {
+            LOG.warn("Incomplete OVSDB port external_ids", e);
+        }
+    }
+
+    private void createPortVlanTag(
+            final OvsdbTerminationPointAugmentation terminationPoint,
+            final Port port) {
+
+        if (terminationPoint.getVlanTag() != null) {
+            Set<Long> vlanTag = new HashSet<>();
+            vlanTag.add(terminationPoint.getVlanTag().getValue().longValue());
+            port.setTag(vlanTag);
+        }
+    }
+
+    private void createPortVlanTrunk(
+            final OvsdbTerminationPointAugmentation terminationPoint,
+            final Port port) {
+
+        if (terminationPoint.getTrunks() != null && terminationPoint.getTrunks().size() > 0) {
+            Set<Long> portTrunks = new HashSet<>();
+            List<Trunks> modelTrunks = terminationPoint.getTrunks();
+            for (Trunks trunk: modelTrunks) {
+                if (trunk.getTrunk() != null) {
+                    portTrunks.add(trunk.getTrunk().getValue().longValue());
+                }
             }
+            port.setTrunks(portTrunks);
         }
+    }
 
+    private void createPortVlanMode(
+            final OvsdbTerminationPointAugmentation terminationPoint,
+            final Port port) {
+        if (terminationPoint.getVlanMode() != null) {
+            Set<String> portVlanMode = new HashSet<>();
+            VlanMode modelVlanMode = terminationPoint.getVlanMode();
+            portVlanMode.add(SouthboundConstants.VlanModes.values()[modelVlanMode.getIntValue() - 1].getMode());
+            port.setVlanMode(portVlanMode);
+        }
     }
 
-    private OvsdbBridgeAugmentation getBridge(InstanceIdentifier<?> key) {
-        InstanceIdentifier<Node> nodeIid = key.firstIdentifierOf(Node.class);
-        Map<InstanceIdentifier<Node>, Node> nodes =
-                TransactUtils.extractCreatedOrUpdated(changes,Node.class);
-        if (nodes != null && nodes.get(nodeIid) != null) {
-            Node node = nodes.get(nodeIid);
-            OvsdbBridgeAugmentation bridge = node.getAugmentation(OvsdbBridgeAugmentation.class);
-            if (bridge != null) {
-                return bridge;
+    private void createPortOtherConfig(
+            final OvsdbTerminationPointAugmentation terminationPoint,
+            final Port ovsPort) {
+        List<PortOtherConfigs> portOtherConfigs =
+                terminationPoint.getPortOtherConfigs();
+        if (portOtherConfigs != null && !portOtherConfigs.isEmpty()) {
+            try {
+                ovsPort.setOtherConfig(YangUtils.convertYangKeyValueListToMap(portOtherConfigs,
+                        PortOtherConfigs::getOtherConfigKey, PortOtherConfigs::getOtherConfigValue));
+            } catch (NullPointerException e) {
+                LOG.warn("Incomplete OVSDB port other_config", e);
             }
         }
-        return null;
     }
 
+    public static void stampInstanceIdentifier(final TransactionBuilder transaction,
+            final InstanceIdentifier<OvsdbTerminationPointAugmentation> iid, final String interfaceName,
+            final InstanceIdentifierCodec instanceIdentifierCodec) {
+        Port port = transaction.getTypedRowWrapper(Port.class);
+        port.setName(interfaceName);
+        port.setExternalIds(Collections.emptyMap());
+        Mutate mutate = TransactUtils.stampInstanceIdentifierMutation(transaction, iid, port.getSchema(),
+                port.getExternalIdsColumn().getSchema(), instanceIdentifierCodec);
+        transaction.add(mutate
+                .where(port.getNameColumn().getSchema().opEqual(interfaceName))
+                .build());
+    }
 }