Merge pull request #876 from TrekkieCoder/main

PR: support select based on n3 interface fields
loxilb-io · Nov 13, 2024 · f6222d6 · f6222d6
2 parents acdb37b + 324b167
commit f6222d6
Show file tree

Hide file tree

Showing 81 changed files with 114 additions and 80 deletions.
diff --git a/api/models/conntrack_entry.go b/api/models/conntrack_entry.go
diff --git a/api/restapi/embedded_spec.go b/api/restapi/embedded_spec.go
diff --git 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
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
diff --git a/api/restapi/operations/delete_config_bgp_policy_apply_responses.go b/api/restapi/operations/delete_config_bgp_policy_apply_responses.go
diff --git a/...api/operations/delete_config_bgp_policy_definedsets_defineset_type_type_name_responses.go b/...api/operations/delete_config_bgp_policy_definedsets_defineset_type_type_name_responses.go
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
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
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
diff --git a/api/restapi/operations/delete_config_firewall_responses.go b/api/restapi/operations/delete_config_firewall_responses.go
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
diff --git a/api/restapi/operations/delete_config_loadbalancer_all_responses.go b/api/restapi/operations/delete_config_loadbalancer_all_responses.go
diff --git a/...te_config_loadbalancer_externalipaddress_ip_address_port_port_protocol_proto_responses.go b/...te_config_loadbalancer_externalipaddress_ip_address_port_port_protocol_proto_responses.go
diff --git a/...lancer_hosturl_hosturl_externalipaddress_ip_address_port_port_protocol_proto_responses.go b/...lancer_hosturl_hosturl_externalipaddress_ip_address_port_port_protocol_proto_responses.go
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
diff --git a/api/restapi/operations/delete_config_mirror_ident_ident_responses.go b/api/restapi/operations/delete_config_mirror_ident_ident_responses.go
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
diff --git a/api/restapi/operations/delete_config_policy_ident_ident_responses.go b/api/restapi/operations/delete_config_policy_ident_ident_responses.go
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
diff --git a/api/restapi/operations/delete_config_session_ident_ident_responses.go b/api/restapi/operations/delete_config_session_ident_ident_responses.go
diff --git a/...api/operations/delete_config_sessionulcl_ident_ident_ulcl_address_ip_address_responses.go b/...api/operations/delete_config_sessionulcl_ident_ident_ulcl_address_ip_address_responses.go
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
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
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
diff --git a/api/restapi/operations/delete_config_vlan_vlan_id_responses.go b/api/restapi/operations/delete_config_vlan_vlan_id_responses.go
diff --git a/api/restapi/operations/get_config_bfd_all_responses.go b/api/restapi/operations/get_config_bfd_all_responses.go
diff --git a/api/restapi/operations/get_config_bgp_neigh_all_responses.go b/api/restapi/operations/get_config_bgp_neigh_all_responses.go
diff --git a/...estapi/operations/get_config_bgp_policy_definedsets_defineset_type_type_name_responses.go b/...estapi/operations/get_config_bgp_policy_definedsets_defineset_type_type_name_responses.go
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
diff --git a/api/restapi/operations/get_config_cistate_all_responses.go b/api/restapi/operations/get_config_cistate_all_responses.go
diff --git a/api/restapi/operations/get_config_conntrack_all_responses.go b/api/restapi/operations/get_config_conntrack_all_responses.go
diff --git a/api/restapi/operations/get_config_endpoint_all_responses.go b/api/restapi/operations/get_config_endpoint_all_responses.go
diff --git a/api/restapi/operations/get_config_fdb_all_responses.go b/api/restapi/operations/get_config_fdb_all_responses.go
diff --git a/api/restapi/operations/get_config_firewall_all_responses.go b/api/restapi/operations/get_config_firewall_all_responses.go
diff --git a/api/restapi/operations/get_config_ipv4address_all_responses.go b/api/restapi/operations/get_config_ipv4address_all_responses.go
diff --git a/api/restapi/operations/get_config_loadbalancer_all_responses.go b/api/restapi/operations/get_config_loadbalancer_all_responses.go
diff --git a/api/restapi/operations/get_config_mirror_all_responses.go b/api/restapi/operations/get_config_mirror_all_responses.go
diff --git a/api/restapi/operations/get_config_neighbor_all_responses.go b/api/restapi/operations/get_config_neighbor_all_responses.go
diff --git a/api/restapi/operations/get_config_params_responses.go b/api/restapi/operations/get_config_params_responses.go
diff --git a/api/restapi/operations/get_config_policy_all_responses.go b/api/restapi/operations/get_config_policy_all_responses.go