- drop-test usage of classes originating from deprecated org.opendaylight.controller.sal.binding.api.data
and org.opendaylight.controller.sal.core.api.data
replaced by classes originating from org.opendaylight.controller.md.sal.binding.api
Change-Id: Id636a4d133484a7524aee24bf40292bb86d6f60c
Signed-off-by: Martin Bobak <mbobak@cisco.com>
*/
package org.opendaylight.openflowplugin.droptest;
*/
package org.opendaylight.openflowplugin.droptest;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.sal.binding.api.AbstractBindingAwareProvider;
import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
import org.opendaylight.controller.sal.binding.api.AbstractBindingAwareProvider;
import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
-import org.opendaylight.controller.sal.binding.api.data.DataProviderService;
import org.opendaylight.openflowplugin.outputtest.OutputTestCommandProvider;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowService;
import org.osgi.framework.BundleContext;
import org.opendaylight.openflowplugin.outputtest.OutputTestCommandProvider;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.service.rev130819.SalFlowService;
import org.osgi.framework.BundleContext;
private static OutputTestCommandProvider outCmdProvider;
private static OutputTestCommandProvider outCmdProvider;
public void onSessionInitiated(final ProviderContext session) {
LOG.debug("Activator DropAllPack INIT");
public void onSessionInitiated(final ProviderContext session) {
LOG.debug("Activator DropAllPack INIT");
- provider.setDataService(session.<DataProviderService>getSALService(DataProviderService.class));
+ provider.setDataService(session.<DataBroker>getSALService(DataBroker.class));
provider.setNotificationService(session.<NotificationProviderService>getSALService(NotificationProviderService.class));
provider.setNotificationService(session.<NotificationProviderService>getSALService(NotificationProviderService.class));
public void startImpl(final BundleContext ctx) {
super.startImpl(ctx);
// LOG.debug("------------------------------------- DROP ALL PACK TEST INITIATED ------------------------ ")
public void startImpl(final BundleContext ctx) {
super.startImpl(ctx);
// LOG.debug("------------------------------------- DROP ALL PACK TEST INITIATED ------------------------ ")
- cmdProvider = new DropTestCommandProvider(ctx, provider, rpcProvider);;
+ cmdProvider = new DropTestCommandProvider(ctx, provider, rpcProvider);
outCmdProvider = new OutputTestCommandProvider(ctx);
}
outCmdProvider = new OutputTestCommandProvider(ctx);
}
import org.eclipse.osgi.framework.console.CommandInterpreter;
import org.eclipse.osgi.framework.console.CommandProvider;
import org.eclipse.osgi.framework.console.CommandInterpreter;
import org.eclipse.osgi.framework.console.CommandProvider;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.data.DataBrokerService;
import org.osgi.framework.BundleContext;
public class DropTestCommandProvider implements CommandProvider {
import org.osgi.framework.BundleContext;
public class DropTestCommandProvider implements CommandProvider {
- private DataBrokerService dataBrokerService;
+ private DataBroker dataBroker;
private ProviderContext pc;
private BundleContext ctx;
private DropTestProvider provider;
private ProviderContext pc;
private BundleContext ctx;
private DropTestProvider provider;
private boolean sessionInitiated = false;
private boolean sessionInitiated = false;
- public DropTestCommandProvider(BundleContext ctx,DropTestProvider provider,DropTestRpcProvider rpcProvider) {
+ public DropTestCommandProvider(BundleContext ctx, DropTestProvider provider, DropTestRpcProvider rpcProvider) {
this.ctx = ctx;
this.provider = provider;
this.rpcProvider = rpcProvider;
this.ctx = ctx;
this.provider = provider;
this.rpcProvider = rpcProvider;
public void onSessionInitiated(ProviderContext session) {
pc = session;
public void onSessionInitiated(ProviderContext session) {
pc = session;
- dataBrokerService = session.getSALService(DataBrokerService.class);
+ dataBroker = session.getSALService(DataBroker.class);
ctx.registerService(CommandProvider.class.getName(), this, null);
this.sessionInitiated = true;
}
public void _dropAllPackets(CommandInterpreter ci) {
ctx.registerService(CommandProvider.class.getName(), this, null);
this.sessionInitiated = true;
}
public void _dropAllPackets(CommandInterpreter ci) {
+ if (sessionInitiated) {
String onoff = ci.nextArgument();
String onoff = ci.nextArgument();
- if(onoff.equals("on")) {
- if(on == false) {
+ if (onoff.equals("on")) {
+ if (on == false) {
provider.start();
ci.println("DropAllFlows transitions to on");
} else {
provider.start();
ci.println("DropAllFlows transitions to on");
} else {
}
on = true;
} else if (onoff.equals("off")) {
}
on = true;
} else if (onoff.equals("off")) {
provider.close();
ci.println("DropAllFlows transitions to off");
} else {
provider.close();
ci.println("DropAllFlows transitions to off");
} else {
}
public void _dropAllPacketsRpc(CommandInterpreter ci) {
}
public void _dropAllPacketsRpc(CommandInterpreter ci) {
+ if (sessionInitiated) {
String onoff = ci.nextArgument();
String onoff = ci.nextArgument();
- if(onoff.equals("on")) {
- if(on == false) {
+ if (onoff.equals("on")) {
+ if (on == false) {
rpcProvider.start();
ci.println("DropAllFlows transitions to on");
} else {
rpcProvider.start();
ci.println("DropAllFlows transitions to on");
} else {
}
on = true;
} else if (onoff.equals("off")) {
}
on = true;
} else if (onoff.equals("off")) {
rpcProvider.close();
ci.println("DropAllFlows transitions to off");
} else {
rpcProvider.close();
ci.println("DropAllFlows transitions to off");
} else {
ci.println("Session not initiated, try again in a few seconds");
}
}
ci.println("Session not initiated, try again in a few seconds");
}
}
public void _showDropStats(CommandInterpreter ci) {
public void _showDropStats(CommandInterpreter ci) {
- if(sessionInitiated) {
- ci.println("RPC Test Statistics: " + this.rpcProvider.getStats().toString());
- ci.println("FRM Test Statistics: " + this.provider.getStats().toString());
- } else {
- ci.println("Session not initiated, try again in a few seconds");
+ if (sessionInitiated) {
+ ci.println("RPC Test Statistics: " + this.rpcProvider.getStats().toString());
+ ci.println("FRM Test Statistics: " + this.provider.getStats().toString());
+ } else {
+ ci.println("Session not initiated, try again in a few seconds");
public void _clearDropStats(CommandInterpreter ci) {
public void _clearDropStats(CommandInterpreter ci) {
- if(sessionInitiated) {
- ci.print("Clearing drop statistics... ");
- this.rpcProvider.clearStats();
- this.provider.clearStats();
- ci.println("Done.");
+ if (sessionInitiated) {
+ ci.print("Clearing drop statistics... ");
+ this.rpcProvider.clearStats();
+ this.provider.clearStats();
+ ci.println("Done.");
- ci.println("Session not initiated, try again in a few seconds");
+ ci.println("Session not initiated, try again in a few seconds");
@Override
public String getHelp() {
StringBuffer help = new StringBuffer();
@Override
public String getHelp() {
StringBuffer help = new StringBuffer();
*/
package org.opendaylight.openflowplugin.droptest;
*/
package org.opendaylight.openflowplugin.droptest;
+import com.google.common.base.Preconditions;
import java.math.BigInteger;
import java.math.BigInteger;
-
-import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction;
+import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.tables.Table;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
-
public class DropTestCommiter extends AbstractDropTest {
private final static Logger LOG = LoggerFactory.getLogger(DropTestProvider.class);
public class DropTestCommiter extends AbstractDropTest {
private final static Logger LOG = LoggerFactory.getLogger(DropTestProvider.class);
.build();
final Flow flow = fb.build();
.build();
final Flow flow = fb.build();
- final DataModificationTransaction transaction = manager.getDataService().beginTransaction();
+ final ReadWriteTransaction transaction = manager.getDataService().newReadWriteTransaction();
LOG.debug("onPacketReceived - About to write flow {}", flow);
LOG.debug("onPacketReceived - About to write flow {}", flow);
- transaction.putConfigurationData(flowInstanceId, flow);
- transaction.commit();
+ transaction.put(LogicalDatastoreType.CONFIGURATION, flowInstanceId, flow);
+ transaction.submit();
LOG.debug("onPacketReceived - About to write flow commited");
}
}
LOG.debug("onPacketReceived - About to write flow commited");
}
}
*/
package org.opendaylight.openflowplugin.droptest;
*/
package org.opendaylight.openflowplugin.droptest;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
-import org.opendaylight.controller.sal.binding.api.data.DataProviderService;
import org.opendaylight.yangtools.concepts.Registration;
import org.opendaylight.yangtools.concepts.Registration;
-import org.opendaylight.yangtools.yang.binding.NotificationListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public class DropTestProvider implements AutoCloseable {
private final static Logger LOG = LoggerFactory.getLogger(DropTestProvider.class);
public class DropTestProvider implements AutoCloseable {
private final static Logger LOG = LoggerFactory.getLogger(DropTestProvider.class);
- private DataProviderService _dataService;
+ private DataBroker _dataService;
private NotificationProviderService _notificationService;
private Registration listenerRegistration;
private final DropTestCommiter commiter = new DropTestCommiter(this);
public DropTestStats getStats() {
private NotificationProviderService _notificationService;
private Registration listenerRegistration;
private final DropTestCommiter commiter = new DropTestCommiter(this);
public DropTestStats getStats() {
- return this.commiter.getStats();
+ return this.commiter.getStats();
public void clearStats() {
public void clearStats() {
- this.commiter.clearStats();
+ this.commiter.clearStats();
-
- public DataProviderService getDataService() {
+
+ public DataBroker getDataService() {
return this._dataService;
}
return this._dataService;
}
- public void setDataService(final DataProviderService dataService) {
+ public void setDataService(final DataBroker dataService) {
this._dataService = dataService;
}
this._dataService = dataService;
}
*/
package org.opendaylight.openflowplugin.outputtest;
*/
package org.opendaylight.openflowplugin.outputtest;
+import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
import java.math.BigInteger;
import java.util.ArrayList;
import java.math.BigInteger;
import java.util.ArrayList;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Future;
-
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.ArrayUtils;
-import org.opendaylight.controller.md.sal.common.api.TransactionStatus;
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.data.DataBrokerService;
-import org.opendaylight.controller.sal.binding.api.data.DataModificationTransaction;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionCaseBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.output.action._case.OutputActionBuilder;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.OutputActionCaseBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.action.output.action._case.OutputActionBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInputBuilder;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.TransmitPacketInputBuilder;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-import org.opendaylight.yangtools.yang.common.RpcResult;
public class OutputTestUtil {
public class OutputTestUtil {
}
public static TransmitPacketInput buildTransmitInputPacket(final String nodeId, final byte[] packValue,
}
public static TransmitPacketInput buildTransmitInputPacket(final String nodeId, final byte[] packValue,
- final String outPort, final String inPort) {
+ final String outPort, final String inPort) {
ArrayList<Byte> list = new ArrayList<Byte>(40);
byte[] msg = new String("sendOutputMsg_TEST").getBytes();
ArrayList<Byte> list = new ArrayList<Byte>(40);
byte[] msg = new String("sendOutputMsg_TEST").getBytes();
index++;
}
NodeRef ref = createNodeRef(nodeId);
index++;
}
NodeRef ref = createNodeRef(nodeId);
NodeBuilder nodeBuilder = createNodeBuilder(nodeId);
FlowBuilder flowBuilder = createFlowBuilder(1235, null, "ping");
NodeBuilder nodeBuilder = createNodeBuilder(nodeId);
FlowBuilder flowBuilder = createFlowBuilder(1235, null, "ping");
- DataBrokerService dataBrokerService = pc.<DataBrokerService>getSALService(DataBrokerService.class);
- DataModificationTransaction modif = dataBrokerService.beginTransaction();
+ DataBroker dataBroker = pc.<DataBroker>getSALService(DataBroker.class);
+ ReadWriteTransaction modif = dataBroker.newReadWriteTransaction();
InstanceIdentifier<Flow> path = InstanceIdentifier.<Nodes>builder(Nodes.class)
.<Node, NodeKey>child(Node.class, nodeBuilder.getKey())
InstanceIdentifier<Flow> path = InstanceIdentifier.<Nodes>builder(Nodes.class)
.<Node, NodeKey>child(Node.class, nodeBuilder.getKey())
.<Flow, FlowKey>child(Flow.class, flowBuilder.getKey())
.build();
.<Flow, FlowKey>child(Flow.class, flowBuilder.getKey())
.build();
- modif.putConfigurationData(path, flowBuilder.build());
- Future<RpcResult<TransactionStatus>> commitFuture = modif.commit();
-
- try {
- RpcResult<TransactionStatus> resutl = commitFuture.get();
- TransactionStatus status = resutl.getResult();
- return "Status of Flow Data Loaded Transaction: " + status;
-
- } catch (InterruptedException e) {
- e.printStackTrace();
- return e.getClass().getName();
- } catch (ExecutionException e) {
- e.printStackTrace();
- return e.getClass().getName();
- }
+ modif.put(LogicalDatastoreType.CONFIGURATION, path, flowBuilder.build());
+ CheckedFuture<Void, TransactionCommitFailedException> commitFuture = modif.submit();
+ final StringBuffer aggregator = new StringBuffer();
+ Futures.addCallback(commitFuture, new FutureCallback<Void>() {
+ @Override
+ public void onSuccess(Void aVoid) {
+ aggregator.append("Status of Flow Data Loaded Transaction: succes ");
+ }
+
+ @Override
+ public void onFailure(Throwable throwable) {
+ aggregator.append(throwable.getClass().getName());
+ }
+ });
+ return aggregator.toString();
}
public static NodeRef createNodeRef(final String nodeId) {
}
public static NodeRef createNodeRef(final String nodeId) {
private static InstructionsBuilder createPingInstructionsBuilder() {
ArrayList<Action> aList = new ArrayList<Action>();
private static InstructionsBuilder createPingInstructionsBuilder() {
ArrayList<Action> aList = new ArrayList<Action>();
- ActionBuilder aBuild = new ActionBuilder();
+ ActionBuilder aBuild = new ActionBuilder();
OutputActionBuilder output = new OutputActionBuilder();
output.setMaxLength(56);
OutputActionBuilder output = new OutputActionBuilder();
output.setMaxLength(56);