X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=neutron-ovsdb%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fgroupbasedpolicy%2Fneutron%2Fovsdb%2Futil%2FInventoryHelper.java;h=807ad1c8e84ce101ab1741db3a9d7281a108448d;hb=02dd576a2ff7d7a8c304bd74a239c150be1ddd2b;hp=b2976b630eb779e18f4ce944be53cd503963cd56;hpb=3e139b8bd0912a5b72cf49a54a48d32d21c5ae0a;p=groupbasedpolicy.git diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelper.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelper.java index b2976b630..807ad1c8e 100755 --- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelper.java +++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/util/InventoryHelper.java @@ -7,16 +7,26 @@ */ package org.opendaylight.groupbasedpolicy.neutron.ovsdb.util; +import static org.opendaylight.groupbasedpolicy.neutron.ovsdb.util.OvsdbHelper.getOvsdbBridgeFromTerminationPoint; +import static org.opendaylight.groupbasedpolicy.neutron.ovsdb.util.OvsdbHelper.getOvsdbTerminationPoint; +import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.readFromDs; +import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.submitToDs; + import com.google.common.base.Optional; + +import java.util.ArrayList; import java.util.HashSet; +import java.util.List; import java.util.Set; + import org.apache.commons.lang3.StringUtils; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.groupbasedpolicy.neutron.ovsdb.AbstractTunnelType; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress; +import org.opendaylight.groupbasedpolicy.util.DataStoreHelper; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.OfOverlayNodeConfig; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.OfOverlayNodeConfigBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.nodes.node.ExternalInterfaces; @@ -36,21 +46,13 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.ArrayList; -import java.util.List; - -import static org.opendaylight.groupbasedpolicy.neutron.ovsdb.util.OvsdbHelper.getOvsdbBridgeFromTerminationPoint; -import static org.opendaylight.groupbasedpolicy.neutron.ovsdb.util.OvsdbHelper.getOvsdbTerminationPoint; -import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.readFromDs; -import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.submitToDs; - public class InventoryHelper { private static final Logger LOG = LoggerFactory.getLogger(InventoryHelper.class); private static final String HEX = "0x"; /** - * Convert an OpenFlow Datapath ID to a Long + * Convert an OpenFlow Datapath ID to a Long. * * @param dpid The OpenFlow Datapath ID * @return The Long representation of the DPID @@ -138,7 +140,7 @@ public class InventoryHelper { /** * Read the {@link OfOverlayNodeConfig} augmentation from the * Inventory Node, and verify that the tunnel types we need - * are present + * are present. * * @param nodeIdString The inventory node id string * @param requiredTunnelTypes the list of tunnel types @@ -172,7 +174,8 @@ public class InventoryHelper { return true; } - public static InstanceIdentifier addOfOverlayExternalPort(NodeId nodeId, NodeConnectorId ncId, DataBroker dataBroker) { + public static InstanceIdentifier addOfOverlayExternalPort(NodeId nodeId, NodeConnectorId ncId, + DataBroker dataBroker) { InstanceIdentifier nodeExternalInterfacesIid = InstanceIdentifier.builder(Nodes.class) .child(Node.class, new NodeKey(nodeId)) .augmentation(OfOverlayNodeConfig.class) @@ -182,9 +185,9 @@ public class InventoryHelper { ExternalInterfaces externalInterfaces = new ExternalInterfacesBuilder().setKey(new ExternalInterfacesKey(ncId)) .setNodeConnectorId(ncId) .build(); - WriteTransaction transaction = dataBroker.newReadWriteTransaction(); + WriteTransaction transaction = dataBroker.newWriteOnlyTransaction(); transaction.put(LogicalDatastoreType.CONFIGURATION, nodeExternalInterfacesIid, externalInterfaces, true); - submitToDs(transaction); + DataStoreHelper.submitToDs(transaction); LOG.trace("Added external interface node connector {} to node {}", ncId.getValue(), nodeId.getValue()); return nodeExternalInterfacesIid; } @@ -232,7 +235,7 @@ public class InventoryHelper { Set existingTunnels = new HashSet(); if (ofConfig != null) { ofOverlayNodeConfigBuilder = new OfOverlayNodeConfigBuilder(ofConfig); - if(ofConfig.getTunnel() != null) { + if (ofConfig.getTunnel() != null) { existingTunnels.addAll(ofConfig.getTunnel()); } } else { @@ -278,8 +281,8 @@ public class InventoryHelper { } OfOverlayNodeConfig newConfig = ofOverlayNodeConfigBuilder.build(); if (addOfOverlayConfig(newConfig, new NodeId(nodeIdString), dataBroker)) { - LOG.trace("updateOfOverlayConfig - Added Tunnel: {} to Node: {} at NodeConnector: {}",tunnelBuilder.build(), nodeIdString, nodeConnectorIdString); - return; + LOG.trace("updateOfOverlayConfig - Added Tunnel: {} to Node: {} at NodeConnector: {}", + tunnelBuilder.build(), nodeIdString, nodeConnectorIdString); } else { LOG.error("updateOfOverlayConfig - could not write OfOverlayNodeConfig: {} to datastore.", newConfig); } @@ -309,42 +312,42 @@ public class InventoryHelper { // runs only if some tunnels were really removed if (existingTunnels.removeAll(tunnelsToRemove)) { - ReadWriteTransaction wTx = dataBroker.newReadWriteTransaction(); + ReadWriteTransaction writeTx = dataBroker.newReadWriteTransaction(); for (Tunnel tunnel : tunnelsToRemove) { InstanceIdentifier tunnelIid = InstanceIdentifier.builder(Nodes.class) .child(Node.class, new NodeKey(new NodeId(nodeIdString))) .augmentation(OfOverlayNodeConfig.class) .child(Tunnel.class, tunnel.getKey()) .build(); - wTx.delete(LogicalDatastoreType.CONFIGURATION, tunnelIid); + writeTx.delete(LogicalDatastoreType.CONFIGURATION, tunnelIid); LOG.trace("Removing tunnel: {} from node {}",tunnel, nodeIdString); } - submitToDs(wTx); + submitToDs(writeTx); } } private static boolean addOfOverlayConfig(OfOverlayNodeConfig newConfig, NodeId nodeId, DataBroker dataBroker) { - ReadWriteTransaction wTx = dataBroker.newReadWriteTransaction(); + ReadWriteTransaction writeTx = dataBroker.newReadWriteTransaction(); InstanceIdentifier ofOverlayNodeIid = InstanceIdentifier.builder(Nodes.class) .child(Node.class, new NodeKey(nodeId)) .augmentation(OfOverlayNodeConfig.class) .build(); - wTx.put(LogicalDatastoreType.CONFIGURATION, ofOverlayNodeIid, newConfig, true); + writeTx.put(LogicalDatastoreType.CONFIGURATION, ofOverlayNodeIid, newConfig, true); LOG.trace("Adding tunnel: {} to node {}", newConfig, nodeId.getValue()); - return submitToDs(wTx); + return submitToDs(writeTx); } private static boolean addTunnelsOfOverlayConfig(List tunnels, NodeId nodeId, DataBroker dataBroker) { - ReadWriteTransaction wTx = dataBroker.newReadWriteTransaction(); + ReadWriteTransaction writeTx = dataBroker.newReadWriteTransaction(); for (Tunnel tunnel : tunnels) { InstanceIdentifier tunnelIid = InstanceIdentifier.builder(Nodes.class) .child(Node.class, new NodeKey(nodeId)) .augmentation(OfOverlayNodeConfig.class) .child(Tunnel.class, tunnel.getKey()) .build(); - wTx.put(LogicalDatastoreType.CONFIGURATION, tunnelIid, tunnel, true); + writeTx.put(LogicalDatastoreType.CONFIGURATION, tunnelIid, tunnel, true); LOG.trace("Adding tunnel: {} to node {}",tunnel, nodeId.getValue()); } - return submitToDs(wTx); + return submitToDs(writeTx); } }