P4runtime test utility app
Used for quick testing of P4Runtime with real devices.
To be removed before release.
Change-Id: Ieca17493e4b012ef748709014b62ebe54ba76dce
diff --git a/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeControllerImpl.java b/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeControllerImpl.java
index ca78652..d134a22 100644
--- a/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeControllerImpl.java
+++ b/protocols/p4runtime/ctl/src/main/java/org/onosproject/p4runtime/ctl/P4RuntimeControllerImpl.java
@@ -63,7 +63,7 @@
private final Map<DeviceId, ReadWriteLock> deviceLocks = Maps.newConcurrentMap();
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- protected GrpcController grpcController;
+ public GrpcController grpcController;
@Activate
public void activate() {
diff --git a/protocols/p4runtime/ctl/src/test/java/org/onosproject/p4runtime/ctl/TableEntryEncoderTest.java b/protocols/p4runtime/ctl/src/test/java/org/onosproject/p4runtime/ctl/TableEntryEncoderTest.java
index 92ad3ca..e4f00dc 100644
--- a/protocols/p4runtime/ctl/src/test/java/org/onosproject/p4runtime/ctl/TableEntryEncoderTest.java
+++ b/protocols/p4runtime/ctl/src/test/java/org/onosproject/p4runtime/ctl/TableEntryEncoderTest.java
@@ -171,63 +171,4 @@
// TODO: improve, assert other field match types (ternary, LPM)
}
-
-// @Test
-// public void testRuntime() throws ExecutionException, InterruptedException,
-// PiPipelineInterpreter.PiInterpreterException, IllegalAccessException, InstantiationException {
-//
-// // FIXME: remove me.
-//
-// P4RuntimeControllerImpl controller = new P4RuntimeControllerImpl();
-// GrpcControllerImpl grpcController = new GrpcControllerImpl();
-// controller.grpcController = grpcController;
-// GrpcControllerImpl.enableMessageLog = true;
-// grpcController.activate();
-// DeviceId deviceId = DeviceId.deviceId("dummy:1");
-//
-// ManagedChannelBuilder channelBuilder = NettyChannelBuilder
-// .forAddress("192.168.56.102", 59975)
-// .usePlaintext(true);
-//
-// assert (controller.createClient(deviceId, 1, channelBuilder));
-//
-// P4RuntimeClient client = controller.getClient(deviceId);
-//
-// assert(client.setPipelineConfig(defaultPipeconf, PiPipeconf.ExtensionType.BMV2_JSON).get());
-//
-// assert(client.initStreamChannel().get());
-//
-// log.info("++++++++++++++++++++++++++++");
-//
-// PiPipelineInterpreter interpreter = (PiPipelineInterpreter) defaultPipeconf
-// .implementation(PiPipelineInterpreter.class)
-// .orElse(null)
-// .newInstance();
-//
-// TrafficTreatment t = DefaultTrafficTreatment.builder()
-// .setOutput(PortNumber.portNumber(830L)).build();
-// byte[] payload = new byte[1000];
-//// payload[0] = 1;
-// Arrays.fill( payload, (byte) 1 );
-//
-// OutboundPacket packet = new DefaultOutboundPacket(
-// deviceId, t, ByteBuffer.wrap(payload));
-//
-//
-// Collection<PiPacketOperation> operations = interpreter.mapOutboundPacket(packet,defaultPipeconf);
-// log.info("{}", operations);
-// operations.forEach(piPacketOperation -> {
-// try {
-// client.packetOut(piPacketOperation, defaultPipeconf).get();
-// } catch (InterruptedException | ExecutionException e) {
-// log.error("{}",e);
-// }
-// });
-//
-//// assert(client.dumpTable(PiTableId.of(TABLE_0), defaultPipeconf).get().size() == 0);
-//
-//// assert(client.writeTableEntries(Lists.newArrayList(piTableEntry), INSERT, defaultPipeconf).get());
-//
-//// assert(client.dumpTable(PiTableId.of(TABLE_0), defaultPipeconf).get().size() == 1);
-// }
}