ioam: pot plugin - generate java bindings for ioam-pot plugin
Change-Id: I078bbc9ea495b395ade499fe3ad7d98dd766f2be Signed-off-by: Sagar Srivastav <sagsriva@cisco.com>
This commit is contained in:
Sagar Srivastav
committed by
Damjan Marion
Damjan Marion
parent
2c4dbff25b
commit
5c3bfab786
@ -147,11 +147,11 @@ install-data-hook:
|
||||
jvpp_registry_root = ../../vpp-api/java
|
||||
jvpp_registry_version = 17.01
|
||||
jioam_trace_jarfile = jvpp-ioam-trace-$(PACKAGE_VERSION).jar
|
||||
jvpp_package_dir = io/fd/vpp/jvpp/ioamtrace
|
||||
jvpp_trace_package_dir = io/fd/vpp/jvpp/ioamtrace
|
||||
jvpp_root = ioam/jvpp
|
||||
jvpp_target_dir = target
|
||||
jvpp_target = $(jvpp_root)/$(jvpp_target_dir)
|
||||
api_file=$(srcdir)/ioam/lib-trace/trace.api
|
||||
trace_api_file=$(srcdir)/ioam/lib-trace/trace.api
|
||||
|
||||
|
||||
lib_LTLIBRARIES = libjvpp_ioamtrace.la
|
||||
@ -166,31 +166,81 @@ BUILT_SOURCES += $(jvpp_root)/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h
|
||||
$(jvpp_root)/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h: ioam_trace.api.json
|
||||
dir=`pwd`; \
|
||||
mkdir -p $(jvpp_target); \
|
||||
mkdir -p $(jvpp_root)/$(jvpp_package_dir); \
|
||||
cd $(jvpp_root)/$(jvpp_package_dir); \
|
||||
mkdir -p $(jvpp_root)/$(jvpp_trace_package_dir); \
|
||||
cd $(jvpp_root)/$(jvpp_trace_package_dir); \
|
||||
mkdir -p dto future callfacade callback notification test; \
|
||||
@srcdir@/$(jvpp_registry_root)/jvpp/gen/jvpp_gen.py -i $${dir}/ioam_trace.api.json --plugin_name ioamtrace; \
|
||||
cd -; \
|
||||
mv -f $(jvpp_root)/$(jvpp_package_dir)/jvpp_ioamtrace_gen.h $(jvpp_root)/jvpp_ioam_trace_gen.h; \
|
||||
cp $(srcdir)/$(jvpp_root)/$(jvpp_package_dir)/test/*.java $(jvpp_root)/$(jvpp_package_dir)/test/; \
|
||||
mv -f $(jvpp_root)/$(jvpp_trace_package_dir)/jvpp_ioamtrace_gen.h $(jvpp_root)/jvpp_ioam_trace_gen.h; \
|
||||
cp $(srcdir)/$(jvpp_root)/$(jvpp_trace_package_dir)/test/*.java $(jvpp_root)/$(jvpp_trace_package_dir)/test/; \
|
||||
cd $(jvpp_root); \
|
||||
$(JAVAC) -classpath .:$(jvpp_target_dir):../../$(jvpp_registry_root)/jvpp-registry-$(jvpp_registry_version).jar -d $(jvpp_target_dir) $(jvpp_package_dir)/*.java \
|
||||
$(jvpp_package_dir)/dto/*.java \
|
||||
$(jvpp_package_dir)/callback/*.java \
|
||||
$(jvpp_package_dir)/notification/*.java \
|
||||
$(jvpp_package_dir)/future/*.java \
|
||||
$(jvpp_package_dir)/callfacade/*.java \
|
||||
$(jvpp_package_dir)/test/*.java \
|
||||
$(JAVAC) -classpath .:$(jvpp_target_dir):../../$(jvpp_registry_root)/jvpp-registry-$(jvpp_registry_version).jar -d $(jvpp_target_dir) $(jvpp_trace_package_dir)/*.java \
|
||||
$(jvpp_trace_package_dir)/dto/*.java \
|
||||
$(jvpp_trace_package_dir)/callback/*.java \
|
||||
$(jvpp_trace_package_dir)/notification/*.java \
|
||||
$(jvpp_trace_package_dir)/future/*.java \
|
||||
$(jvpp_trace_package_dir)/callfacade/*.java \
|
||||
$(jvpp_trace_package_dir)/test/*.java \
|
||||
|| (echo "ioam trace jvpp compilation failed: $$?"; exit 1); \
|
||||
$(JAVAH) -classpath .:$(jvpp_target_dir):../../$(jvpp_registry_root)/jvpp-registry-$(jvpp_registry_version).jar -d . io.fd.vpp.jvpp.ioamtrace.JVppIoamtraceImpl ;
|
||||
|
||||
$(jioam_trace_jarfile): libjvpp_ioamtrace.la
|
||||
cp .libs/libjvpp_ioamtrace.so.0.0.0 $(jvpp_target); \
|
||||
cd $(jvpp_target); \
|
||||
$(JAR) cfv $(JARFLAGS) ../../../$@ libjvpp_ioamtrace.so.0.0.0 $(jvpp_package_dir)/* ; cd ..;
|
||||
$(JAR) cfv $(JARFLAGS) ../../../$@ libjvpp_ioamtrace.so.0.0.0 $(jvpp_trace_package_dir)/* ; cd ..;
|
||||
|
||||
ioam_trace.api.json:
|
||||
@echo " jIoam_trace API"; \
|
||||
vppapigen --input $(api_file) --json ioam_trace.api.json;
|
||||
vppapigen --input $(trace_api_file) --json ioam_trace.api.json;
|
||||
|
||||
all-local: $(jioam_trace_jarfile)
|
||||
|
||||
|
||||
jioam_pot_jarfile = jvpp-ioam-pot-$(PACKAGE_VERSION).jar
|
||||
jvpp_pot_package_dir = io/fd/vpp/jvpp/ioampot
|
||||
jvpp_root = ioam/jvpp
|
||||
jvpp_target_dir = target
|
||||
jvpp_target = $(jvpp_root)/$(jvpp_target_dir)
|
||||
pot_api_file=$(srcdir)/ioam/lib-pot/pot.api
|
||||
|
||||
|
||||
lib_LTLIBRARIES += libjvpp_ioampot.la
|
||||
libjvpp_ioampot_la_SOURCES = ioam/lib-pot/pot.api.h ioam/lib-pot/jvpp_ioam_pot.c ioam/jvpp/io_fd_vpp_jvpp_ioam_pot_JVppIoamPotImpl.h
|
||||
libjvpp_ioampot_la_LIBADD = -lvlibmemoryclient -lvlibapi -lvppinfra \
|
||||
-lpthread -lm -lrt -L$(jvpp_registry_root)/.libs -ljvpp_common
|
||||
libjvpp_ioampot_la_LDFLAGS = -module
|
||||
libjvpp_ioampot_la_CPPFLAGS = -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux -I../ -I$(srcdir)/../
|
||||
|
||||
BUILT_SOURCES += $(jvpp_root)/io_fd_vpp_jvpp_ioampot_JVppIoampotImpl.h
|
||||
|
||||
$(jvpp_root)/io_fd_vpp_jvpp_ioampot_JVppIoampotImpl.h: ioam_pot.api.json
|
||||
dir=`pwd`; \
|
||||
mkdir -p $(jvpp_target); \
|
||||
mkdir -p $(jvpp_root)/$(jvpp_pot_package_dir); \
|
||||
cd $(jvpp_root)/$(jvpp_pot_package_dir); \
|
||||
mkdir -p dto future callfacade callback notification test; \
|
||||
@srcdir@/$(jvpp_registry_root)/jvpp/gen/jvpp_gen.py -i $${dir}/ioam_pot.api.json --plugin_name ioampot; \
|
||||
cd -; \
|
||||
mv -f $(jvpp_root)/$(jvpp_pot_package_dir)/jvpp_ioampot_gen.h $(jvpp_root)/jvpp_ioam_pot_gen.h; \
|
||||
cp $(srcdir)/$(jvpp_root)/$(jvpp_pot_package_dir)/test/*.java $(jvpp_root)/$(jvpp_pot_package_dir)/test/; \
|
||||
cd $(jvpp_root); \
|
||||
$(JAVAC) -classpath .:$(jvpp_target_dir):../../$(jvpp_registry_root)/jvpp-registry-$(jvpp_registry_version).jar -d $(jvpp_target_dir) $(jvpp_pot_package_dir)/*.java \
|
||||
$(jvpp_pot_package_dir)/dto/*.java \
|
||||
$(jvpp_pot_package_dir)/callback/*.java \
|
||||
$(jvpp_pot_package_dir)/notification/*.java \
|
||||
$(jvpp_pot_package_dir)/future/*.java \
|
||||
$(jvpp_pot_package_dir)/callfacade/*.java \
|
||||
$(jvpp_pot_package_dir)/test/*.java \
|
||||
|| (echo "ioam pot jvpp compilation failed: $$?"; exit 1); \
|
||||
$(JAVAH) -classpath .:$(jvpp_target_dir):../../$(jvpp_registry_root)/jvpp-registry-$(jvpp_registry_version).jar -d . io.fd.vpp.jvpp.ioampot.JVppIoampotImpl ;
|
||||
|
||||
$(jioam_pot_jarfile): libjvpp_ioampot.la
|
||||
cp .libs/libjvpp_ioampot.so.0.0.0 $(jvpp_target); \
|
||||
cd $(jvpp_target); \
|
||||
$(JAR) cfv $(JARFLAGS) ../../../$@ libjvpp_ioampot.so.0.0.0 $(jvpp_pot_package_dir)/* ; cd ..;
|
||||
|
||||
ioam_pot.api.json:
|
||||
@echo " jIoam_pot API"; \
|
||||
vppapigen --input $(pot_api_file) --json ioam_pot.api.json;
|
||||
|
||||
all-local: $(jioam_pot_jarfile)
|
||||
|
||||
@ -0,0 +1,75 @@
|
||||
/*
|
||||
* 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 io.fd.vpp.jvpp.ioampot.test;
|
||||
|
||||
import io.fd.vpp.jvpp.JVpp;
|
||||
import io.fd.vpp.jvpp.JVppRegistry;
|
||||
import io.fd.vpp.jvpp.JVppRegistryImpl;
|
||||
import io.fd.vpp.jvpp.VppCallbackException;
|
||||
import io.fd.vpp.jvpp.ioampot.JVppIoampotImpl;
|
||||
import io.fd.vpp.jvpp.ioampot.callback.PotProfileAddCallback;
|
||||
import io.fd.vpp.jvpp.ioampot.dto.PotProfileAdd;
|
||||
import io.fd.vpp.jvpp.ioampot.dto.PotProfileAddReply;
|
||||
|
||||
public class IoamPotApiTest {
|
||||
|
||||
static class IoamPotTestCallback implements PotProfileAddCallback {
|
||||
|
||||
@Override
|
||||
public void onPotProfileAddReply(final PotProfileAddReply reply) {
|
||||
System.out.printf("Received PotProfileAddReply reply: context=%d%n",
|
||||
reply.context);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onError(VppCallbackException ex) {
|
||||
System.out.printf("Received onError exception: call=%s, context=%d, retval=%d%n", ex.getMethodName(),
|
||||
ex.getCtxId(), ex.getErrorCode());
|
||||
}
|
||||
}
|
||||
|
||||
public static void main(String[] args) throws Exception {
|
||||
ioamPotTestApi();
|
||||
}
|
||||
|
||||
private static void ioamPotTestApi() throws Exception {
|
||||
System.out.println("Testing Java API for ioam pot plugin");
|
||||
try (final JVppRegistry registry = new JVppRegistryImpl("ioamPotApiTest");
|
||||
final JVpp jvpp = new JVppIoampotImpl()) {
|
||||
registry.register(jvpp, new IoamPotTestCallback());
|
||||
|
||||
System.out.println("Sending ioam pot profile add request...");
|
||||
PotProfileAdd request = new PotProfileAdd();
|
||||
request.id = 0;
|
||||
request.validator = 4;
|
||||
request.secretKey = 1;
|
||||
request.secretShare = 2;
|
||||
request.prime = 1234;
|
||||
request.maxBits = 53;
|
||||
request.lpc = 1234;
|
||||
request.polynomialPublic = 1234;
|
||||
request.listNameLen = (byte)"test pot profile".getBytes().length;
|
||||
request.listName = "test pot profile".getBytes();
|
||||
final int result = jvpp.send(request);
|
||||
System.out.printf("PotProfileAdd send result = %d%n", result);
|
||||
|
||||
Thread.sleep(1000);
|
||||
|
||||
System.out.println("Disconnecting...");
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1 @@
|
||||
sudo java -cp build-vpp_debug-native/vpp-api/java/jvpp-registry-16.12.jar:build-vpp_debug-native/plugins/ioam-plugin/jvpp-ioam-pot-1.0.jar io.fd.vpp.jvpp.ioampot.test.IoamPotApiTest
|
||||
124
plugins/ioam-plugin/ioam/lib-pot/jvpp_ioam_pot.c
Normal file
124
plugins/ioam-plugin/ioam/lib-pot/jvpp_ioam_pot.c
Normal file
@ -0,0 +1,124 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#include <vnet/vnet.h>
|
||||
|
||||
#include <ioam/lib-pot/pot_msg_enum.h>
|
||||
#define vl_typedefs /* define message structures */
|
||||
#include <ioam/lib-pot/pot_all_api_h.h>
|
||||
#undef vl_typedefs
|
||||
|
||||
#define vl_endianfun
|
||||
#include <ioam/lib-pot/pot_all_api_h.h>
|
||||
#undef vl_endianfun
|
||||
|
||||
#define vl_print(handle, ...)
|
||||
#define vl_printfun
|
||||
#include <ioam/lib-pot/pot_all_api_h.h>
|
||||
#undef vl_printfun
|
||||
|
||||
/* Get the API version number */
|
||||
#define vl_api_version(n,v) static u32 api_version=(v);
|
||||
#include <ioam/lib-pot/pot_all_api_h.h>
|
||||
#undef vl_api_version
|
||||
|
||||
#include <vnet/api_errno.h>
|
||||
#include <vlibapi/api.h>
|
||||
#include <vlibmemory/api.h>
|
||||
|
||||
#if VPPJNI_DEBUG == 1
|
||||
#define DEBUG_LOG(...) clib_warning(__VA_ARGS__)
|
||||
#else
|
||||
#define DEBUG_LOG(...)
|
||||
#endif
|
||||
|
||||
#include <jvpp-common/jvpp_common.h>
|
||||
|
||||
#include "ioam/jvpp/io_fd_vpp_jvpp_ioampot_JVppIoampotImpl.h"
|
||||
#include "jvpp_ioam_pot.h"
|
||||
#include "ioam/jvpp/jvpp_ioam_pot_gen.h"
|
||||
|
||||
/*
|
||||
* Class: io_fd_vpp_jvpp_ioampot_JVppIoampotImpl
|
||||
* Method: init0
|
||||
* Signature: (JI)V
|
||||
*/
|
||||
JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_init0
|
||||
(JNIEnv *env, jclass clazz, jobject callback, jlong queue_address, jint my_client_index) {
|
||||
ioampot_main_t * plugin_main = &ioampot_main;
|
||||
u8 * name;
|
||||
clib_warning ("Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_init0");
|
||||
|
||||
plugin_main->my_client_index = my_client_index;
|
||||
plugin_main->vl_input_queue = (unix_shared_memory_queue_t *)queue_address;
|
||||
|
||||
name = format (0, "ioam_pot_%08x%c", api_version, 0);
|
||||
plugin_main->msg_id_base = vl_client_get_first_plugin_msg_id ((char *) name);
|
||||
|
||||
if (plugin_main->msg_id_base == (u16) ~0) {
|
||||
jclass exClass = (*env)->FindClass(env, "java/lang/IllegalStateException");
|
||||
(*env)->ThrowNew(env, exClass, "ioam_pot plugin is not loaded in VPP");
|
||||
} else {
|
||||
plugin_main->callbackObject = (*env)->NewGlobalRef(env, callback);
|
||||
plugin_main->callbackClass = (jclass)(*env)->NewGlobalRef(env, (*env)->GetObjectClass(env, callback));
|
||||
|
||||
#define _(N,n) \
|
||||
vl_msg_api_set_handlers(VL_API_##N + plugin_main->msg_id_base, #n, \
|
||||
vl_api_##n##_t_handler, \
|
||||
vl_noop_handler, \
|
||||
vl_api_##n##_t_endian, \
|
||||
vl_api_##n##_t_print, \
|
||||
sizeof(vl_api_##n##_t), 1);
|
||||
foreach_api_reply_handler;
|
||||
#undef _
|
||||
}
|
||||
}
|
||||
|
||||
JNIEXPORT void JNICALL Java_io_fd_vpp_jvpp_ioampot_JVppIoampotImpl_close0
|
||||
(JNIEnv *env, jclass clazz) {
|
||||
ioampot_main_t * plugin_main = &ioampot_main;
|
||||
|
||||
// cleanup:
|
||||
(*env)->DeleteGlobalRef(env, plugin_main->callbackClass);
|
||||
(*env)->DeleteGlobalRef(env, plugin_main->callbackObject);
|
||||
|
||||
plugin_main->callbackClass = NULL;
|
||||
plugin_main->callbackObject = NULL;
|
||||
}
|
||||
|
||||
/* Attach thread to JVM and cache class references when initiating JVPP iOAM POT */
|
||||
jint JNI_OnLoad(JavaVM *vm, void *reserved) {
|
||||
JNIEnv* env;
|
||||
|
||||
if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
|
||||
return JNI_EVERSION;
|
||||
}
|
||||
|
||||
if (cache_class_references(env) != 0) {
|
||||
clib_warning ("Failed to cache class references\n");
|
||||
return JNI_ERR;
|
||||
}
|
||||
|
||||
return JNI_VERSION_1_8;
|
||||
}
|
||||
|
||||
/* Clean up cached references when disposing JVPP iOAM POT */
|
||||
void JNI_OnUnload(JavaVM *vm, void *reserved) {
|
||||
JNIEnv* env;
|
||||
if ((*vm)->GetEnv(vm, (void**) &env, JNI_VERSION_1_8) != JNI_OK) {
|
||||
return;
|
||||
}
|
||||
delete_class_references(env);
|
||||
}
|
||||
45
plugins/ioam-plugin/ioam/lib-pot/jvpp_ioam_pot.h
Normal file
45
plugins/ioam-plugin/ioam/lib-pot/jvpp_ioam_pot.h
Normal file
@ -0,0 +1,45 @@
|
||||
/*
|
||||
* 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.
|
||||
*/
|
||||
#ifndef __included_jvpp_ioam_pot_h__
|
||||
#define __included_jvpp_ioam_pot_h__
|
||||
|
||||
#include <vnet/vnet.h>
|
||||
#include <vnet/ip/ip.h>
|
||||
#include <vnet/api_errno.h>
|
||||
#include <vlibapi/api.h>
|
||||
#include <vlibmemory/api.h>
|
||||
#include <jni.h>
|
||||
|
||||
/* Global state for JVPP-IOAM-TRACE */
|
||||
typedef struct {
|
||||
/* Base message index for the nsh plugin */
|
||||
u16 msg_id_base;
|
||||
|
||||
/* Pointer to shared memory queue */
|
||||
unix_shared_memory_queue_t * vl_input_queue;
|
||||
|
||||
/* VPP api client index */
|
||||
u32 my_client_index;
|
||||
|
||||
/* Callback object and class references enabling asynchronous Java calls */
|
||||
jobject callbackObject;
|
||||
jclass callbackClass;
|
||||
|
||||
} ioampot_main_t;
|
||||
|
||||
ioampot_main_t ioampot_main __attribute__((aligned (64)));
|
||||
|
||||
|
||||
#endif /* __included_jvpp_ioam_pot_h__ */
|
||||
@ -227,7 +227,7 @@ static clib_error_t * pot_init (vlib_main_t * vm)
|
||||
|
||||
bzero(sm, sizeof(pot_main));
|
||||
(void)pot_util_init();
|
||||
name = format (0, "pot_%08x%c", api_version, 0);
|
||||
name = format (0, "ioam_pot_%08x%c", api_version, 0);
|
||||
|
||||
/* Ask for a correctly-sized block of API message decode slots */
|
||||
sm->msg_id_base = vl_msg_api_get_msg_ids
|
||||
|
||||
Reference in New Issue
Block a user