Start integrating upper/db as a new ORM

nettests/nettests.go

@@ -58,11 +58,8 @@ func (c *Controller) Init(nt *mk.Nettest) error {
 	c.msmts = make(map[int64]*database.Measurement)
 
 	msmtTemplate := database.Measurement{
-		ASN:            "",
-		IP:             "",
-		CountryCode:    "",
 		ReportID:       "",
-		Name:           nt.Name,
+		TestName:       nt.Name,
 		ResultID:       c.res.ID,
 		ReportFilePath: c.msmtPath,
 	}
@@ -165,9 +162,12 @@ func (c *Controller) Init(nt *mk.Nettest) error {
 	nt.On("status.geoip_lookup", func(e mk.Event) {
 		log.Debugf(color.RedString(e.Key))
 
+		/* FIXME
+		Put this into the network table
 		msmtTemplate.ASN = e.Value.ProbeASN
 		msmtTemplate.IP = e.Value.ProbeIP
 		msmtTemplate.CountryCode = e.Value.ProbeCC
+		*/
 	})
 
 	nt.On("status.measurement_start", func(e mk.Event) {