diff options
| -rw-r--r-- | plugins/ioam-plugin/Makefile.am | 2 | ||||
| -rw-r--r-- | plugins/snat-plugin/Makefile.am | 2 | ||||
| -rwxr-xr-x | vpp-api/java/jvpp/gen/jvpp_gen.py | 6 | ||||
| -rw-r--r-- | vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py | 5 |
4 files changed, 5 insertions, 10 deletions
diff --git a/plugins/ioam-plugin/Makefile.am b/plugins/ioam-plugin/Makefile.am index 3f1edb10910..cd70f325f27 100644 --- a/plugins/ioam-plugin/Makefile.am +++ b/plugins/ioam-plugin/Makefile.am @@ -164,7 +164,7 @@ $(jvpp_root)/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h: defs_ioam_trace_papi. mkdir -p $(jvpp_root)/$(jvpp_package_dir); \ cd $(jvpp_root)/$(jvpp_package_dir); \ mkdir -p dto future callfacade callback notification test; \ - @srcdir@/$(jvpp_registry_root)/jvpp/gen/jvpp_gen.py -i $${dir}/defs_ioam_trace_papi.py --plugin_name ioamtrace --control_ping_class IoamTraceControlPing; \ + @srcdir@/$(jvpp_registry_root)/jvpp/gen/jvpp_gen.py -i $${dir}/defs_ioam_trace_papi.py --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/; \ diff --git a/plugins/snat-plugin/Makefile.am b/plugins/snat-plugin/Makefile.am index 081340b5ff1..9f41193a708 100644 --- a/plugins/snat-plugin/Makefile.am +++ b/plugins/snat-plugin/Makefile.am @@ -88,7 +88,7 @@ $(jvpp_root)/io_fd_vpp_jvpp_snat_JVppSnatImpl.h: defs_snat_papi.py mkdir -p $(jvpp_root)/$(jvpp_package_dir); \ cd $(jvpp_root)/$(jvpp_package_dir); \ mkdir -p dto future callfacade callback notification test; \ - @srcdir@/$(jvpp_registry_root)/jvpp/gen/jvpp_gen.py -i $${dir}/defs_snat_papi.py --plugin_name snat --control_ping_class SnatControlPing; \ + @srcdir@/$(jvpp_registry_root)/jvpp/gen/jvpp_gen.py -i $${dir}/defs_snat_papi.py --plugin_name snat; \ cd -; \ mv -f $(jvpp_root)/$(jvpp_package_dir)/jvpp_snat_gen.h $(jvpp_root)/jvpp_snat_gen.h; \ cp $(srcdir)/$(jvpp_root)/$(jvpp_package_dir)/test/*.java $(jvpp_root)/$(jvpp_package_dir)/test/; \ diff --git a/vpp-api/java/jvpp/gen/jvpp_gen.py b/vpp-api/java/jvpp/gen/jvpp_gen.py index 3be83824e9c..1b9ceff8078 100755 --- a/vpp-api/java/jvpp/gen/jvpp_gen.py +++ b/vpp-api/java/jvpp/gen/jvpp_gen.py @@ -42,7 +42,6 @@ from jvppgen import util parser = argparse.ArgumentParser(description='VPP Java API generator') parser.add_argument('-i', action="store", dest="inputfile") parser.add_argument('--plugin_name', action="store", dest="plugin_name") -parser.add_argument('--control_ping_class', action="store", dest="control_ping_class", default="ControlPing") args = parser.parse_args() sys.path.append(".") @@ -55,8 +54,6 @@ inputfile = inputfile.replace('.py', '') print "inputfile %s" % inputfile plugin_name = args.plugin_name print "plugin_name %s" % plugin_name -control_ping_class = args.control_ping_class -print "control_ping_class %s" % control_ping_class sys.path.append(importdir) cfg = importlib.import_module(inputfile, package=None) @@ -131,7 +128,6 @@ notification_package = 'notification' future_package = 'future' # TODO find better package name callback_facade_package = 'callfacade' -control_ping_class_fqn = "%s.%s.%s" % (plugin_package, dto_package, control_ping_class) types_list, types_name = get_definitions(cfg.types) @@ -139,7 +135,7 @@ types_gen.generate_types(types_list, plugin_package, types_package, inputfile) func_list, func_name = get_definitions(cfg.messages) dto_gen.generate_dtos(func_list, base_package, plugin_package, plugin_name.title(), dto_package, args.inputfile) -jvpp_impl_gen.generate_jvpp(func_list, base_package, plugin_package, plugin_name, control_ping_class_fqn, dto_package, args.inputfile) +jvpp_impl_gen.generate_jvpp(func_list, base_package, plugin_package, plugin_name, dto_package, args.inputfile) callback_gen.generate_callbacks(func_list, base_package, plugin_package, plugin_name.title(), callback_package, dto_package, args.inputfile) notification_gen.generate_notification_registry(func_list, base_package, plugin_package, plugin_name.title(), notification_package, callback_package, dto_package, args.inputfile) jvpp_c_gen.generate_jvpp(func_list, plugin_name, args.inputfile) diff --git a/vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py b/vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py index 16c84ce54e8..4146c1416ba 100644 --- a/vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py +++ b/vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py @@ -160,7 +160,7 @@ no_arg_method_impl_template = Template(""" public final int $name() throws io """) -def generate_jvpp(func_list, base_package, plugin_package, plugin_name_underscore, control_ping_class, dto_package, inputfile): +def generate_jvpp(func_list, base_package, plugin_package, plugin_name_underscore, dto_package, inputfile): """ Generates JVpp interface and JNI implementation """ print "Generating JVpp" plugin_name = util.underscore_to_camelcase_upper(plugin_name_underscore) @@ -214,7 +214,6 @@ def generate_jvpp(func_list, base_package, plugin_package, plugin_name_underscor plugin_package=plugin_package, plugin_name=plugin_name, plugin_name_underscore=plugin_name_underscore, - dto_package=dto_package, - control_ping_class=control_ping_class)) + dto_package=dto_package)) jvpp_file.flush() jvpp_file.close() |