Replace summary with test_keys

nettests/im/facebook_messenger.go

@@ -16,15 +16,15 @@ func (h FacebookMessenger) Run(ctl *nettests.Controller) error {
 	return mknt.Run()
 }
 
-// FacebookMessengerSummary for the test
-type FacebookMessengerSummary struct {
-	DNSBlocking bool
-	TCPBlocking bool
-	Blocked     bool
+// FacebookMessengerTestKeys for the test
+type FacebookMessengerTestKeys struct {
+	DNSBlocking bool `json:"facebook_dns_blocking"`
+	TCPBlocking bool `json:"facebook_tcp_blocking"`
+	IsAnomaly   bool `json:"-"`
 }
 
-// Summary generates a summary for a test run
-func (h FacebookMessenger) Summary(tk map[string]interface{}) interface{} {
+// GetTestKeys generates a summary for a test run
+func (h FacebookMessenger) GetTestKeys(tk map[string]interface{}) interface{} {
 	var (
 		dnsBlocking bool
 		tcpBlocking bool
@@ -41,10 +41,10 @@ func (h FacebookMessenger) Summary(tk map[string]interface{}) interface{} {
 		tcpBlocking = tk["facebook_tcp_blocking"].(bool)
 	}
 
-	return FacebookMessengerSummary{
+	return FacebookMessengerTestKeys{
 		DNSBlocking: dnsBlocking,
 		TCPBlocking: tcpBlocking,
-		Blocked:     dnsBlocking || tcpBlocking,
+		IsAnomaly:   dnsBlocking || tcpBlocking,
 	}
 }
 

nettests/im/telegram.go

@@ -16,16 +16,16 @@ func (h Telegram) Run(ctl *nettests.Controller) error {
 	return mknt.Run()
 }
 
-// TelegramSummary for the test
-type TelegramSummary struct {
-	HTTPBlocking bool
-	TCPBlocking  bool
-	WebBlocking  bool
-	Blocked      bool
+// TelegramTestKeys for the test
+type TelegramTestKeys struct {
+	HTTPBlocking bool `json:"telegram_http_blocking"`
+	TCPBlocking  bool `json:"telegram_tcp_blocking"`
+	WebBlocking  bool `json:"telegram_web_blocking"`
+	IsAnomaly    bool `json:"-"`
 }
 
-// Summary generates a summary for a test run
-func (h Telegram) Summary(tk map[string]interface{}) interface{} {
+// GetTestKeys generates a summary for a test run
+func (h Telegram) GetTestKeys(tk map[string]interface{}) interface{} {
 	var (
 		tcpBlocking  bool
 		httpBlocking bool
@@ -48,11 +48,11 @@ func (h Telegram) Summary(tk map[string]interface{}) interface{} {
 		webBlocking = tk["telegram_web_status"].(string) == "blocked"
 	}
 
-	return TelegramSummary{
+	return TelegramTestKeys{
 		TCPBlocking:  tcpBlocking,
 		HTTPBlocking: httpBlocking,
 		WebBlocking:  webBlocking,
-		Blocked:      webBlocking || httpBlocking || tcpBlocking,
+		IsAnomaly:    webBlocking || httpBlocking || tcpBlocking,
 	}
 }
 

nettests/im/whatsapp.go

@@ -16,16 +16,16 @@ func (h WhatsApp) Run(ctl *nettests.Controller) error {
 	return mknt.Run()
 }
 
-// WhatsAppSummary for the test
-type WhatsAppSummary struct {
-	RegistrationServerBlocking bool
-	WebBlocking                bool
-	EndpointsBlocking          bool
-	Blocked                    bool
+// WhatsAppTestKeys for the test
+type WhatsAppTestKeys struct {
+	RegistrationServerBlocking bool `json:"registration_server_blocking"`
+	WebBlocking                bool `json:"whatsapp_web_blocking"`
+	EndpointsBlocking          bool `json:"whatsapp_endpoints_blocking"`
+	IsAnomaly                  bool `json:"-"`
 }
 
-// Summary generates a summary for a test run
-func (h WhatsApp) Summary(tk map[string]interface{}) interface{} {
+// GetTestKeys generates a summary for a test run
+func (h WhatsApp) GetTestKeys(tk map[string]interface{}) interface{} {
 	var (
 		webBlocking          bool
 		registrationBlocking bool
@@ -46,11 +46,11 @@ func (h WhatsApp) Summary(tk map[string]interface{}) interface{} {
 	webBlocking = computeBlocking("whatsapp_web_status")
 	endpointsBlocking = computeBlocking("whatsapp_endpoints_status")
 
-	return WhatsAppSummary{
+	return WhatsAppTestKeys{
 		RegistrationServerBlocking: registrationBlocking,
 		WebBlocking:                webBlocking,
 		EndpointsBlocking:          endpointsBlocking,
-		Blocked:                    registrationBlocking || webBlocking || endpointsBlocking,
+		IsAnomaly:                  registrationBlocking || webBlocking || endpointsBlocking,
 	}
 }