write AddBackend and LoadBalancingParams in protobuf

use ..Default::default() in state.rs

bin/src/acme.rs

@@ -11,10 +11,10 @@ use sozu_command_lib::{
     channel::Channel,
     config::Config,
     proto::command::{
-        AddCertificate, CertificateAndKey, PathRule, RemoveBackend, ReplaceCertificate,
+        AddBackend, AddCertificate, CertificateAndKey, PathRule, RemoveBackend, ReplaceCertificate,
         RequestHttpFrontend, RulePosition, TlsVersion,
     },
-    request::{AddBackend, Request},
+    request::Request,
     response::{Response, ResponseStatus},
 };
 

bin/src/ctl/request_builder.rs

@@ -6,13 +6,13 @@ use sozu_command_lib::{
     certificate::{calculate_fingerprint, split_certificate_chain, Fingerprint},
     config::{Config, ListenerBuilder},
     proto::command::{
-        AddCertificate, CertificateAndKey, Cluster, FrontendFilters, PathRule, ProxyProtocolConfig,
-        RemoveBackend, RemoveCertificate, ReplaceCertificate, RequestHttpFrontend,
-        RequestTcpFrontend, RulePosition, TlsVersion,
+        AddBackend, AddCertificate, CertificateAndKey, Cluster, FrontendFilters,
+        LoadBalancingParams, PathRule, ProxyProtocolConfig, RemoveBackend, RemoveCertificate,
+        ReplaceCertificate, RequestHttpFrontend, RequestTcpFrontend, RulePosition, TlsVersion,
     },
     request::{
-        ActivateListener, AddBackend, DeactivateListener, ListenerType, LoadBalancingParams,
-        MetricsConfiguration, RemoveListener, Request,
+        ActivateListener, DeactivateListener, ListenerType, MetricsConfiguration, RemoveListener,
+        Request,
     },
 };
 

command/src/command.proto

@@ -134,10 +134,25 @@ enum LoadMetric {
     CONNECTION_TIME = 2;
 }
 
+// add a backend
+message AddBackend {
+    required string cluster_id = 1;
+    required string backend_id = 2;
+    // the socket address of the backend
+    required string address = 3;
+    optional string sticky_id = 4;
+    optional LoadBalancingParams load_balancing_parameters = 5;
+    optional bool backup = 6;
+}
+
 // remove an existing backend
 message RemoveBackend {
     required string cluster_id = 1;
     required string backend_id = 2;
     // the socket address of the backend
     required string address = 3 ;
+}
+
+message LoadBalancingParams {
+    required int32 weight = 1;
 }

command/src/config.rs

@@ -15,12 +15,11 @@ use toml;
 use crate::{
     certificate::split_certificate_chain,
     proto::command::{
-        AddCertificate, CertificateAndKey, Cluster, LoadBalancingAlgorithms, LoadMetric, PathRule,
-        ProxyProtocolConfig, RequestHttpFrontend, RequestTcpFrontend, RulePosition, TlsVersion,
-    },
-    request::{
-        ActivateListener, AddBackend, ListenerType, LoadBalancingParams, Request, WorkerRequest,
+        AddBackend, AddCertificate, CertificateAndKey, Cluster, LoadBalancingAlgorithms,
+        LoadBalancingParams, LoadMetric, PathRule, ProxyProtocolConfig, RequestHttpFrontend,
+        RequestTcpFrontend, RulePosition, TlsVersion,
     },
+    request::{ActivateListener, ListenerType, Request, WorkerRequest},
     response::{HttpListenerConfig, HttpsListenerConfig, TcpListenerConfig},
 };
 
@@ -817,7 +816,7 @@ impl HttpClusterConfig {
 
         for (backend_count, backend) in self.backends.iter().enumerate() {
             let load_balancing_parameters = Some(LoadBalancingParams {
-                weight: backend.weight.unwrap_or(100),
+                weight: backend.weight.unwrap_or(100) as i32,
             });
 
             v.push(Request::AddBackend(AddBackend {
@@ -875,7 +874,7 @@ impl TcpClusterConfig {
 
         for (backend_count, backend) in self.backends.iter().enumerate() {
             let load_balancing_parameters = Some(LoadBalancingParams {
-                weight: backend.weight.unwrap_or(100),
+                weight: backend.weight.unwrap_or(100) as i32,
             });
 
             v.push(Request::AddBackend(AddBackend {

command/src/request.rs

@@ -10,8 +10,8 @@ use anyhow::Context;
 use crate::{
     certificate::Fingerprint,
     proto::command::{
-        AddCertificate, Cluster, FrontendFilters, LoadBalancingAlgorithms, PathRuleKind,
-        RemoveBackend, RemoveCertificate, ReplaceCertificate, RequestHttpFrontend,
+        AddBackend, AddCertificate, Cluster, FrontendFilters, LoadBalancingAlgorithms,
+        PathRuleKind, RemoveBackend, RemoveCertificate, ReplaceCertificate, RequestHttpFrontend,
         RequestTcpFrontend, RulePosition,
     },
     response::{
@@ -282,16 +282,6 @@ impl Display for RequestHttpFrontend {
     }
 }
 
-#[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
-pub struct AddBackend {
-    pub cluster_id: String,
-    pub backend_id: String,
-    pub address: String,
-    pub sticky_id: Option<String>,
-    pub load_balancing_parameters: Option<LoadBalancingParams>,
-    pub backup: Option<bool>,
-}
-
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub enum MetricsConfiguration {
     Enabled,
@@ -347,10 +337,6 @@ impl FromStr for LoadBalancingAlgorithms {
         }
     }
 }
-#[derive(Default, Debug, Clone, PartialEq, Eq, Hash, PartialOrd, Ord, Serialize, Deserialize)]
-pub struct LoadBalancingParams {
-    pub weight: u8,
-}
 
 pub fn is_false(b: &bool) -> bool {
     !*b
@@ -363,7 +349,8 @@ mod tests {
     use super::*;
     use crate::certificate::split_certificate_chain;
     use crate::proto::command::{
-        CertificateAndKey, PathRule, ProxyProtocolConfig, RulePosition, TlsVersion,
+        CertificateAndKey, LoadBalancingParams, PathRule, ProxyProtocolConfig, RulePosition,
+        TlsVersion,
     };
     use crate::response::HttpFrontend;
     use serde_json;

command/src/response.rs

@@ -8,10 +8,10 @@ use std::{
 
 use crate::{
     proto::command::{
-        CertificateSummary, Cluster, PathRule, PathRuleKind, RequestHttpFrontend,
-        RequestTcpFrontend, RulePosition, TlsVersion,
+        AddBackend, CertificateSummary, Cluster, LoadBalancingParams, PathRule, PathRuleKind,
+        RequestHttpFrontend, RequestTcpFrontend, RulePosition, TlsVersion,
     },
-    request::{default_sticky_name, is_false, AddBackend, LoadBalancingParams, PROTOCOL_VERSION},
+    request::{default_sticky_name, is_false, PROTOCOL_VERSION},
     state::{ClusterId, ConfigState},
 };
 
@@ -294,6 +294,7 @@ pub struct ListenersList {
     pub tcp_listeners: HashMap<String, TcpListenerConfig>,
 }
 
+// TODO: implement Default
 /// details of an HTTP listener, sent by the main process to the worker
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct HttpListenerConfig {
@@ -319,6 +320,7 @@ pub struct HttpListenerConfig {
     pub active: bool,
 }
 
+// TODO: implement Default
 /// details of an HTTPS listener, sent by the main process to the worker
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct HttpsListenerConfig {
@@ -353,6 +355,7 @@ pub struct HttpsListenerConfig {
     pub active: bool,
 }
 
+// TODO: implement Default
 /// details of an TCP listener, sent by the main process to the worker
 #[derive(Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize)]
 pub struct TcpListenerConfig {