Path fixes

parent bf8e95c8
......@@ -5,16 +5,17 @@ GLOBAL:
PERSISTENT_CHANGES: false
LOG_LEVEL: "debug"
LOG_DBG_MODULES: ["usr_conf_data_handlers", "knot_api", "nacm", "data"]
DATA_JSON_FILE: "/home/pspirek/dev-sw/jetconf/data/example-data.json"
HTTP_SERVER:
DOC_ROOT: "jetconf/doc-root"
DOC_ROOT: "/home/pspirek/dev-sw/jetconf/data/doc-root"
DOC_DEFAULT_NAME: "index.html"
API_ROOT: "/restconf"
SERVER_NAME: "hyper-h2"
SERVER_NAME: "jetconf-h2"
SERVER_SSL_CERT: "jetconf/server.crt"
SERVER_SSL_PRIVKEY: "jetconf/server.key"
CA_CERT: "jetconf/ca.pem"
SERVER_SSL_CERT: "/home/pspirek/dev-sw/jetconf/data/server.crt"
SERVER_SSL_PRIVKEY: "/home/pspirek/dev-sw/jetconf/data/server.key"
CA_CERT: "/home/pspirek/dev-sw/jetconf/data/ca.pem"
DBG_DISABLE_CERTS: false
NACM:
......
......@@ -136,9 +136,9 @@ def main():
datamodel = DataHelpers.load_data_model(CONFIG_GLOBAL["YANG_LIB_DIR"], CONFIG_GLOBAL["YANG_LIB_DIR"] + "yang-library-data.json")
# Datastore init
datastore = JsonDatastore(datamodel, "jetconf/example-data.json", "DNS data", with_nacm=False)
datastore = JsonDatastore(datamodel, CONFIG_GLOBAL["DATA_JSON_FILE"], "DNS data", with_nacm=False)
datastore.load()
datastore.load_yl_data("data/yang-library-data.json")
datastore.load_yl_data(CONFIG_GLOBAL["YANG_LIB_DIR"] + "yang-library-data.json")
datastore.get_data_root().validate(ValidationScope.all, ContentType.config)
......
......@@ -10,7 +10,8 @@ CONFIG_GLOBAL = {
"PERSISTENT_CHANGES": True,
"LOG_LEVEL": "info",
"LOG_DBG_MODULES": ["*"],
"YANG_LIB_DIR": "yang-data/"
"YANG_LIB_DIR": "yang-data/",
"DATA_JSON_FILE": "data.json"
}
CONFIG_HTTP = {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment