From 237944f38b6b08b83dff9dafbf0f7ee3ce9a3752 Mon Sep 17 00:00:00 2001 From: Ed Warnicke Date: Wed, 6 Jul 2016 15:23:34 -0700 Subject: jvpp support for nsh Augment APIs with entry_index for reply, dump and details Squashes: https://gerrit.fd.io/r/#/c/2538/ https://gerrit.fd.io/r/#/c/2118/ https://gerrit.fd.io/r/#/c/1884/ Change-Id: Ibbdc53e2db8ffa5499380f6ce70356c4a401315e Signed-off-by: Marek Gradzki Signed-off-by: Hongjun Ni Signed-off-by: Ed Warnicke --- nsh-plugin/java/jvpp/test/NshFutureApiTest.java | 89 +++++++++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 nsh-plugin/java/jvpp/test/NshFutureApiTest.java (limited to 'nsh-plugin/java/jvpp/test/NshFutureApiTest.java') diff --git a/nsh-plugin/java/jvpp/test/NshFutureApiTest.java b/nsh-plugin/java/jvpp/test/NshFutureApiTest.java new file mode 100644 index 0000000..26f4276 --- /dev/null +++ b/nsh-plugin/java/jvpp/test/NshFutureApiTest.java @@ -0,0 +1,89 @@ +/* + * Copyright (c) 2016 Cisco and/or its affiliates. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at: + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.openvpp.jvpp.nsh.test; + +import java.util.concurrent.Future; +import java.util.Objects; + +import org.openvpp.jvpp.JVpp; +import org.openvpp.jvpp.JVppRegistry; +import org.openvpp.jvpp.JVppRegistryImpl; +import org.openvpp.jvpp.VppCallbackException; +import org.openvpp.jvpp.VppJNIConnection; + +import org.openvpp.jvpp.nsh.dto.*; +import org.openvpp.jvpp.nsh.callback.*; +import org.openvpp.jvpp.nsh.*; +import org.openvpp.jvpp.nsh.future.FutureJVppNshFacade; + +/** + * Tests the Nsh Jvpp wrapper (future API). Run using: + * + * sudo java -cp path/to/jvpp-registry-16.09-SNAPSHOT.jar:path/to/nsh-sfc-16.09-SNAPSHOT.jar org.openvpp.jvpp.nsh.test.NshFutureApiTest + */ +public class NshFutureApiTest { + + public static void main(String[] args) throws Exception { + testFutureApi(); + } + + private static void testFutureApi() throws Exception { + System.out.println("Testing Java future API for NSH plugin"); + JVppRegistry registry = new JVppRegistryImpl("NshFutureApiTest"); + JVpp jvpp = new JVppNshImpl(); + FutureJVppNshFacade jvppFacade = new FutureJVppNshFacade(registry, jvpp); + + + testNshAddDelEntry(jvppFacade); + testNshEntryDump(jvppFacade); + + System.out.println("Disconnecting..."); + registry.close(); + Thread.sleep(1000); + } + + private static void testNshAddDelEntry(final FutureJVppNshFacade jvppFacade) throws Exception { + System.out.println("Sending NshAddDelEntry request..."); + final NshAddDelEntry request = new NshAddDelEntry(); + + request.isAdd = 1; + int nsp = 1; + int nsi = 2; + request.nspNsi = (nsp<<8) | nsi; + request.mdType = 1; + request.verOC = 0; + request.length = 6; + request.nextProtocol = 1; + + final Future replyFuture = jvppFacade.nshAddDelEntry(request).toCompletableFuture(); + final NshAddDelEntryReply reply = replyFuture.get(); + + System.out.printf("Received NshAddDelEntryReply: context=%d\n", reply.context); + } + + private static void testNshEntryDump(final FutureJVppNshFacade jvppFacade) throws Exception { + System.out.println("Sending NshEntryDump request..."); + final Future replyFuture = jvppFacade.nshEntryDump(new NshEntryDump()).toCompletableFuture(); + final NshEntryDetailsReplyDump reply = replyFuture.get(); + for (NshEntryDetails details : reply.nshEntryDetails) { + Objects.requireNonNull(details, "reply.nshEntryDetails contains null element!"); + System.out.printf("Received NshEntryDetails: context=%d, nspNsi=%d, mdType=%d, verOC=%d, length=%d, nextProtocol=%d\n", + details.context, details.nspNsi, details.mdType, details.verOC, details.length, details.nextProtocol); + } + } + +} -- cgit 1.2.3-korg