Renamed functions and testfiles to version number

Signed-off-by: Philip Örnfeldt <philip.ornfeldt@outlook.com>

Author: Philldomd

pkg/probe/bgp_neighbors.go

@@ -22,21 +22,21 @@ import (
 	"github.com/prometheus-community/fortigate_exporter/pkg/http"
 )
 
-type BGPNeighborOld struct {
+type BGPNeighbor7_4 struct {
 	NeighborIP  string `json:"neighbor_ip"`
 	LocalIP     string `json:"local_ip"`
 	RemoteAS    int    `json:"remote_as"`
 	AdminStatus bool   `json:"admin_status"`
 	State       string `json:"state"`
 }
 
-type BGPNeighborResponseOld struct {
-	Results []BGPNeighborOld `json:"results"`
+type BGPNeighborResponse7_4 struct {
+	Results []BGPNeighbor7_4 `json:"results"`
 	VDOM    string           `json:"vdom"`
 	Version string           `json:"version"`
 }
 
-func probeBGPNeighborsIPv4Old(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Metric, bool) {
+func probeBGPNeighborsIPv47_4(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Metric, bool) {
 	if meta.VersionMajor < 7 {
 		// not supported version. Before 7.0.0 the requested endpoint doesn't exist
 		return nil, true
@@ -47,7 +47,7 @@ func probeBGPNeighborsIPv4Old(c http.FortiHTTP, meta *TargetMetadata) ([]prometh
 		[]string{"vdom", "remote_as", "state", "admin_status", "local_ip", "neighbor_ip"}, nil,
 	)
 
-	var rs []BGPNeighborResponseOld
+	var rs []BGPNeighborResponse7_4
 
 	if err := c.Get("api/v2/monitor/router/bgp/neighbors", "vdom=*", &rs); err != nil {
 		log.Printf("Error: %v", err)
@@ -65,7 +65,7 @@ func probeBGPNeighborsIPv4Old(c http.FortiHTTP, meta *TargetMetadata) ([]prometh
 	return m, true
 }
 
-func probeBGPNeighborsIPv6Old(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Metric, bool) {
+func probeBGPNeighborsIPv67_4(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Metric, bool) {
 	if meta.VersionMajor < 7 {
 		// not supported version. Before 7.0.0 the requested endpoint doesn't exist
 		return nil, true
@@ -77,7 +77,7 @@ func probeBGPNeighborsIPv6Old(c http.FortiHTTP, meta *TargetMetadata) ([]prometh
 		[]string{"vdom", "remote_as", "state", "admin_status", "local_ip", "neighbor_ip"}, nil,
 	)
 
-	var rs []BGPNeighborResponseOld
+	var rs []BGPNeighborResponse7_4
 
 	if err := c.Get("api/v2/monitor/router/bgp/neighbors6", "vdom=*", &rs); err != nil {
 		log.Printf("Error: %v", err)
@@ -130,7 +130,7 @@ type BGPNeighborResponse struct {
 
 func probeBGPNeighborsIPv4(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Metric, bool) {
 	if meta.VersionMajor == 7 && meta.VersionMinor < 6 {
-		return probeBGPNeighborsIPv4Old(c, meta)
+		return probeBGPNeighborsIPv47_4(c, meta)
 	}
 
 	mBGPNeighborState := prometheus.NewDesc(
@@ -181,7 +181,7 @@ func probeBGPNeighborsIPv4(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus
 
 func probeBGPNeighborsIPv6(c http.FortiHTTP, meta *TargetMetadata) ([]prometheus.Metric, bool) {
 	if meta.VersionMajor == 7 && meta.VersionMinor < 6 {
-		return probeBGPNeighborsIPv6Old(c, meta)
+		return probeBGPNeighborsIPv67_4(c, meta)
 	}
 
 	mBGPNeighborState := prometheus.NewDesc(

pkg/probe/bgp_neighbors_test.go

@@ -23,7 +23,7 @@ import (
 
 func TestBGPNeighborsIPv4Old(t *testing.T) {
 	c := newFakeClient()
-	c.prepare("api/v2/monitor/router/bgp/neighbors", "testdata/router-bgp-neighbors-v4old.jsonnet")
+	c.prepare("api/v2/monitor/router/bgp/neighbors", "testdata/router-bgp-neighbors-v4-7.4.jsonnet")
 	r := prometheus.NewPedanticRegistry()
 	meta := &TargetMetadata{
 		VersionMajor: 7,
@@ -46,7 +46,7 @@ func TestBGPNeighborsIPv4Old(t *testing.T) {
 
 func TestBGPNeighborsIPv6Old(t *testing.T) {
 	c := newFakeClient()
-	c.prepare("api/v2/monitor/router/bgp/neighbors6", "testdata/router-bgp-neighbors-v6old.jsonnet")
+	c.prepare("api/v2/monitor/router/bgp/neighbors6", "testdata/router-bgp-neighbors-v6-7.4.jsonnet")
 	r := prometheus.NewPedanticRegistry()
 	meta := &TargetMetadata{
 		VersionMajor: 7,
@@ -120,7 +120,7 @@ func TestBGPNeighborsIPv6(t *testing.T) {
 	}
 
 	em := `
-	# HELP fortigate_bgp_neighbor_ipv6_state Configured bgp neighbor over ipv4 state
+	# HELP fortigate_bgp_neighbor_ipv6_state Configured bgp neighbor over ipv6 state
 	# TYPE fortigate_bgp_neighbor_ipv6_state gauge
 	fortigate_bgp_neighbor_ipv6_state{admin_status="true",local_ip="fd00::1",neighbor_ip="fd00::2",remote_as="1337",state="Active",vdom="root"} 0
 	fortigate_bgp_neighbor_ipv6_state{admin_status="true",local_ip="fd00::1",neighbor_ip="fd00::2",remote_as="1337",state="Connect",vdom="root"} 0