*/
package org.opendaylight.groupbasedpolicy.neutron.ovsdb.util;
+import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.readFromDs;
+import static org.opendaylight.groupbasedpolicy.util.IidFactory.endpointIid;
+
import com.google.common.base.Optional;
-import com.google.common.collect.ImmutableList;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.groupbasedpolicy.util.DataStoreHelper;
import org.opendaylight.groupbasedpolicy.util.IidFactory;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev100924.MacAddress;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.SubnetId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.common.rev140421.TenantId;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.EndpointService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.RegisterEndpointInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.RegisterEndpointInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.UnregisterEndpointInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.UnregisterEndpointInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.endpoint.fields.L3Address;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.endpoint.fields.L3AddressBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.endpoints.Endpoint;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.endpoints.EndpointBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.endpoints.EndpointKey;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.unregister.endpoint.input.L2;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.unregister.endpoint.input.L2Builder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.unregister.endpoint.input.L3;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.endpoint.rev140421.unregister.endpoint.input.L3Builder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.OfOverlayContext;
import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.ofoverlay.rev140528.OfOverlayContextBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
-import org.opendaylight.yangtools.yang.common.RpcResult;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.ExecutionException;
-
-import static org.opendaylight.groupbasedpolicy.util.DataStoreHelper.readFromDs;
-import static org.opendaylight.groupbasedpolicy.util.IidFactory.endpointIid;
-public class EndpointHelper {
- private static final Logger LOG = LoggerFactory.getLogger(EndpointHelper.class);
+public final class EndpointHelper {
+ private EndpointHelper() {
+ }
/**
* Look up the {@link Endpoint} from the Endpoint Registry.
*
* @param epKey The {@link EndpointKey} to look up
- * @param dataBroker The {@link DataBroker} to use for the transaction
+ * @param transaction The {@link ReadOnlyTransaction}
* @return The corresponding {@link Endpoint}, null if not found
*/
public static Endpoint lookupEndpoint(EndpointKey epKey, ReadOnlyTransaction transaction) {
- Optional<Endpoint> optionalEp = readFromDs(LogicalDatastoreType.OPERATIONAL, endpointIid(epKey.getL2Context(),epKey.getMacAddress()), transaction );
+ Optional<Endpoint> optionalEp =
+ readFromDs(LogicalDatastoreType.OPERATIONAL, endpointIid(epKey.getL2Context(), epKey.getMacAddress()),
+ transaction);
if (optionalEp.isPresent()) {
return optionalEp.get();
}
/**
* Updates an {@link Endpoint} location based on OVSDB Termination point notification.
- *
* Note this updates the datastore directly. It does not use the Endpoint RPC, as this has
* unfortunate side-effects on EndpointL3 augmentations.
*
- * @param endpoint
- * @param nodeIdString
- * @param nodeConnectorIdString
- * @param rwTx
+ * @param endpoint the network endpoint
+ * @param nodeIdString the string representation of the inventory NodeId
+ * @param nodeConnectorIdString the string representation of the inventory NodeConnectorId
+ * @param rwTx a reference to ReadWriteTransaction object
*/
- public static void updateEndpointWithLocation(Endpoint endpoint, String nodeIdString,
- String nodeConnectorIdString, ReadWriteTransaction rwTx) {
-
+ public static void updateEndpointWithLocation(Endpoint endpoint, String nodeIdString, String nodeConnectorIdString,
+ ReadWriteTransaction rwTx) {
NodeId invNodeId = new NodeId(nodeIdString);
NodeConnectorId ncId = new NodeConnectorId(nodeConnectorIdString);
-
- OfOverlayContext ofc = endpoint.getAugmentation(OfOverlayContext.class);
- OfOverlayContextBuilder ofcBuilder = new OfOverlayContextBuilder(ofc).setNodeConnectorId(ncId).setNodeId(invNodeId);
- EndpointBuilder epBuilder = new EndpointBuilder(endpoint);
- epBuilder.addAugmentation(OfOverlayContext.class, ofcBuilder.build());
- Endpoint newEp = epBuilder.build();
- rwTx.put(LogicalDatastoreType.OPERATIONAL, IidFactory.endpointIid(newEp.getL2Context(), newEp.getMacAddress()), newEp);
+ OfOverlayContext newOfOverlayCtx =
+ new OfOverlayContextBuilder().setNodeId(invNodeId).setNodeConnectorId(ncId).build();
+ rwTx.merge(LogicalDatastoreType.OPERATIONAL,
+ IidFactory.endpointIid(endpoint.getKey()).augmentation(OfOverlayContext.class), newOfOverlayCtx);
DataStoreHelper.submitToDs(rwTx);
}
EndpointBuilder epBuilder = new EndpointBuilder(endpoint);
Endpoint newEp = epBuilder.build();
epBuilder.removeAugmentation(OfOverlayContext.class);
- rwTx.put(LogicalDatastoreType.OPERATIONAL, IidFactory.endpointIid(newEp.getL2Context(), newEp.getMacAddress()), newEp);
+ rwTx.put(LogicalDatastoreType.OPERATIONAL, IidFactory.endpointIid(newEp.getL2Context(), newEp.getMacAddress()),
+ newEp);
DataStoreHelper.submitToDs(rwTx);
}