X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=blobdiff_plain;f=extras%2Fjapi%2Fjava%2Fjvpp%2Fgen%2Fjvppgen%2Fjvpp_model.py;h=3c2db15d176b0bf6764b4065fb84524279aa85a6;hp=299796b908b3d31a6033ade29b17cf6f63930f38;hb=53fffa1;hpb=4f10db317382832068d67b5d19be4a696d80c19a diff --git a/extras/japi/java/jvpp/gen/jvppgen/jvpp_model.py b/extras/japi/java/jvpp/gen/jvppgen/jvpp_model.py index 299796b908b..3c2db15d176 100755 --- a/extras/japi/java/jvpp/gen/jvppgen/jvpp_model.py +++ b/extras/japi/java/jvpp/gen/jvppgen/jvpp_model.py @@ -320,6 +320,7 @@ class JVppModel(object): types = {} self._messages = [] self._services = {} + self._aliases = {} for file_name in json_api_files: with open(file_name) as f: j = json.load(f) @@ -328,6 +329,8 @@ class JVppModel(object): types.update({d[0]: {'type': 'union', 'data': d} for d in j['unions']}) self._messages.extend(j['messages']) self._services.update(j['services']) + self._aliases.update(j['aliases']) + self._parse_types(types) def _parse_types(self, types): @@ -481,6 +484,10 @@ class JVppModel(object): def _parse_field(self, field, fields): type_name = _extract_type_name(field[0]) + if type_name in self._aliases and type_name not in self._types_by_name: + aliased_type = self._types_by_name.get(self._aliases.get(type_name).get("type")) + self._types_by_name[type_name] = aliased_type + if type_name in self._types_by_name: if len(field) > 2: # Array field