ligang/vpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove unused jvpp dependency on plugins' control_ping

Browse Source 
Change-Id: I6ebb69443e79e60c7ce6afded6a2d3af85048e6e
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
This commit is contained in:
Marek Gradzki
2016-11-03 13:33:07 +01:00
committed by Damjan Marion
parent cb4cda6912
commit 74e2efad55
4 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/ioam-plugin/Makefile.am
View File

@ -164,7 +164,7 @@ $(jvpp_root)/io_fd_vpp_jvpp_ioamtrace_JVppIoamtraceImpl.h: defs_ioam_trace_papi.
mkdir -p $(jvpp_root)/$(jvpp_package_dir); \ mkdir -p $(jvpp_root)/$(jvpp_package_dir); \
cd $(jvpp_root)/$(jvpp_package_dir); \ cd $(jvpp_root)/$(jvpp_package_dir); \
mkdir -p dto future callfacade callback notification test; \ 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 -; \ cd -; \
mv -f $(jvpp_root)/$(jvpp_package_dir)/jvpp_ioamtrace_gen.h $(jvpp_root)/jvpp_ioam_trace_gen.h; \ 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/; \ cp $(srcdir)/$(jvpp_root)/$(jvpp_package_dir)/test/*.java $(jvpp_root)/$(jvpp_package_dir)/test/; \

2
plugins/snat-plugin/Makefile.am
View File

@ -88,7 +88,7 @@ $(jvpp_root)/io_fd_vpp_jvpp_snat_JVppSnatImpl.h: defs_snat_papi.py
mkdir -p $(jvpp_root)/$(jvpp_package_dir); \ mkdir -p $(jvpp_root)/$(jvpp_package_dir); \
cd $(jvpp_root)/$(jvpp_package_dir); \ cd $(jvpp_root)/$(jvpp_package_dir); \
mkdir -p dto future callfacade callback notification test; \ 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 -; \ cd -; \
mv -f $(jvpp_root)/$(jvpp_package_dir)/jvpp_snat_gen.h $(jvpp_root)/jvpp_snat_gen.h; \ 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/; \ cp $(srcdir)/$(jvpp_root)/$(jvpp_package_dir)/test/*.java $(jvpp_root)/$(jvpp_package_dir)/test/; \

6
vpp-api/java/jvpp/gen/jvpp_gen.py
View File

@ -42,7 +42,6 @@ from jvppgen import util
parser = argparse.ArgumentParser(description='VPP Java API generator') parser = argparse.ArgumentParser(description='VPP Java API generator')
parser.add_argument('-i', action="store", dest="inputfile") parser.add_argument('-i', action="store", dest="inputfile")
parser.add_argument('--plugin_name', action="store", dest="plugin_name") 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() args = parser.parse_args()
sys.path.append(".") sys.path.append(".")
@ -55,8 +54,6 @@ inputfile = inputfile.replace('.py', '')
print "inputfile %s" % inputfile print "inputfile %s" % inputfile
plugin_name = args.plugin_name plugin_name = args.plugin_name
print "plugin_name %s" % 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) sys.path.append(importdir)
cfg = importlib.import_module(inputfile, package=None) cfg = importlib.import_module(inputfile, package=None)
@ -131,7 +128,6 @@ notification_package = 'notification'
future_package = 'future' future_package = 'future'
# TODO find better package name # TODO find better package name
callback_facade_package = 'callfacade' 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) 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) 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) 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) 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) 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) jvpp_c_gen.generate_jvpp(func_list, plugin_name, args.inputfile)

5
vpp-api/java/jvpp/gen/jvppgen/jvpp_impl_gen.py
View File

@ -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 """ """ Generates JVpp interface and JNI implementation """
print "Generating JVpp" print "Generating JVpp"
plugin_name = util.underscore_to_camelcase_upper(plugin_name_underscore) 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_package=plugin_package,
plugin_name=plugin_name, plugin_name=plugin_name,
plugin_name_underscore=plugin_name_underscore, plugin_name_underscore=plugin_name_underscore,
dto_package=dto_package, dto_package=dto_package))
control_ping_class=control_ping_class))
jvpp_file.flush() jvpp_file.flush()
jvpp_file.close() jvpp_file.close()