diff --git a/api/models/conntrack_entry.go b/api/models/conntrack_entry.go index 292723023..2bf4b0bfe 100644 --- a/api/models/conntrack_entry.go +++ b/api/models/conntrack_entry.go @@ -32,6 +32,9 @@ type ConntrackEntry struct { // port number for the access DestinationPort int64 `json:"destinationPort,omitempty"` + // value for Conntrack ident + Ident string `json:"ident,omitempty"` + // Packet counts of the conntrack Packets int64 `json:"packets,omitempty"` diff --git a/api/restapi/embedded_spec.go b/api/restapi/embedded_spec.go index 9b3523357..2e824087e 100644 --- a/api/restapi/embedded_spec.go +++ b/api/restapi/embedded_spec.go @@ -4708,6 +4708,10 @@ func init() { "description": "port number for the access", "type": "integer" }, + "ident": { + "description": "value for Conntrack ident", + "type": "string" + }, "packets": { "description": "Packet counts of the conntrack", "type": "integer" @@ -10987,6 +10991,10 @@ func init() { "description": "port number for the access", "type": "integer" }, + "ident": { + "description": "value for Conntrack ident", + "type": "string" + }, "packets": { "description": "Packet counts of the conntrack", "type": "integer" diff --git a/api/restapi/handler/conntrack.go b/api/restapi/handler/conntrack.go index b121deca7..9f993f565 100644 --- a/api/restapi/handler/conntrack.go +++ b/api/restapi/handler/conntrack.go @@ -16,11 +16,10 @@ package handler import ( + "github.com/go-openapi/runtime/middleware" "github.com/loxilb-io/loxilb/api/models" "github.com/loxilb-io/loxilb/api/restapi/operations" tk "github.com/loxilb-io/loxilib" - - "github.com/go-openapi/runtime/middleware" ) func ConfigGetConntrack(params operations.GetConfigConntrackAllParams) middleware.Responder { @@ -42,6 +41,7 @@ func ConfigGetConntrack(params operations.GetConfigConntrackAllParams) middlewar tmpResult.DestinationPort = int64(conntrack.Dport) tmpResult.Packets = int64(conntrack.Pkts) tmpResult.Protocol = conntrack.Proto + tmpResult.Ident = conntrack.Ident tmpResult.SourceIP = conntrack.Sip.String() tmpResult.SourcePort = int64(conntrack.Sport) tmpResult.ServName = conntrack.ServiceName diff --git a/api/restapi/operations/delete_config_bfd_remote_ip_remote_ip_responses.go b/api/restapi/operations/delete_config_bfd_remote_ip_remote_ip_responses.go index 60b96b320..f29317c19 100644 --- a/api/restapi/operations/delete_config_bfd_remote_ip_remote_ip_responses.go +++ b/api/restapi/operations/delete_config_bfd_remote_ip_remote_ip_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigBfdRemoteIPRemoteIPInternalServerError) WriteResponse(rw ht const DeleteConfigBfdRemoteIPRemoteIPServiceUnavailableCode int = 503 /* -DeleteConfigBfdRemoteIPRemoteIPServiceUnavailable Maintanence mode +DeleteConfigBfdRemoteIPRemoteIPServiceUnavailable Maintenance mode swagger:response deleteConfigBfdRemoteIpRemoteIpServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_bgp_neigh_ip_address_responses.go b/api/restapi/operations/delete_config_bgp_neigh_ip_address_responses.go index 4a8a56ee6..92e7ce636 100644 --- a/api/restapi/operations/delete_config_bgp_neigh_ip_address_responses.go +++ b/api/restapi/operations/delete_config_bgp_neigh_ip_address_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigBgpNeighIPAddressInternalServerError) WriteResponse(rw http const DeleteConfigBgpNeighIPAddressServiceUnavailableCode int = 503 /* -DeleteConfigBgpNeighIPAddressServiceUnavailable Maintanence mode +DeleteConfigBgpNeighIPAddressServiceUnavailable Maintenance mode swagger:response deleteConfigBgpNeighIpAddressServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_bgp_policy_apply_responses.go b/api/restapi/operations/delete_config_bgp_policy_apply_responses.go index 42066df67..48e756503 100644 --- a/api/restapi/operations/delete_config_bgp_policy_apply_responses.go +++ b/api/restapi/operations/delete_config_bgp_policy_apply_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigBgpPolicyApplyInternalServerError) WriteResponse(rw http.Re const DeleteConfigBgpPolicyApplyServiceUnavailableCode int = 503 /* -DeleteConfigBgpPolicyApplyServiceUnavailable Maintanence mode +DeleteConfigBgpPolicyApplyServiceUnavailable Maintenance mode swagger:response deleteConfigBgpPolicyApplyServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_bgp_policy_definedsets_defineset_type_type_name_responses.go b/api/restapi/operations/delete_config_bgp_policy_definedsets_defineset_type_type_name_responses.go index 64056720b..95075d61f 100644 --- a/api/restapi/operations/delete_config_bgp_policy_definedsets_defineset_type_type_name_responses.go +++ b/api/restapi/operations/delete_config_bgp_policy_definedsets_defineset_type_type_name_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigBgpPolicyDefinedsetsDefinesetTypeTypeNameInternalServerErro const DeleteConfigBgpPolicyDefinedsetsDefinesetTypeTypeNameServiceUnavailableCode int = 503 /* -DeleteConfigBgpPolicyDefinedsetsDefinesetTypeTypeNameServiceUnavailable Maintanence mode +DeleteConfigBgpPolicyDefinedsetsDefinesetTypeTypeNameServiceUnavailable Maintenance mode swagger:response deleteConfigBgpPolicyDefinedsetsDefinesetTypeTypeNameServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_bgp_policy_definitions_policy_name_responses.go b/api/restapi/operations/delete_config_bgp_policy_definitions_policy_name_responses.go index b727b06c1..e80a3fd9b 100644 --- a/api/restapi/operations/delete_config_bgp_policy_definitions_policy_name_responses.go +++ b/api/restapi/operations/delete_config_bgp_policy_definitions_policy_name_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigBgpPolicyDefinitionsPolicyNameInternalServerError) WriteRes const DeleteConfigBgpPolicyDefinitionsPolicyNameServiceUnavailableCode int = 503 /* -DeleteConfigBgpPolicyDefinitionsPolicyNameServiceUnavailable Maintanence mode +DeleteConfigBgpPolicyDefinitionsPolicyNameServiceUnavailable Maintenance mode swagger:response deleteConfigBgpPolicyDefinitionsPolicyNameServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_endpoint_epipaddress_ip_address_responses.go b/api/restapi/operations/delete_config_endpoint_epipaddress_ip_address_responses.go index 7bd06f0a9..c398ebc49 100644 --- a/api/restapi/operations/delete_config_endpoint_epipaddress_ip_address_responses.go +++ b/api/restapi/operations/delete_config_endpoint_epipaddress_ip_address_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigEndpointEpipaddressIPAddressInternalServerError) WriteRespo const DeleteConfigEndpointEpipaddressIPAddressServiceUnavailableCode int = 503 /* -DeleteConfigEndpointEpipaddressIPAddressServiceUnavailable Maintanence mode +DeleteConfigEndpointEpipaddressIPAddressServiceUnavailable Maintenance mode swagger:response deleteConfigEndpointEpipaddressIpAddressServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_fdb_mac_address_dev_if_name_responses.go b/api/restapi/operations/delete_config_fdb_mac_address_dev_if_name_responses.go index f96508ad2..f0f1a2317 100644 --- a/api/restapi/operations/delete_config_fdb_mac_address_dev_if_name_responses.go +++ b/api/restapi/operations/delete_config_fdb_mac_address_dev_if_name_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigFdbMacAddressDevIfNameInternalServerError) WriteResponse(rw const DeleteConfigFdbMacAddressDevIfNameServiceUnavailableCode int = 503 /* -DeleteConfigFdbMacAddressDevIfNameServiceUnavailable Maintanence mode +DeleteConfigFdbMacAddressDevIfNameServiceUnavailable Maintenance mode swagger:response deleteConfigFdbMacAddressDevIfNameServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_firewall_responses.go b/api/restapi/operations/delete_config_firewall_responses.go index a69509b3b..3447e3127 100644 --- a/api/restapi/operations/delete_config_firewall_responses.go +++ b/api/restapi/operations/delete_config_firewall_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigFirewallInternalServerError) WriteResponse(rw http.Response const DeleteConfigFirewallServiceUnavailableCode int = 503 /* -DeleteConfigFirewallServiceUnavailable Maintanence mode +DeleteConfigFirewallServiceUnavailable Maintenance mode swagger:response deleteConfigFirewallServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_ipv4address_ip_address_mask_dev_if_name_responses.go b/api/restapi/operations/delete_config_ipv4address_ip_address_mask_dev_if_name_responses.go index 90dc6f83a..0fa38bd24 100644 --- a/api/restapi/operations/delete_config_ipv4address_ip_address_mask_dev_if_name_responses.go +++ b/api/restapi/operations/delete_config_ipv4address_ip_address_mask_dev_if_name_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigIpv4addressIPAddressMaskDevIfNameInternalServerError) Write const DeleteConfigIpv4addressIPAddressMaskDevIfNameServiceUnavailableCode int = 503 /* -DeleteConfigIpv4addressIPAddressMaskDevIfNameServiceUnavailable Maintanence mode +DeleteConfigIpv4addressIPAddressMaskDevIfNameServiceUnavailable Maintenance mode swagger:response deleteConfigIpv4addressIpAddressMaskDevIfNameServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_loadbalancer_all_responses.go b/api/restapi/operations/delete_config_loadbalancer_all_responses.go index 7a3b47cad..2176c60a1 100644 --- a/api/restapi/operations/delete_config_loadbalancer_all_responses.go +++ b/api/restapi/operations/delete_config_loadbalancer_all_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigLoadbalancerAllInternalServerError) WriteResponse(rw http.R const DeleteConfigLoadbalancerAllServiceUnavailableCode int = 503 /* -DeleteConfigLoadbalancerAllServiceUnavailable Maintanence mode +DeleteConfigLoadbalancerAllServiceUnavailable Maintenance mode swagger:response deleteConfigLoadbalancerAllServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_loadbalancer_externalipaddress_ip_address_port_port_protocol_proto_responses.go b/api/restapi/operations/delete_config_loadbalancer_externalipaddress_ip_address_port_port_protocol_proto_responses.go index abe36fbf7..d89b86ae8 100644 --- a/api/restapi/operations/delete_config_loadbalancer_externalipaddress_ip_address_port_port_protocol_proto_responses.go +++ b/api/restapi/operations/delete_config_loadbalancer_externalipaddress_ip_address_port_port_protocol_proto_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigLoadbalancerExternalipaddressIPAddressPortPortProtocolProto const DeleteConfigLoadbalancerExternalipaddressIPAddressPortPortProtocolProtoServiceUnavailableCode int = 503 /* -DeleteConfigLoadbalancerExternalipaddressIPAddressPortPortProtocolProtoServiceUnavailable Maintanence mode +DeleteConfigLoadbalancerExternalipaddressIPAddressPortPortProtocolProtoServiceUnavailable Maintenance mode swagger:response deleteConfigLoadbalancerExternalipaddressIpAddressPortPortProtocolProtoServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_loadbalancer_hosturl_hosturl_externalipaddress_ip_address_port_port_protocol_proto_responses.go b/api/restapi/operations/delete_config_loadbalancer_hosturl_hosturl_externalipaddress_ip_address_port_port_protocol_proto_responses.go index 682cbbf72..3200181c5 100644 --- a/api/restapi/operations/delete_config_loadbalancer_hosturl_hosturl_externalipaddress_ip_address_port_port_protocol_proto_responses.go +++ b/api/restapi/operations/delete_config_loadbalancer_hosturl_hosturl_externalipaddress_ip_address_port_port_protocol_proto_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigLoadbalancerHosturlHosturlExternalipaddressIPAddressPortPor const DeleteConfigLoadbalancerHosturlHosturlExternalipaddressIPAddressPortPortProtocolProtoServiceUnavailableCode int = 503 /* -DeleteConfigLoadbalancerHosturlHosturlExternalipaddressIPAddressPortPortProtocolProtoServiceUnavailable Maintanence mode +DeleteConfigLoadbalancerHosturlHosturlExternalipaddressIPAddressPortPortProtocolProtoServiceUnavailable Maintenance mode swagger:response deleteConfigLoadbalancerHosturlHosturlExternalipaddressIpAddressPortPortProtocolProtoServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_loadbalancer_name_lb_name_responses.go b/api/restapi/operations/delete_config_loadbalancer_name_lb_name_responses.go index 8a2f07cf6..a91fb3a05 100644 --- a/api/restapi/operations/delete_config_loadbalancer_name_lb_name_responses.go +++ b/api/restapi/operations/delete_config_loadbalancer_name_lb_name_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigLoadbalancerNameLbNameInternalServerError) WriteResponse(rw const DeleteConfigLoadbalancerNameLbNameServiceUnavailableCode int = 503 /* -DeleteConfigLoadbalancerNameLbNameServiceUnavailable Maintanence mode +DeleteConfigLoadbalancerNameLbNameServiceUnavailable Maintenance mode swagger:response deleteConfigLoadbalancerNameLbNameServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_mirror_ident_ident_responses.go b/api/restapi/operations/delete_config_mirror_ident_ident_responses.go index 953f8793e..89349bc36 100644 --- a/api/restapi/operations/delete_config_mirror_ident_ident_responses.go +++ b/api/restapi/operations/delete_config_mirror_ident_ident_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigMirrorIdentIdentInternalServerError) WriteResponse(rw http. const DeleteConfigMirrorIdentIdentServiceUnavailableCode int = 503 /* -DeleteConfigMirrorIdentIdentServiceUnavailable Maintanence mode +DeleteConfigMirrorIdentIdentServiceUnavailable Maintenance mode swagger:response deleteConfigMirrorIdentIdentServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_neighbor_ip_address_dev_if_name_responses.go b/api/restapi/operations/delete_config_neighbor_ip_address_dev_if_name_responses.go index b3688858e..e7ac1ccd3 100644 --- a/api/restapi/operations/delete_config_neighbor_ip_address_dev_if_name_responses.go +++ b/api/restapi/operations/delete_config_neighbor_ip_address_dev_if_name_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigNeighborIPAddressDevIfNameInternalServerError) WriteRespons const DeleteConfigNeighborIPAddressDevIfNameServiceUnavailableCode int = 503 /* -DeleteConfigNeighborIPAddressDevIfNameServiceUnavailable Maintanence mode +DeleteConfigNeighborIPAddressDevIfNameServiceUnavailable Maintenance mode swagger:response deleteConfigNeighborIpAddressDevIfNameServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_policy_ident_ident_responses.go b/api/restapi/operations/delete_config_policy_ident_ident_responses.go index 6c4714a01..0f5e15c49 100644 --- a/api/restapi/operations/delete_config_policy_ident_ident_responses.go +++ b/api/restapi/operations/delete_config_policy_ident_ident_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigPolicyIdentIdentInternalServerError) WriteResponse(rw http. const DeleteConfigPolicyIdentIdentServiceUnavailableCode int = 503 /* -DeleteConfigPolicyIdentIdentServiceUnavailable Maintanence mode +DeleteConfigPolicyIdentIdentServiceUnavailable Maintenance mode swagger:response deleteConfigPolicyIdentIdentServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_route_destination_ip_net_ip_address_mask_responses.go b/api/restapi/operations/delete_config_route_destination_ip_net_ip_address_mask_responses.go index a103735ba..e76c1441e 100644 --- a/api/restapi/operations/delete_config_route_destination_ip_net_ip_address_mask_responses.go +++ b/api/restapi/operations/delete_config_route_destination_ip_net_ip_address_mask_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigRouteDestinationIPNetIPAddressMaskInternalServerError) Writ const DeleteConfigRouteDestinationIPNetIPAddressMaskServiceUnavailableCode int = 503 /* -DeleteConfigRouteDestinationIPNetIPAddressMaskServiceUnavailable Maintanence mode +DeleteConfigRouteDestinationIPNetIPAddressMaskServiceUnavailable Maintenance mode swagger:response deleteConfigRouteDestinationIpNetIpAddressMaskServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_session_ident_ident_responses.go b/api/restapi/operations/delete_config_session_ident_ident_responses.go index f813acbf3..4841acbd4 100644 --- a/api/restapi/operations/delete_config_session_ident_ident_responses.go +++ b/api/restapi/operations/delete_config_session_ident_ident_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigSessionIdentIdentInternalServerError) WriteResponse(rw http const DeleteConfigSessionIdentIdentServiceUnavailableCode int = 503 /* -DeleteConfigSessionIdentIdentServiceUnavailable Maintanence mode +DeleteConfigSessionIdentIdentServiceUnavailable Maintenance mode swagger:response deleteConfigSessionIdentIdentServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_sessionulcl_ident_ident_ulcl_address_ip_address_responses.go b/api/restapi/operations/delete_config_sessionulcl_ident_ident_ulcl_address_ip_address_responses.go index 6b2610ad7..aa3b96475 100644 --- a/api/restapi/operations/delete_config_sessionulcl_ident_ident_ulcl_address_ip_address_responses.go +++ b/api/restapi/operations/delete_config_sessionulcl_ident_ident_ulcl_address_ip_address_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigSessionulclIdentIdentUlclAddressIPAddressInternalServerErro const DeleteConfigSessionulclIdentIdentUlclAddressIPAddressServiceUnavailableCode int = 503 /* -DeleteConfigSessionulclIdentIdentUlclAddressIPAddressServiceUnavailable Maintanence mode +DeleteConfigSessionulclIdentIdentUlclAddressIPAddressServiceUnavailable Maintenance mode swagger:response deleteConfigSessionulclIdentIdentUlclAddressIpAddressServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_tunnel_vxlan_vxlan_id_peer_peer_ip_responses.go b/api/restapi/operations/delete_config_tunnel_vxlan_vxlan_id_peer_peer_ip_responses.go index 24394ab1f..772f1bf2f 100644 --- a/api/restapi/operations/delete_config_tunnel_vxlan_vxlan_id_peer_peer_ip_responses.go +++ b/api/restapi/operations/delete_config_tunnel_vxlan_vxlan_id_peer_peer_ip_responses.go @@ -152,7 +152,7 @@ func (o *DeleteConfigTunnelVxlanVxlanIDPeerPeerIPInternalServerError) WriteRespo const DeleteConfigTunnelVxlanVxlanIDPeerPeerIPServiceUnavailableCode int = 503 /* -DeleteConfigTunnelVxlanVxlanIDPeerPeerIPServiceUnavailable Maintanence mode +DeleteConfigTunnelVxlanVxlanIDPeerPeerIPServiceUnavailable Maintenance mode swagger:response deleteConfigTunnelVxlanVxlanIdPeerPeerIpServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_tunnel_vxlan_vxlan_id_responses.go b/api/restapi/operations/delete_config_tunnel_vxlan_vxlan_id_responses.go index c3f869c09..70d41e88f 100644 --- a/api/restapi/operations/delete_config_tunnel_vxlan_vxlan_id_responses.go +++ b/api/restapi/operations/delete_config_tunnel_vxlan_vxlan_id_responses.go @@ -132,7 +132,7 @@ func (o *DeleteConfigTunnelVxlanVxlanIDInternalServerError) WriteResponse(rw htt const DeleteConfigTunnelVxlanVxlanIDServiceUnavailableCode int = 503 /* -DeleteConfigTunnelVxlanVxlanIDServiceUnavailable Maintanence mode +DeleteConfigTunnelVxlanVxlanIDServiceUnavailable Maintenance mode swagger:response deleteConfigTunnelVxlanVxlanIdServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_vlan_vlan_id_member_if_name_tagged_tagged_responses.go b/api/restapi/operations/delete_config_vlan_vlan_id_member_if_name_tagged_tagged_responses.go index f24bdab9c..fae5e36b4 100644 --- a/api/restapi/operations/delete_config_vlan_vlan_id_member_if_name_tagged_tagged_responses.go +++ b/api/restapi/operations/delete_config_vlan_vlan_id_member_if_name_tagged_tagged_responses.go @@ -222,7 +222,7 @@ func (o *DeleteConfigVlanVlanIDMemberIfNameTaggedTaggedInternalServerError) Writ const DeleteConfigVlanVlanIDMemberIfNameTaggedTaggedServiceUnavailableCode int = 503 /* -DeleteConfigVlanVlanIDMemberIfNameTaggedTaggedServiceUnavailable Maintanence mode +DeleteConfigVlanVlanIDMemberIfNameTaggedTaggedServiceUnavailable Maintenance mode swagger:response deleteConfigVlanVlanIdMemberIfNameTaggedTaggedServiceUnavailable */ diff --git a/api/restapi/operations/delete_config_vlan_vlan_id_responses.go b/api/restapi/operations/delete_config_vlan_vlan_id_responses.go index c7960d9a9..5993a679b 100644 --- a/api/restapi/operations/delete_config_vlan_vlan_id_responses.go +++ b/api/restapi/operations/delete_config_vlan_vlan_id_responses.go @@ -312,7 +312,7 @@ func (o *DeleteConfigVlanVlanIDInternalServerError) WriteResponse(rw http.Respon const DeleteConfigVlanVlanIDServiceUnavailableCode int = 503 /* -DeleteConfigVlanVlanIDServiceUnavailable Maintanence mode +DeleteConfigVlanVlanIDServiceUnavailable Maintenance mode swagger:response deleteConfigVlanVlanIdServiceUnavailable */ diff --git a/api/restapi/operations/get_config_bfd_all_responses.go b/api/restapi/operations/get_config_bfd_all_responses.go index 29b4c249d..cfe86355b 100644 --- a/api/restapi/operations/get_config_bfd_all_responses.go +++ b/api/restapi/operations/get_config_bfd_all_responses.go @@ -152,7 +152,7 @@ func (o *GetConfigBfdAllInternalServerError) WriteResponse(rw http.ResponseWrite const GetConfigBfdAllServiceUnavailableCode int = 503 /* -GetConfigBfdAllServiceUnavailable Maintanence mode +GetConfigBfdAllServiceUnavailable Maintenance mode swagger:response getConfigBfdAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_bgp_neigh_all_responses.go b/api/restapi/operations/get_config_bgp_neigh_all_responses.go index ccbbeda8b..8f63e67e4 100644 --- a/api/restapi/operations/get_config_bgp_neigh_all_responses.go +++ b/api/restapi/operations/get_config_bgp_neigh_all_responses.go @@ -357,7 +357,7 @@ func (o *GetConfigBgpNeighAllInternalServerError) WriteResponse(rw http.Response const GetConfigBgpNeighAllServiceUnavailableCode int = 503 /* -GetConfigBgpNeighAllServiceUnavailable Maintanence mode +GetConfigBgpNeighAllServiceUnavailable Maintenance mode swagger:response getConfigBgpNeighAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_bgp_policy_definedsets_defineset_type_type_name_responses.go b/api/restapi/operations/get_config_bgp_policy_definedsets_defineset_type_type_name_responses.go index 15f507d97..e244d83bd 100644 --- a/api/restapi/operations/get_config_bgp_policy_definedsets_defineset_type_type_name_responses.go +++ b/api/restapi/operations/get_config_bgp_policy_definedsets_defineset_type_type_name_responses.go @@ -357,7 +357,7 @@ func (o *GetConfigBgpPolicyDefinedsetsDefinesetTypeTypeNameInternalServerError) const GetConfigBgpPolicyDefinedsetsDefinesetTypeTypeNameServiceUnavailableCode int = 503 /* -GetConfigBgpPolicyDefinedsetsDefinesetTypeTypeNameServiceUnavailable Maintanence mode +GetConfigBgpPolicyDefinedsetsDefinesetTypeTypeNameServiceUnavailable Maintenance mode swagger:response getConfigBgpPolicyDefinedsetsDefinesetTypeTypeNameServiceUnavailable */ diff --git a/api/restapi/operations/get_config_bgp_policy_definitions_all_responses.go b/api/restapi/operations/get_config_bgp_policy_definitions_all_responses.go index a4ef1d6b0..ce4b67f30 100644 --- a/api/restapi/operations/get_config_bgp_policy_definitions_all_responses.go +++ b/api/restapi/operations/get_config_bgp_policy_definitions_all_responses.go @@ -152,7 +152,7 @@ func (o *GetConfigBgpPolicyDefinitionsAllInternalServerError) WriteResponse(rw h const GetConfigBgpPolicyDefinitionsAllServiceUnavailableCode int = 503 /* -GetConfigBgpPolicyDefinitionsAllServiceUnavailable Maintanence mode +GetConfigBgpPolicyDefinitionsAllServiceUnavailable Maintenance mode swagger:response getConfigBgpPolicyDefinitionsAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_cistate_all_responses.go b/api/restapi/operations/get_config_cistate_all_responses.go index da599a497..2517bafa4 100644 --- a/api/restapi/operations/get_config_cistate_all_responses.go +++ b/api/restapi/operations/get_config_cistate_all_responses.go @@ -152,7 +152,7 @@ func (o *GetConfigCistateAllInternalServerError) WriteResponse(rw http.ResponseW const GetConfigCistateAllServiceUnavailableCode int = 503 /* -GetConfigCistateAllServiceUnavailable Maintanence mode +GetConfigCistateAllServiceUnavailable Maintenance mode swagger:response getConfigCistateAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_conntrack_all_responses.go b/api/restapi/operations/get_config_conntrack_all_responses.go index ac8282b05..2cb2967ef 100644 --- a/api/restapi/operations/get_config_conntrack_all_responses.go +++ b/api/restapi/operations/get_config_conntrack_all_responses.go @@ -152,7 +152,7 @@ func (o *GetConfigConntrackAllInternalServerError) WriteResponse(rw http.Respons const GetConfigConntrackAllServiceUnavailableCode int = 503 /* -GetConfigConntrackAllServiceUnavailable Maintanence mode +GetConfigConntrackAllServiceUnavailable Maintenance mode swagger:response getConfigConntrackAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_endpoint_all_responses.go b/api/restapi/operations/get_config_endpoint_all_responses.go index e8c19d0f9..28bcc771b 100644 --- a/api/restapi/operations/get_config_endpoint_all_responses.go +++ b/api/restapi/operations/get_config_endpoint_all_responses.go @@ -152,7 +152,7 @@ func (o *GetConfigEndpointAllInternalServerError) WriteResponse(rw http.Response const GetConfigEndpointAllServiceUnavailableCode int = 503 /* -GetConfigEndpointAllServiceUnavailable Maintanence mode +GetConfigEndpointAllServiceUnavailable Maintenance mode swagger:response getConfigEndpointAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_fdb_all_responses.go b/api/restapi/operations/get_config_fdb_all_responses.go index 9863e3420..051e5ca25 100644 --- a/api/restapi/operations/get_config_fdb_all_responses.go +++ b/api/restapi/operations/get_config_fdb_all_responses.go @@ -152,7 +152,7 @@ func (o *GetConfigFdbAllInternalServerError) WriteResponse(rw http.ResponseWrite const GetConfigFdbAllServiceUnavailableCode int = 503 /* -GetConfigFdbAllServiceUnavailable Maintanence mode +GetConfigFdbAllServiceUnavailable Maintenance mode swagger:response getConfigFdbAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_firewall_all_responses.go b/api/restapi/operations/get_config_firewall_all_responses.go index 972244dfe..fe0bd8441 100644 --- a/api/restapi/operations/get_config_firewall_all_responses.go +++ b/api/restapi/operations/get_config_firewall_all_responses.go @@ -152,7 +152,7 @@ func (o *GetConfigFirewallAllInternalServerError) WriteResponse(rw http.Response const GetConfigFirewallAllServiceUnavailableCode int = 503 /* -GetConfigFirewallAllServiceUnavailable Maintanence mode +GetConfigFirewallAllServiceUnavailable Maintenance mode swagger:response getConfigFirewallAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_ipv4address_all_responses.go b/api/restapi/operations/get_config_ipv4address_all_responses.go index 5f71cdb53..7b57d4b2f 100644 --- a/api/restapi/operations/get_config_ipv4address_all_responses.go +++ b/api/restapi/operations/get_config_ipv4address_all_responses.go @@ -152,7 +152,7 @@ func (o *GetConfigIpv4addressAllInternalServerError) WriteResponse(rw http.Respo const GetConfigIpv4addressAllServiceUnavailableCode int = 503 /* -GetConfigIpv4addressAllServiceUnavailable Maintanence mode +GetConfigIpv4addressAllServiceUnavailable Maintenance mode swagger:response getConfigIpv4addressAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_loadbalancer_all_responses.go b/api/restapi/operations/get_config_loadbalancer_all_responses.go index d19a35e2f..a79c290fb 100644 --- a/api/restapi/operations/get_config_loadbalancer_all_responses.go +++ b/api/restapi/operations/get_config_loadbalancer_all_responses.go @@ -152,7 +152,7 @@ func (o *GetConfigLoadbalancerAllInternalServerError) WriteResponse(rw http.Resp const GetConfigLoadbalancerAllServiceUnavailableCode int = 503 /* -GetConfigLoadbalancerAllServiceUnavailable Maintanence mode +GetConfigLoadbalancerAllServiceUnavailable Maintenance mode swagger:response getConfigLoadbalancerAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_mirror_all_responses.go b/api/restapi/operations/get_config_mirror_all_responses.go index 87da8dd83..335397657 100644 --- a/api/restapi/operations/get_config_mirror_all_responses.go +++ b/api/restapi/operations/get_config_mirror_all_responses.go @@ -152,7 +152,7 @@ func (o *GetConfigMirrorAllInternalServerError) WriteResponse(rw http.ResponseWr const GetConfigMirrorAllServiceUnavailableCode int = 503 /* -GetConfigMirrorAllServiceUnavailable Maintanence mode +GetConfigMirrorAllServiceUnavailable Maintenance mode swagger:response getConfigMirrorAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_neighbor_all_responses.go b/api/restapi/operations/get_config_neighbor_all_responses.go index 66a7d9669..6f8a25027 100644 --- a/api/restapi/operations/get_config_neighbor_all_responses.go +++ b/api/restapi/operations/get_config_neighbor_all_responses.go @@ -152,7 +152,7 @@ func (o *GetConfigNeighborAllInternalServerError) WriteResponse(rw http.Response const GetConfigNeighborAllServiceUnavailableCode int = 503 /* -GetConfigNeighborAllServiceUnavailable Maintanence mode +GetConfigNeighborAllServiceUnavailable Maintenance mode swagger:response getConfigNeighborAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_params_responses.go b/api/restapi/operations/get_config_params_responses.go index 2297b10a7..5411340d0 100644 --- a/api/restapi/operations/get_config_params_responses.go +++ b/api/restapi/operations/get_config_params_responses.go @@ -357,7 +357,7 @@ func (o *GetConfigParamsInternalServerError) WriteResponse(rw http.ResponseWrite const GetConfigParamsServiceUnavailableCode int = 503 /* -GetConfigParamsServiceUnavailable Maintanence mode +GetConfigParamsServiceUnavailable Maintenance mode swagger:response getConfigParamsServiceUnavailable */ diff --git a/api/restapi/operations/get_config_policy_all_responses.go b/api/restapi/operations/get_config_policy_all_responses.go index 0424a0b6a..686d1c043 100644 --- a/api/restapi/operations/get_config_policy_all_responses.go +++ b/api/restapi/operations/get_config_policy_all_responses.go @@ -152,7 +152,7 @@ func (o *GetConfigPolicyAllInternalServerError) WriteResponse(rw http.ResponseWr const GetConfigPolicyAllServiceUnavailableCode int = 503 /* -GetConfigPolicyAllServiceUnavailable Maintanence mode +GetConfigPolicyAllServiceUnavailable Maintenance mode swagger:response getConfigPolicyAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_port_all_responses.go b/api/restapi/operations/get_config_port_all_responses.go index fbb9e8406..61b24f192 100644 --- a/api/restapi/operations/get_config_port_all_responses.go +++ b/api/restapi/operations/get_config_port_all_responses.go @@ -152,7 +152,7 @@ func (o *GetConfigPortAllInternalServerError) WriteResponse(rw http.ResponseWrit const GetConfigPortAllServiceUnavailableCode int = 503 /* -GetConfigPortAllServiceUnavailable Maintanence mode +GetConfigPortAllServiceUnavailable Maintenance mode swagger:response getConfigPortAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_route_all_responses.go b/api/restapi/operations/get_config_route_all_responses.go index 65fa000cc..112b2c4af 100644 --- a/api/restapi/operations/get_config_route_all_responses.go +++ b/api/restapi/operations/get_config_route_all_responses.go @@ -332,7 +332,7 @@ func (o *GetConfigRouteAllInternalServerError) WriteResponse(rw http.ResponseWri const GetConfigRouteAllServiceUnavailableCode int = 503 /* -GetConfigRouteAllServiceUnavailable Maintanence mode +GetConfigRouteAllServiceUnavailable Maintenance mode swagger:response getConfigRouteAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_session_all_responses.go b/api/restapi/operations/get_config_session_all_responses.go index 7fd949be6..623d3bf31 100644 --- a/api/restapi/operations/get_config_session_all_responses.go +++ b/api/restapi/operations/get_config_session_all_responses.go @@ -152,7 +152,7 @@ func (o *GetConfigSessionAllInternalServerError) WriteResponse(rw http.ResponseW const GetConfigSessionAllServiceUnavailableCode int = 503 /* -GetConfigSessionAllServiceUnavailable Maintanence mode +GetConfigSessionAllServiceUnavailable Maintenance mode swagger:response getConfigSessionAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_sessionulcl_all_responses.go b/api/restapi/operations/get_config_sessionulcl_all_responses.go index 014e82470..196535814 100644 --- a/api/restapi/operations/get_config_sessionulcl_all_responses.go +++ b/api/restapi/operations/get_config_sessionulcl_all_responses.go @@ -152,7 +152,7 @@ func (o *GetConfigSessionulclAllInternalServerError) WriteResponse(rw http.Respo const GetConfigSessionulclAllServiceUnavailableCode int = 503 /* -GetConfigSessionulclAllServiceUnavailable Maintanence mode +GetConfigSessionulclAllServiceUnavailable Maintenance mode swagger:response getConfigSessionulclAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_tunnel_vxlan_all_responses.go b/api/restapi/operations/get_config_tunnel_vxlan_all_responses.go index 77a87550d..c6f0e4bc4 100644 --- a/api/restapi/operations/get_config_tunnel_vxlan_all_responses.go +++ b/api/restapi/operations/get_config_tunnel_vxlan_all_responses.go @@ -152,7 +152,7 @@ func (o *GetConfigTunnelVxlanAllInternalServerError) WriteResponse(rw http.Respo const GetConfigTunnelVxlanAllServiceUnavailableCode int = 503 /* -GetConfigTunnelVxlanAllServiceUnavailable Maintanence mode +GetConfigTunnelVxlanAllServiceUnavailable Maintenance mode swagger:response getConfigTunnelVxlanAllServiceUnavailable */ diff --git a/api/restapi/operations/get_config_vlan_all_responses.go b/api/restapi/operations/get_config_vlan_all_responses.go index cbeb7a391..2932a4cae 100644 --- a/api/restapi/operations/get_config_vlan_all_responses.go +++ b/api/restapi/operations/get_config_vlan_all_responses.go @@ -152,7 +152,7 @@ func (o *GetConfigVlanAllInternalServerError) WriteResponse(rw http.ResponseWrit const GetConfigVlanAllServiceUnavailableCode int = 503 /* -GetConfigVlanAllServiceUnavailable Maintanence mode +GetConfigVlanAllServiceUnavailable Maintenance mode swagger:response getConfigVlanAllServiceUnavailable */ diff --git a/api/restapi/operations/get_status_device_responses.go b/api/restapi/operations/get_status_device_responses.go index fd06cf70f..86af1d9e4 100644 --- a/api/restapi/operations/get_status_device_responses.go +++ b/api/restapi/operations/get_status_device_responses.go @@ -152,7 +152,7 @@ func (o *GetStatusDeviceInternalServerError) WriteResponse(rw http.ResponseWrite const GetStatusDeviceServiceUnavailableCode int = 503 /* -GetStatusDeviceServiceUnavailable Maintanence mode +GetStatusDeviceServiceUnavailable Maintenance mode swagger:response getStatusDeviceServiceUnavailable */ diff --git a/api/restapi/operations/get_status_filesystem_responses.go b/api/restapi/operations/get_status_filesystem_responses.go index 26f3f7f9b..78a309055 100644 --- a/api/restapi/operations/get_status_filesystem_responses.go +++ b/api/restapi/operations/get_status_filesystem_responses.go @@ -152,7 +152,7 @@ func (o *GetStatusFilesystemInternalServerError) WriteResponse(rw http.ResponseW const GetStatusFilesystemServiceUnavailableCode int = 503 /* -GetStatusFilesystemServiceUnavailable Maintanence mode +GetStatusFilesystemServiceUnavailable Maintenance mode swagger:response getStatusFilesystemServiceUnavailable */ diff --git a/api/restapi/operations/get_status_process_responses.go b/api/restapi/operations/get_status_process_responses.go index eaf8c0dcf..b6f09e566 100644 --- a/api/restapi/operations/get_status_process_responses.go +++ b/api/restapi/operations/get_status_process_responses.go @@ -152,7 +152,7 @@ func (o *GetStatusProcessInternalServerError) WriteResponse(rw http.ResponseWrit const GetStatusProcessServiceUnavailableCode int = 503 /* -GetStatusProcessServiceUnavailable Maintanence mode +GetStatusProcessServiceUnavailable Maintenance mode swagger:response getStatusProcessServiceUnavailable */ diff --git a/api/restapi/operations/loxilb_rest_api_api.go b/api/restapi/operations/loxilb_rest_api_api.go index fa9d67095..4eccb25a7 100644 --- a/api/restapi/operations/loxilb_rest_api_api.go +++ b/api/restapi/operations/loxilb_rest_api_api.go @@ -1172,6 +1172,6 @@ func (o *LoxilbRestAPIAPI) AddMiddlewareFor(method, path string, builder middlew } o.Init() if h, ok := o.handlers[um][path]; ok { - o.handlers[um][path] = builder(h) + o.handlers[method][path] = builder(h) } } diff --git a/api/restapi/operations/post_config_bfd_responses.go b/api/restapi/operations/post_config_bfd_responses.go index 8bcdb2a16..f0115fa85 100644 --- a/api/restapi/operations/post_config_bfd_responses.go +++ b/api/restapi/operations/post_config_bfd_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigBfdInternalServerError) WriteResponse(rw http.ResponseWriter, const PostConfigBfdServiceUnavailableCode int = 503 /* -PostConfigBfdServiceUnavailable Maintanence mode +PostConfigBfdServiceUnavailable Maintenance mode swagger:response postConfigBfdServiceUnavailable */ diff --git a/api/restapi/operations/post_config_bgp_global_responses.go b/api/restapi/operations/post_config_bgp_global_responses.go index 9257277de..58ee412fd 100644 --- a/api/restapi/operations/post_config_bgp_global_responses.go +++ b/api/restapi/operations/post_config_bgp_global_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigBgpGlobalInternalServerError) WriteResponse(rw http.ResponseW const PostConfigBgpGlobalServiceUnavailableCode int = 503 /* -PostConfigBgpGlobalServiceUnavailable Maintanence mode +PostConfigBgpGlobalServiceUnavailable Maintenance mode swagger:response postConfigBgpGlobalServiceUnavailable */ diff --git a/api/restapi/operations/post_config_bgp_neigh_responses.go b/api/restapi/operations/post_config_bgp_neigh_responses.go index 4e574e51e..c871782a2 100644 --- a/api/restapi/operations/post_config_bgp_neigh_responses.go +++ b/api/restapi/operations/post_config_bgp_neigh_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigBgpNeighInternalServerError) WriteResponse(rw http.ResponseWr const PostConfigBgpNeighServiceUnavailableCode int = 503 /* -PostConfigBgpNeighServiceUnavailable Maintanence mode +PostConfigBgpNeighServiceUnavailable Maintenance mode swagger:response postConfigBgpNeighServiceUnavailable */ diff --git a/api/restapi/operations/post_config_bgp_policy_apply_responses.go b/api/restapi/operations/post_config_bgp_policy_apply_responses.go index 8201dd909..cfbad2db7 100644 --- a/api/restapi/operations/post_config_bgp_policy_apply_responses.go +++ b/api/restapi/operations/post_config_bgp_policy_apply_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigBgpPolicyApplyInternalServerError) WriteResponse(rw http.Resp const PostConfigBgpPolicyApplyServiceUnavailableCode int = 503 /* -PostConfigBgpPolicyApplyServiceUnavailable Maintanence mode +PostConfigBgpPolicyApplyServiceUnavailable Maintenance mode swagger:response postConfigBgpPolicyApplyServiceUnavailable */ diff --git a/api/restapi/operations/post_config_bgp_policy_definedsets_defineset_type_responses.go b/api/restapi/operations/post_config_bgp_policy_definedsets_defineset_type_responses.go index 4c6f0e016..11df549ed 100644 --- a/api/restapi/operations/post_config_bgp_policy_definedsets_defineset_type_responses.go +++ b/api/restapi/operations/post_config_bgp_policy_definedsets_defineset_type_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigBgpPolicyDefinedsetsDefinesetTypeInternalServerError) WriteRe const PostConfigBgpPolicyDefinedsetsDefinesetTypeServiceUnavailableCode int = 503 /* -PostConfigBgpPolicyDefinedsetsDefinesetTypeServiceUnavailable Maintanence mode +PostConfigBgpPolicyDefinedsetsDefinesetTypeServiceUnavailable Maintenance mode swagger:response postConfigBgpPolicyDefinedsetsDefinesetTypeServiceUnavailable */ diff --git a/api/restapi/operations/post_config_bgp_policy_definitions_responses.go b/api/restapi/operations/post_config_bgp_policy_definitions_responses.go index ceee17ba0..5bfa081d4 100644 --- a/api/restapi/operations/post_config_bgp_policy_definitions_responses.go +++ b/api/restapi/operations/post_config_bgp_policy_definitions_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigBgpPolicyDefinitionsInternalServerError) WriteResponse(rw htt const PostConfigBgpPolicyDefinitionsServiceUnavailableCode int = 503 /* -PostConfigBgpPolicyDefinitionsServiceUnavailable Maintanence mode +PostConfigBgpPolicyDefinitionsServiceUnavailable Maintenance mode swagger:response postConfigBgpPolicyDefinitionsServiceUnavailable */ diff --git a/api/restapi/operations/post_config_cistate_responses.go b/api/restapi/operations/post_config_cistate_responses.go index 5f33c1521..f8365f716 100644 --- a/api/restapi/operations/post_config_cistate_responses.go +++ b/api/restapi/operations/post_config_cistate_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigCistateInternalServerError) WriteResponse(rw http.ResponseWri const PostConfigCistateServiceUnavailableCode int = 503 /* -PostConfigCistateServiceUnavailable Maintanence mode +PostConfigCistateServiceUnavailable Maintenance mode swagger:response postConfigCistateServiceUnavailable */ diff --git a/api/restapi/operations/post_config_endpoint_responses.go b/api/restapi/operations/post_config_endpoint_responses.go index 2ddb117d4..84572971e 100644 --- a/api/restapi/operations/post_config_endpoint_responses.go +++ b/api/restapi/operations/post_config_endpoint_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigEndpointInternalServerError) WriteResponse(rw http.ResponseWr const PostConfigEndpointServiceUnavailableCode int = 503 /* -PostConfigEndpointServiceUnavailable Maintanence mode +PostConfigEndpointServiceUnavailable Maintenance mode swagger:response postConfigEndpointServiceUnavailable */ diff --git a/api/restapi/operations/post_config_fdb_responses.go b/api/restapi/operations/post_config_fdb_responses.go index dbeb69e34..d4b894d73 100644 --- a/api/restapi/operations/post_config_fdb_responses.go +++ b/api/restapi/operations/post_config_fdb_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigFdbInternalServerError) WriteResponse(rw http.ResponseWriter, const PostConfigFdbServiceUnavailableCode int = 503 /* -PostConfigFdbServiceUnavailable Maintanence mode +PostConfigFdbServiceUnavailable Maintenance mode swagger:response postConfigFdbServiceUnavailable */ diff --git a/api/restapi/operations/post_config_firewall_responses.go b/api/restapi/operations/post_config_firewall_responses.go index 064f64e17..3c163898d 100644 --- a/api/restapi/operations/post_config_firewall_responses.go +++ b/api/restapi/operations/post_config_firewall_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigFirewallInternalServerError) WriteResponse(rw http.ResponseWr const PostConfigFirewallServiceUnavailableCode int = 503 /* -PostConfigFirewallServiceUnavailable Maintanence mode +PostConfigFirewallServiceUnavailable Maintenance mode swagger:response postConfigFirewallServiceUnavailable */ diff --git a/api/restapi/operations/post_config_ipv4address_responses.go b/api/restapi/operations/post_config_ipv4address_responses.go index effae569a..e7ef79486 100644 --- a/api/restapi/operations/post_config_ipv4address_responses.go +++ b/api/restapi/operations/post_config_ipv4address_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigIpv4addressInternalServerError) WriteResponse(rw http.Respons const PostConfigIpv4addressServiceUnavailableCode int = 503 /* -PostConfigIpv4addressServiceUnavailable Maintanence mode +PostConfigIpv4addressServiceUnavailable Maintenance mode swagger:response postConfigIpv4addressServiceUnavailable */ diff --git a/api/restapi/operations/post_config_loadbalancer_responses.go b/api/restapi/operations/post_config_loadbalancer_responses.go index 71e7d61a1..82c1b2f36 100644 --- a/api/restapi/operations/post_config_loadbalancer_responses.go +++ b/api/restapi/operations/post_config_loadbalancer_responses.go @@ -332,7 +332,7 @@ func (o *PostConfigLoadbalancerInternalServerError) WriteResponse(rw http.Respon const PostConfigLoadbalancerServiceUnavailableCode int = 503 /* -PostConfigLoadbalancerServiceUnavailable Maintanence mode +PostConfigLoadbalancerServiceUnavailable Maintenance mode swagger:response postConfigLoadbalancerServiceUnavailable */ diff --git a/api/restapi/operations/post_config_mirror_responses.go b/api/restapi/operations/post_config_mirror_responses.go index 75c5f01e5..16a9e300b 100644 --- a/api/restapi/operations/post_config_mirror_responses.go +++ b/api/restapi/operations/post_config_mirror_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigMirrorInternalServerError) WriteResponse(rw http.ResponseWrit const PostConfigMirrorServiceUnavailableCode int = 503 /* -PostConfigMirrorServiceUnavailable Maintanence mode +PostConfigMirrorServiceUnavailable Maintenance mode swagger:response postConfigMirrorServiceUnavailable */ diff --git a/api/restapi/operations/post_config_neighbor_responses.go b/api/restapi/operations/post_config_neighbor_responses.go index bef6d2422..6d33d3dad 100644 --- a/api/restapi/operations/post_config_neighbor_responses.go +++ b/api/restapi/operations/post_config_neighbor_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigNeighborInternalServerError) WriteResponse(rw http.ResponseWr const PostConfigNeighborServiceUnavailableCode int = 503 /* -PostConfigNeighborServiceUnavailable Maintanence mode +PostConfigNeighborServiceUnavailable Maintenance mode swagger:response postConfigNeighborServiceUnavailable */ diff --git a/api/restapi/operations/post_config_params_responses.go b/api/restapi/operations/post_config_params_responses.go index e77b9f7a5..38bff37a0 100644 --- a/api/restapi/operations/post_config_params_responses.go +++ b/api/restapi/operations/post_config_params_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigParamsInternalServerError) WriteResponse(rw http.ResponseWrit const PostConfigParamsServiceUnavailableCode int = 503 /* -PostConfigParamsServiceUnavailable Maintanence mode +PostConfigParamsServiceUnavailable Maintenance mode swagger:response postConfigParamsServiceUnavailable */ diff --git a/api/restapi/operations/post_config_policy_responses.go b/api/restapi/operations/post_config_policy_responses.go index 3686eed16..ea2932cc2 100644 --- a/api/restapi/operations/post_config_policy_responses.go +++ b/api/restapi/operations/post_config_policy_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigPolicyInternalServerError) WriteResponse(rw http.ResponseWrit const PostConfigPolicyServiceUnavailableCode int = 503 /* -PostConfigPolicyServiceUnavailable Maintanence mode +PostConfigPolicyServiceUnavailable Maintenance mode swagger:response postConfigPolicyServiceUnavailable */ diff --git a/api/restapi/operations/post_config_route_responses.go b/api/restapi/operations/post_config_route_responses.go index 05cde77e4..1a3ad796d 100644 --- a/api/restapi/operations/post_config_route_responses.go +++ b/api/restapi/operations/post_config_route_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigRouteInternalServerError) WriteResponse(rw http.ResponseWrite const PostConfigRouteServiceUnavailableCode int = 503 /* -PostConfigRouteServiceUnavailable Maintanence mode +PostConfigRouteServiceUnavailable Maintenance mode swagger:response postConfigRouteServiceUnavailable */ diff --git a/api/restapi/operations/post_config_session_responses.go b/api/restapi/operations/post_config_session_responses.go index cf594d2ef..5eda36ce0 100644 --- a/api/restapi/operations/post_config_session_responses.go +++ b/api/restapi/operations/post_config_session_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigSessionInternalServerError) WriteResponse(rw http.ResponseWri const PostConfigSessionServiceUnavailableCode int = 503 /* -PostConfigSessionServiceUnavailable Maintanence mode +PostConfigSessionServiceUnavailable Maintenance mode swagger:response postConfigSessionServiceUnavailable */ diff --git a/api/restapi/operations/post_config_sessionulcl_responses.go b/api/restapi/operations/post_config_sessionulcl_responses.go index 9e0d0b475..3ee3f1a0e 100644 --- a/api/restapi/operations/post_config_sessionulcl_responses.go +++ b/api/restapi/operations/post_config_sessionulcl_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigSessionulclInternalServerError) WriteResponse(rw http.Respons const PostConfigSessionulclServiceUnavailableCode int = 503 /* -PostConfigSessionulclServiceUnavailable Maintanence mode +PostConfigSessionulclServiceUnavailable Maintenance mode swagger:response postConfigSessionulclServiceUnavailable */ diff --git a/api/restapi/operations/post_config_tunnel_vxlan_responses.go b/api/restapi/operations/post_config_tunnel_vxlan_responses.go index a69f6f3a9..de0b7cf75 100644 --- a/api/restapi/operations/post_config_tunnel_vxlan_responses.go +++ b/api/restapi/operations/post_config_tunnel_vxlan_responses.go @@ -177,7 +177,7 @@ func (o *PostConfigTunnelVxlanInternalServerError) WriteResponse(rw http.Respons const PostConfigTunnelVxlanServiceUnavailableCode int = 503 /* -PostConfigTunnelVxlanServiceUnavailable Maintanence mode +PostConfigTunnelVxlanServiceUnavailable Maintenance mode swagger:response postConfigTunnelVxlanServiceUnavailable */ diff --git a/api/restapi/operations/post_config_tunnel_vxlan_vxlan_id_peer_responses.go b/api/restapi/operations/post_config_tunnel_vxlan_vxlan_id_peer_responses.go index 5637f5828..c8c8171da 100644 --- a/api/restapi/operations/post_config_tunnel_vxlan_vxlan_id_peer_responses.go +++ b/api/restapi/operations/post_config_tunnel_vxlan_vxlan_id_peer_responses.go @@ -152,7 +152,7 @@ func (o *PostConfigTunnelVxlanVxlanIDPeerInternalServerError) WriteResponse(rw h const PostConfigTunnelVxlanVxlanIDPeerServiceUnavailableCode int = 503 /* -PostConfigTunnelVxlanVxlanIDPeerServiceUnavailable Maintanence mode +PostConfigTunnelVxlanVxlanIDPeerServiceUnavailable Maintenance mode swagger:response postConfigTunnelVxlanVxlanIdPeerServiceUnavailable */ diff --git a/api/restapi/operations/post_config_vlan_responses.go b/api/restapi/operations/post_config_vlan_responses.go index 8162658d1..4c72a0abe 100644 --- a/api/restapi/operations/post_config_vlan_responses.go +++ b/api/restapi/operations/post_config_vlan_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigVlanInternalServerError) WriteResponse(rw http.ResponseWriter const PostConfigVlanServiceUnavailableCode int = 503 /* -PostConfigVlanServiceUnavailable Maintanence mode +PostConfigVlanServiceUnavailable Maintenance mode swagger:response postConfigVlanServiceUnavailable */ diff --git a/api/restapi/operations/post_config_vlan_vlan_id_member_responses.go b/api/restapi/operations/post_config_vlan_vlan_id_member_responses.go index 2996f01bd..cadd28b48 100644 --- a/api/restapi/operations/post_config_vlan_vlan_id_member_responses.go +++ b/api/restapi/operations/post_config_vlan_vlan_id_member_responses.go @@ -312,7 +312,7 @@ func (o *PostConfigVlanVlanIDMemberInternalServerError) WriteResponse(rw http.Re const PostConfigVlanVlanIDMemberServiceUnavailableCode int = 503 /* -PostConfigVlanVlanIDMemberServiceUnavailable Maintanence mode +PostConfigVlanVlanIDMemberServiceUnavailable Maintenance mode swagger:response postConfigVlanVlanIdMemberServiceUnavailable */ diff --git a/api/restapi/server.go b/api/restapi/server.go index 97f5e78d8..c61df9e24 100644 --- a/api/restapi/server.go +++ b/api/restapi/server.go @@ -8,6 +8,7 @@ import ( "crypto/x509" "errors" "fmt" + "github.com/loxilb-io/loxilb/options" "log" "net" "net/http" @@ -25,7 +26,6 @@ import ( "golang.org/x/net/netutil" "github.com/loxilb-io/loxilb/api/restapi/operations" - "github.com/loxilb-io/loxilb/options" ) const ( @@ -82,7 +82,7 @@ type Server struct { ListenLimit int `long:"listen-limit" description:"limit the number of outstanding requests"` KeepAlive time.Duration `long:"keep-alive" description:"sets the TCP keep-alive timeouts on accepted connections. It prunes dead TCP connections ( e.g. closing laptop mid-download)" default:"3m"` ReadTimeout time.Duration `long:"read-timeout" description:"maximum duration before timing out read of the request" default:"30s"` - WriteTimeout time.Duration `long:"write-timeout" description:"maximum duration before timing out write of the response" default:"30s"` + WriteTimeout time.Duration `long:"write-timeout" description:"maximum duration before timing out write of the response" default:"60s"` httpServerL net.Listener TLSHost string `long:"tls-host" description:"the IP to listen on for tls, when not specified it's the same as --host" env:"TLS_HOST"` diff --git a/api/swagger.yml b/api/swagger.yml index 66dd91717..e098f569b 100644 --- a/api/swagger.yml +++ b/api/swagger.yml @@ -3136,6 +3136,9 @@ definitions: conntrackState: type: string description: value for Conntrack state + ident: + type: string + description: value for Conntrack ident conntrackAct: type: string description: value for Conntrack Act diff --git a/common/common.go b/common/common.go index 7f42118eb..c00227a05 100644 --- a/common/common.go +++ b/common/common.go @@ -487,6 +487,8 @@ const ( LbSelLeastConnections // LbSelN2 - select client based on N2 SCTP interface LbSelN2 + // LbSelN3 - select client based on N3 interface + LbSelN3 ) // LBMode - Variable to define LB mode @@ -624,6 +626,8 @@ type CtInfo struct { Sport uint16 `json:"sourcePort"` // Proto - IP protocol information Proto string `json:"protocol"` + // Ident - Identity val + Ident string `json:"ident"` // CState - current state of conntrack CState string `json:"conntrackState"` // CAct - any related action diff --git a/loxilb-ebpf b/loxilb-ebpf index 67fdfef5b..834bfd32f 160000 --- a/loxilb-ebpf +++ b/loxilb-ebpf @@ -1 +1 @@ -Subproject commit 67fdfef5b276d04cb4c14eae225768da347d06af +Subproject commit 834bfd32f3e5cd2130d8ec57f4cfe525ee49dff4 diff --git a/pkg/loxinet/dpbroker.go b/pkg/loxinet/dpbroker.go index 81b35b353..db7b6847a 100644 --- a/pkg/loxinet/dpbroker.go +++ b/pkg/loxinet/dpbroker.go @@ -265,6 +265,7 @@ const ( EpRRPersist EpLeastConn EpN2 + EpN3 ) // NatEP - a nat end-point @@ -314,6 +315,8 @@ type DpCtInfo struct { Dport uint16 `json:"dport"` Sport uint16 `json:"sport"` Proto string `json:"proto"` + Ident uint32 `json:"ident"` + IdType uint32 `json:"type"` CState string `json:"cstate"` CAct string `json:"cact"` CI string `json:"ci"` @@ -393,19 +396,19 @@ const ( // Key - outputs a key string for given DpCtInfo pointer func (ct *DpCtInfo) Key() string { - str := fmt.Sprintf("%s%s%d%d%s", ct.DIP.String(), ct.SIP.String(), ct.Dport, ct.Sport, ct.Proto) + str := fmt.Sprintf("%s%s%d%d%s%v%v", ct.DIP.String(), ct.SIP.String(), ct.Dport, ct.Sport, ct.Proto, ct.IdType, ct.Ident) return str } // KeyState - outputs a key string for given DpCtInfo pointer with state info func (ct *DpCtInfo) KeyState() string { - str := fmt.Sprintf("%s%s%d%d%s-%s", ct.DIP.String(), ct.SIP.String(), ct.Dport, ct.Sport, ct.Proto, ct.CState) + str := fmt.Sprintf("%s%s%d%d%s%v%v-%s", ct.DIP.String(), ct.SIP.String(), ct.Dport, ct.Sport, ct.Proto, ct.IdType, ct.Ident, ct.CState) return str } // String - stringify the given DpCtInfo func (ct *DpCtInfo) String() string { - str := fmt.Sprintf("%s:%d->%s:%d (%s), ", ct.SIP.String(), ct.Sport, ct.DIP.String(), ct.Dport, ct.Proto) + str := fmt.Sprintf("%s:%d->%s:%d (%s) (%v:%v), ", ct.SIP.String(), ct.Sport, ct.DIP.String(), ct.Dport, ct.Proto, ct.IdType, ct.Ident) str += fmt.Sprintf("%s:%s [%v:%v]", ct.CState, ct.CAct, ct.Packets, ct.Bytes) return str } @@ -881,7 +884,8 @@ func (dp *DpH) DpMapGetCt4() []cmn.CtInfo { servName = rule.name } cti := cmn.CtInfo{Dip: dCti.DIP, Sip: dCti.SIP, Dport: dCti.Dport, Sport: dCti.Sport, - Proto: dCti.Proto, CState: dCti.CState, CAct: dCti.CAct, + Proto: dCti.Proto, Ident: fmt.Sprintf("%v:%v", dCti.IdType, dCti.Ident), + CState: dCti.CState, CAct: dCti.CAct, Pkts: dCti.Packets, Bytes: dCti.Bytes, ServiceName: servName} CtInfoArr = append(CtInfoArr, cti) } diff --git a/pkg/loxinet/dpebpf_linux.go b/pkg/loxinet/dpebpf_linux.go index 20f76cf0f..cec184550 100644 --- a/pkg/loxinet/dpebpf_linux.go +++ b/pkg/loxinet/dpebpf_linux.go @@ -1008,6 +1008,8 @@ func DpLBRuleMod(w *LBDpWorkQ) int { dat.sel_type = C.NAT_LB_SEL_LC case w.EpSel == EpN2: dat.sel_type = C.NAT_LB_SEL_N2 + case w.EpSel == EpN3: + dat.sel_type = C.NAT_LB_SEL_N3 /* Currently not implemented in DP */ /*case w.EpSel == EP_PRIO: dat.sel_type = C.NAT_LB_SEL_PRIO*/ @@ -1216,6 +1218,9 @@ func (ct *DpCtInfo) convDPCt2GoObjFixup(ctKey *C.struct_dp_ct_key, ctDat *C.stru ct.Proto = fmt.Sprintf("%d", p) } + ct.IdType = uint32(ctKey._type) + ct.Ident = uint32(ctKey.ident) + if ctDat == nil { ct.CAct = "n/a" ct.CState = "closed" @@ -1430,6 +1435,7 @@ func (ct *DpCtInfo) convDPCtKey2GoObj(ctKey *C.struct_dp_ct_key) *DpCtInfo { default: ct.Proto = fmt.Sprintf("%d", p) } + return ct } diff --git a/pkg/loxinet/rules.go b/pkg/loxinet/rules.go index 2bdb1b1e6..0b137701d 100644 --- a/pkg/loxinet/rules.go +++ b/pkg/loxinet/rules.go @@ -1472,6 +1472,10 @@ func (R *RuleH) AddLbRule(serv cmn.LbServiceArg, servSecIPs []cmn.LbSecIPArg, se return RuleArgsErr, errors.New("secondaryIP-args error") } + if serv.Proto != "udp" && serv.Sel == cmn.LbSelN3 { + return RuleArgsErr, errors.New("non-udp-n3-args error") + } + if len(servSecIPs) > 3 { return RuleArgsErr, errors.New("secondaryIP-args len error") } @@ -2665,6 +2669,8 @@ func (r *ruleEnt) LB2DP(work DpWorkT) int { nWork.EpSel = EpLeastConn case at.sel == cmn.LbSelN2: nWork.EpSel = EpN2 + case at.sel == cmn.LbSelN3: + nWork.EpSel = EpN3 default: nWork.EpSel = EpRR }