diff options
Diffstat (limited to 'scripts/automation/trex_control_plane/stl/services/scapy_server/scapy_service.py')
| -rwxr-xr-x | scripts/automation/trex_control_plane/stl/services/scapy_server/scapy_service.py | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/scripts/automation/trex_control_plane/stl/services/scapy_server/scapy_service.py b/scripts/automation/trex_control_plane/stl/services/scapy_server/scapy_service.py index aa5053d5..93ca7502 100755 --- a/scripts/automation/trex_control_plane/stl/services/scapy_server/scapy_service.py +++ b/scripts/automation/trex_control_plane/stl/services/scapy_server/scapy_service.py @@ -11,7 +11,7 @@ import hashlib import base64 import numbers import random -import inspect +from inspect import getdoc import json from pprint import pprint @@ -397,9 +397,10 @@ class Scapy_service(Scapy_service_api): self.protocol_fields_fe_aware = {} self.instruction_parameter_meta_definitions = [] self.field_engine_parameter_meta_definitions = [] + self.field_engine_instructions_meta = [] self.field_engine_instruction_expressions = [] self._load_definitions_from_json() - self._load_instruction_parameter_definitions_from_json() + self._load_field_engine_meta_from_json() def _load_definitions_from_json(self): # load protocol definitions from a json file @@ -409,19 +410,25 @@ class Scapy_service(Scapy_service_api): for protocol in protocols: self.protocol_definitions[ protocol['id'] ] = protocol - def _load_instruction_parameter_definitions_from_json(self): + def _load_field_engine_meta_from_json(self): # load protocol definitions from a json file self.instruction_parameter_meta_definitions = [] self.protocol_fields_fe_aware = {} self.field_engine_parameter_meta_definitions = [] with open('field_engine.json', 'r') as f: metas = json.load(f) - for meta in metas["instruction_params_meta"]: - self.instruction_parameter_meta_definitions.append(meta) + self.instruction_parameter_meta_definitions = metas["instruction_params_meta"] + self.field_engine_instructions_meta = metas["instructions"] + self._append_intructions_help() self.protocol_fields_fe_aware = metas["protocol_fields"] self.field_engine_parameter_meta_definitions = metas["global_params_meta"] + def _append_intructions_help(self): + for instruction_meta in self.field_engine_instructions_meta: + clazz = eval(instruction_meta['id']) + instruction_meta['help'] = base64.b64encode(getdoc(clazz.__init__)).decode('ascii') + def _all_protocol_structs(self): old_stdout = sys.stdout sys.stdout = mystdout = StringIO() @@ -800,28 +807,23 @@ class Scapy_service(Scapy_service_api): self.field_engine_instruction_expressions.append(expression) fe_parameters = field_engine_model_descriptor['global_parameters'] - split_by_field = None - if "split_by_field" in fe_parameters: - split_by_field = str(fe_parameters['split_by_field']) cache_size = None if "cache_size" in fe_parameters: cache_size = int(fe_parameters['cache_size']) - self.field_engine_instruction_expressions += self._get_instruction_expressions_footer(split_by_field, cache_size) + self.field_engine_instruction_expressions += self._get_instruction_expressions_footer(cache_size) - pkt_builder = STLPktBuilder(pkt=pkt, vm=STLScVmRaw(instructions, split_by_field=split_by_field, cache_size=cache_size)) + pkt_builder = STLPktBuilder(pkt=pkt, vm=STLScVmRaw(instructions, cache_size=cache_size)) pkt_builder.compile() return pkt_builder.get_vm_data() def _get_instruction_expressions_header(self): return {'free_form': "vm = STLScVmRaw(["} - def _get_instruction_expressions_footer(self, split_by_field, cache_size): + def _get_instruction_expressions_footer(self, cache_size): instructions = [] footer = ']' - if split_by_field != None and split_by_field != "": - footer += ',{0}="{1}"'.format("split_by_field", split_by_field) if cache_size != None and cache_size > 0: footer += ',{0}={1}'.format("cache_size", cache_size) @@ -965,6 +967,7 @@ class Scapy_service(Scapy_service_api): }) res = {"protocols": protocols, "feInstructionParameters": self.instruction_parameter_meta_definitions, + "feInstructions": self.field_engine_instructions_meta, "feParameters": self.field_engine_parameter_meta_definitions} return res |