Automatically retry AP configuration if it crashed.

Author: patfair

network/access_point.go

@@ -32,6 +32,7 @@ type AccessPoint struct {
 	networkSecurityEnabled bool
 	Status                 string
 	TeamWifiStatuses       [6]*TeamWifiStatus
+	lastConfiguredTeams    [6]*model.Team
 }
 
 type TeamWifiStatus struct {
@@ -90,6 +91,15 @@ func (ap *AccessPoint) Run() {
 		time.Sleep(time.Second * accessPointPollPeriodSec)
 		if err := ap.updateMonitoring(); err != nil {
 			log.Printf("Failed to update access point monitoring: %v", err)
+			continue
+		}
+
+		// If the access point is in a good state but doesn't match the expected configuration, try again.
+		if ap.Status == "ACTIVE" && !ap.statusMatchesLastConfiguration() {
+			log.Println("Access point is ACTIVE but does not match expected configuration; retrying configuration.")
+			if err := ap.ConfigureTeamWifi(ap.lastConfiguredTeams); err != nil {
+				log.Printf("Failed to reconfigure access point: %v", err)
+			}
 		}
 	}
 }
@@ -100,6 +110,8 @@ func (ap *AccessPoint) ConfigureTeamWifi(teams [6]*model.Team) error {
 		return nil
 	}
 
+	ap.Status = "CONFIGURING"
+	ap.lastConfiguredTeams = teams
 	request := configurationRequest{
 		Channel:               ap.channel,
 		StationConfigurations: make(map[string]stationConfiguration),
@@ -204,6 +216,23 @@ func (ap *AccessPoint) checkAndLogApiError(err error) {
 	}
 }
 
+// Returns true if the access point's current status matches the last configuration that was sent to it.
+func (ap *AccessPoint) statusMatchesLastConfiguration() bool {
+	for i := 0; i < 6; i++ {
+		var expectedTeamId, actualTeamId int
+		if ap.lastConfiguredTeams[i] != nil {
+			expectedTeamId = ap.lastConfiguredTeams[i].Id
+		}
+		if ap.TeamWifiStatuses[i] != nil {
+			actualTeamId = ap.TeamWifiStatuses[i].TeamId
+		}
+		if expectedTeamId != actualTeamId {
+			return false
+		}
+	}
+	return true
+}
+
 // Generates the configuration for the given team's station and adds it to the map. If the team is nil, no entry is
 // added for the station.
 func addStation(stationsConfigurations map[string]stationConfiguration, station string, team *model.Team) {

network/access_point_test.go

@@ -17,7 +17,6 @@ func TestAccessPoint_ConfigureTeamWifi(t *testing.T) {
 	var request configurationRequest
 	wifiStatuses := [6]*TeamWifiStatus{{}, {}, {}, {}, {}, {}}
 	ap.SetSettings("dummy", "password1", 123, true, wifiStatuses)
-	ap.Status = "INITIAL"
 
 	// Mock the radio API server.
 	radioServer := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
@@ -77,7 +76,7 @@ func TestAccessPoint_ConfigureTeamWifi(t *testing.T) {
 	if assert.NotNil(t, err) {
 		assert.Contains(t, err.Error(), "returned status 507: oh noes")
 	}
-	assert.Equal(t, "INITIAL", ap.Status)
+	assert.Equal(t, "CONFIGURING", ap.Status)
 }
 
 func TestAccessPoint_updateMonitoring(t *testing.T) {
@@ -148,3 +147,23 @@ func TestAccessPoint_updateMonitoring(t *testing.T) {
 	}
 	assert.Equal(t, "ERROR", ap.Status)
 }
+
+func TestAccessPoint_statusMatchesLastConfiguration(t *testing.T) {
+	var ap AccessPoint
+	wifiStatuses := [6]*TeamWifiStatus{{}, {}, {}, {}, {}, {}}
+	ap.SetSettings("dummy", "", 123, true, wifiStatuses)
+
+	assert.True(t, ap.statusMatchesLastConfiguration())
+	team1 := &model.Team{Id: 254, WpaKey: "11111111"}
+	team2 := &model.Team{Id: 1678, WpaKey: "22222222"}
+	ap.ConfigureTeamWifi([6]*model.Team{nil, team1, nil, team2, nil, nil})
+	assert.False(t, ap.statusMatchesLastConfiguration())
+	ap.TeamWifiStatuses[1].TeamId = 254
+	assert.False(t, ap.statusMatchesLastConfiguration())
+	ap.TeamWifiStatuses[3].TeamId = 1677
+	assert.False(t, ap.statusMatchesLastConfiguration())
+	ap.TeamWifiStatuses[3].TeamId = 1678
+	assert.True(t, ap.statusMatchesLastConfiguration())
+	ap.TeamWifiStatuses[4].TeamId = 111
+	assert.False(t, ap.statusMatchesLastConfiguration())
+}