c/ooni-probe-cli
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nettests/ndt.go: use ndt7 rather than ndt5 (#119)

Browse Source 
Part of https://github.com/ooni/probe/issues/969
This commit is contained in:
Simone Basso
2020-03-12 19:36:32 +01:00
committed by GitHub
parent 38e86ce3c7
commit fe0b4a02be
4 changed files with 26 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nettests/ndt.go
+22 -36
View File
@@ -4,13 +4,13 @@ import (
"github.com/pkg/errors"
)
// NDT test implementation
// NDT test implementation. We use v7 of NDT since 2020-03-12.
type NDT struct {
}
// Run starts the test
func (n NDT) Run(ctl *Controller) error {
builder, err := ctl.Ctx.Session.NewExperimentBuilder("ndt")
builder, err := ctl.Ctx.Session.NewExperimentBuilder("ndt7")
if err != nil {
return err
}
@@ -19,17 +19,15 @@ func (n NDT) Run(ctl *Controller) error {
// NDTTestKeys for the test
type NDTTestKeys struct {
Upload float64 `json:"upload"`
Download float64 `json:"download"`
Ping float64 `json:"ping"`
MaxRTT float64 `json:"max_rtt"`
AvgRTT float64 `json:"avg_rtt"`
MinRTT float64 `json:"min_rtt"`
MSS float64 `json:"mss"`
OutOfOrder float64 `json:"out_of_order"`
PacketLoss float64 `json:"packet_loss"`
Timeouts float64 `json:"timeouts"`
IsAnomaly bool `json:"-"`
Upload float64 `json:"upload"`
Download float64 `json:"download"`
Ping float64 `json:"ping"`
MaxRTT float64 `json:"max_rtt"`
AvgRTT float64 `json:"avg_rtt"`
MinRTT float64 `json:"min_rtt"`
MSS float64 `json:"mss"`
RetransmitRate float64 `json:"retransmit_rate"`
IsAnomaly bool `json:"-"`
}
// GetTestKeys generates a summary for a test run
@@ -37,55 +35,43 @@ func (n NDT) GetTestKeys(tk map[string]interface{}) (interface{}, error) {
var err error
testKeys := NDTTestKeys{IsAnomaly: false}
simple, ok := tk["simple"].(map[string]interface{})
summary, ok := tk["summary"].(map[string]interface{})
if !ok {
return testKeys, errors.New("simple key is invalid")
}
advanced, ok := tk["advanced"].(map[string]interface{})
if !ok {
return testKeys, errors.New("advanced key is invalid")
return testKeys, errors.New("summary key is invalid")
}
// XXX there is likely a better pattern for this
testKeys.Upload, ok = simple["upload"].(float64)
testKeys.Upload, ok = summary["upload"].(float64)
if !ok {
err = errors.Wrap(err, "upload key invalid")
}
testKeys.Download, ok = simple["download"].(float64)
testKeys.Download, ok = summary["download"].(float64)
if !ok {
err = errors.Wrap(err, "download key invalid")
}
testKeys.Ping, ok = simple["ping"].(float64)
testKeys.Ping, ok = summary["ping"].(float64)
if !ok {
err = errors.Wrap(err, "ping key invalid")
}
testKeys.MaxRTT, ok = advanced["max_rtt"].(float64)
testKeys.MaxRTT, ok = summary["max_rtt"].(float64)
if !ok {
err = errors.Wrap(err, "max_rtt key invalid")
}
testKeys.AvgRTT, ok = advanced["avg_rtt"].(float64)
testKeys.AvgRTT, ok = summary["avg_rtt"].(float64)
if !ok {
err = errors.Wrap(err, "avg_rtt key invalid")
}
testKeys.MinRTT, ok = advanced["min_rtt"].(float64)
testKeys.MinRTT, ok = summary["min_rtt"].(float64)
if !ok {
err = errors.Wrap(err, "min_rtt key invalid")
}
testKeys.MSS, ok = advanced["mss"].(float64)
testKeys.MSS, ok = summary["mss"].(float64)
if !ok {
err = errors.Wrap(err, "mss key invalid")
}
testKeys.OutOfOrder, ok = advanced["out_of_order"].(float64)
testKeys.RetransmitRate, ok = summary["retransmit_rate"].(float64)
if !ok {
err = errors.Wrap(err, "out_of_order key invalid")
}
testKeys.PacketLoss, ok = advanced["packet_loss"].(float64)
if !ok {
err = errors.Wrap(err, "packet_loss key invalid")
}
testKeys.Timeouts, ok = advanced["timeouts"].(float64)
if !ok {
err = errors.Wrap(err, "timeouts key invalid")
err = errors.Wrap(err, "retransmit_rate key invalid")
}
return testKeys, err
}
nettests/web_connectivity.go
+1 -1
View File
@@ -10,7 +10,7 @@ func lookupURLs(ctl *Controller, limit int64, categories []string) ([]string, ma
var urls []string
urlIDMap := make(map[int64]int64)
testlist, err := ctl.Ctx.Session.QueryTestListsURLs(&engine.TestListsURLsConfig{
Limit: limit,
Limit: limit,
Categories: categories,
})
if err != nil {