From ba05a2da66e4479e1a4c66accc1de834d7777a34 Mon Sep 17 00:00:00 2001 From: ubuntu <jorge.sasiain@ehu.eus> Date: Wed, 30 Nov 2022 09:58:05 +0000 Subject: [PATCH] NAT-66: change oneOf to anyOf --- docs/source/index.rst | 4 ++-- resource_management/config.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docs/source/index.rst b/docs/source/index.rst index 5d9e5bf..64a28ec 100644 --- a/docs/source/index.rst +++ b/docs/source/index.rst @@ -22,7 +22,7 @@ The following example indicates the schema for the configuration file required t "hostname":"localhost", "dbname":"mydb" }, - "router":{ + "ssh":{ "username":"user", "password":"pass", "private-key":"/path/to/private/key" @@ -30,7 +30,7 @@ The following example indicates the schema for the configuration file required t } } -All "mysql" parameters are mandatory. For "router", username is mandatory, and either password or private-key must be provided. ssh-config is optional. +All "mysql" parameters are mandatory. For "ssh", username is mandatory, and either password or private-key must be provided. ssh-config is optional. Excuting the client --------------------- diff --git a/resource_management/config.py b/resource_management/config.py index 9df14f8..f60f960 100644 --- a/resource_management/config.py +++ b/resource_management/config.py @@ -24,7 +24,7 @@ CONFIG_SCHEMA = { 'private-key': {'type': 'string'}, 'ssh-config': {'type': 'string'} }, - 'oneOf': [ + 'anyOf': [ { 'required': ['username', 'password'] }, -- GitLab