mirror of
https://gitlab.nic.cz/labs/bird.git
synced 2025-01-03 15:41:54 +00:00
various fices
This commit is contained in:
parent
52921062b8
commit
1fb14f5769
@ -3,12 +3,18 @@ from yangson import DataModel
|
|||||||
import cbor
|
import cbor
|
||||||
import json
|
import json
|
||||||
|
|
||||||
|
import os
|
||||||
|
import sys
|
||||||
|
|
||||||
class Message:
|
class Message:
|
||||||
def __init__(self, filename, _type):
|
def __init__(self, filename, _type):
|
||||||
self.filename = filename
|
self.filename = filename
|
||||||
with open(self.filename, "rb") as sf:
|
with open(self.filename, "rb") as sf:
|
||||||
self.raw = { "json": json, "cbor": cbor }[_type].load(sf)
|
self.raw = { "json": json, "cbor": cbor }[_type].load(sf)
|
||||||
|
|
||||||
|
cwd = os.getcwd()
|
||||||
|
os.chdir(os.path.dirname(sys.modules[__name__].__file__))
|
||||||
self.dm = DataModel.from_file('yang-library.json')
|
self.dm = DataModel.from_file('yang-library.json')
|
||||||
|
os.chdir(cwd)
|
||||||
self.data = self.dm.from_raw(self.raw)
|
self.data = self.dm.from_raw(self.raw)
|
||||||
self.data.validate()
|
self.data.validate()
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
|
YDIR=$(dirname $0)
|
||||||
|
|
||||||
|
pushd $YDIR
|
||||||
python3 -m venv venv
|
python3 -m venv venv
|
||||||
. venv/bin/activate
|
. venv/bin/activate
|
||||||
pip3 install yangson cbor
|
pip3 install yangson cbor
|
||||||
|
popd
|
||||||
|
|
||||||
python3 cbor-json-yang.py "$@"
|
python3 $YDIR/cbor-json-yang.py "$@"
|
||||||
|
@ -1,5 +1,9 @@
|
|||||||
|
YDIR=$(dirname $0)
|
||||||
|
|
||||||
|
pushd $YDIR
|
||||||
python3 -m venv venv
|
python3 -m venv venv
|
||||||
. venv/bin/activate
|
. venv/bin/activate
|
||||||
pip3 install yangson cbor
|
pip3 install yangson cbor
|
||||||
|
popd
|
||||||
|
|
||||||
python3 json-cbor-yang.py "$@"
|
python3 $YDIR/json-cbor-yang.py "$@"
|
||||||
|
@ -55,7 +55,7 @@ module show_status {
|
|||||||
type int32;
|
type int32;
|
||||||
}
|
}
|
||||||
container wait_timer {
|
container wait_timer {
|
||||||
uses timer
|
uses timer;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -19,12 +19,6 @@
|
|||||||
"namespace": "https://bird.nic.cz/yang/v2.15/cli-debug",
|
"namespace": "https://bird.nic.cz/yang/v2.15/cli-debug",
|
||||||
"revision": "",
|
"revision": "",
|
||||||
"conformance-type": "implement"
|
"conformance-type": "implement"
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "show_protocols_all",
|
|
||||||
"namespace": "https://bird.nic.cz/yang/v2.15/cli-debug",
|
|
||||||
"revision": "",
|
|
||||||
"conformance-type": "implement"
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user