From 12b71013e5908420c5a2a082b4231167687009e9 Mon Sep 17 00:00:00 2001 From: Alex Nunes Date: Mon, 19 Sep 2022 19:15:54 +0100 Subject: [PATCH 1/3] Update models.py Allow generic parameters in SetConfig model. Add enable_mode to GetConfig model. --- netpalm/backend/core/models/models.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/netpalm/backend/core/models/models.py b/netpalm/backend/core/models/models.py index 58f06cc..554fc2c 100644 --- a/netpalm/backend/core/models/models.py +++ b/netpalm/backend/core/models/models.py @@ -58,7 +58,7 @@ class SetConfig(BaseModel): connection_args: dict config: Optional[Any] = None j2config: Optional[J2Config] = None - args: Optional[SetConfigArgs] = {} + args: Optional[dict] = {} webhook: Optional[Webhook] = None queue_strategy: Optional[QueueStrategy] = None pre_checks: Optional[List[GenericPrePostCheck]] = None @@ -160,6 +160,7 @@ class GetConfig(BaseModel): queue_strategy: Optional[QueueStrategy] = None post_checks: Optional[List[GenericPrePostCheck]] = [] cache: Optional[CacheConfig] = {} + enable_mode: bool = False ttl: Optional[int] = None class Config: From a20fde8c0eef8806b321840dad0cc844b8e1c6ec Mon Sep 17 00:00:00 2001 From: Alex Nunes Date: Mon, 10 Oct 2022 14:59:26 +0100 Subject: [PATCH 2/3] Update defaults.json --- config/defaults.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/defaults.json b/config/defaults.json index f3ba0cd..bf3760b 100644 --- a/config/defaults.json +++ b/config/defaults.json @@ -1,6 +1,6 @@ { "api_key": "2a84465a-cf38-46b2-9d86-b84Q7d57f288", - "netpalm_container_name": "netpalm-controller", + "netpalm_container_name": "srv-captain--netpalm", "netpalm_callback_http_mode": "http", "api_key_name": "x-api-key", "cookie_domain": "netpalm.local", @@ -10,7 +10,7 @@ "redis_task_ttl": 500, "redis_task_timeout": 500, "redis_task_result_ttl": 500, - "redis_server": "redis", + "redis_server": "srv-captain--redis", "redis_port": 6379, "redis_key": "Red1zp4ww0rd_", "redis_core_q": "process", @@ -24,7 +24,7 @@ "redis_cache_default_timeout": 300, "redis_cache_key_prefix": "NETPALM_RESULT_CACHE", "redis_update_log": "netpalm_extensibles_update_log", - "redis_tls_enabled": true, + "redis_tls_enabled": false, "redis_tls_cert_file": "netpalm/backend/core/security/cert/tls/redis.crt", "redis_tls_key_file": "netpalm/backend/core/security/cert/tls/redis.key", "redis_tls_ca_cert_file": "netpalm/backend/core/security/cert/tls/ca.crt", From d1f8f8d35ab4481bda53a7b0ed9084b2515748ab Mon Sep 17 00:00:00 2001 From: Alex Nunes Date: Tue, 11 Oct 2022 00:53:53 +0100 Subject: [PATCH 3/3] Update defaults.json --- config/defaults.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/defaults.json b/config/defaults.json index bf3760b..f3ba0cd 100644 --- a/config/defaults.json +++ b/config/defaults.json @@ -1,6 +1,6 @@ { "api_key": "2a84465a-cf38-46b2-9d86-b84Q7d57f288", - "netpalm_container_name": "srv-captain--netpalm", + "netpalm_container_name": "netpalm-controller", "netpalm_callback_http_mode": "http", "api_key_name": "x-api-key", "cookie_domain": "netpalm.local", @@ -10,7 +10,7 @@ "redis_task_ttl": 500, "redis_task_timeout": 500, "redis_task_result_ttl": 500, - "redis_server": "srv-captain--redis", + "redis_server": "redis", "redis_port": 6379, "redis_key": "Red1zp4ww0rd_", "redis_core_q": "process", @@ -24,7 +24,7 @@ "redis_cache_default_timeout": 300, "redis_cache_key_prefix": "NETPALM_RESULT_CACHE", "redis_update_log": "netpalm_extensibles_update_log", - "redis_tls_enabled": false, + "redis_tls_enabled": true, "redis_tls_cert_file": "netpalm/backend/core/security/cert/tls/redis.crt", "redis_tls_key_file": "netpalm/backend/core/security/cert/tls/redis.key", "redis_tls_ca_cert_file": "netpalm/backend/core/security/cert/tls/ca.crt",