Added InternalTemp, LineFrequency and OutputVoltage (#4)

* Run test on machine without IPV6 on older go versions References golang/go#18806 * Added InternalTemp, LineFrequency and OutputVoltage
mdlayher · Jan 21, 2018 · 09cd4e8 · 09cd4e8
1 parent d7ac620
commit 09cd4e8
Show file tree

Hide file tree

Showing 3 changed files with 81 additions and 40 deletions.
diff --git a/client_test.go b/client_test.go
@@ -136,7 +136,7 @@ func testClient(t *testing.T, fn func() [][]byte) (*Client, func()) {
 		wg.Done()
 	}()
 
-	c, err := Dial("tcp", l.Addr().String())
+	c, err := Dial("tcp", dialAddr(l))
 	if err != nil {
 		t.Fatalf("failed to dial Client: %v", err)
 	}
@@ -157,3 +157,11 @@ func kvBytes(kv string) ([]byte, []byte) {
 
 	return lenb, []byte(kv)
 }
+
+// dialAddr returns a valid net.Dial address to dial using network "tcp".
+func dialAddr(ln net.Listener) string {
+	addr := ln.Addr().String()
+	addr = strings.TrimPrefix(addr, "[::]")
+	addr = strings.TrimPrefix(addr, "0.0.0.0")
+	return addr
+}
diff --git a/status.go b/status.go
@@ -70,6 +70,9 @@ type Status struct {
 	NominalPower                int
 	Firmware                    string
 	EndAPC                      time.Time
+	InternalTemp                float64
+	OutputVoltage               float64
+	LineFrequency               float64
 }
 
 // parseKV parses an input key/value string in "key : value" format, and
@@ -119,45 +122,48 @@ func (s *Status) parseKV(kv string) error {
 
 // List of keys sent by a NIS, used to map values to Status fields.
 const (
-	keyAPC       = "APC"
-	keyDate      = "DATE"
-	keyHostname  = "HOSTNAME"
-	keyVersion   = "VERSION"
-	keyUPSName   = "UPSNAME"
-	keyCable     = "CABLE"
-	keyDriver    = "DRIVER"
-	keyUPSMode   = "UPSMODE"
-	keyStartTime = "STARTTIME"
-	keyModel     = "MODEL"
-	keyStatus    = "STATUS"
-	keyLineV     = "LINEV"
-	keyLoadPct   = "LOADPCT"
-	keyBCharge   = "BCHARGE"
-	keyTimeLeft  = "TIMELEFT"
-	keyMBattChg  = "MBATTCHG"
-	keyMinTimeL  = "MINTIMEL"
-	keyMaxTime   = "MAXTIME"
-	keySense     = "SENSE"
-	keyLoTrans   = "LOTRANS"
-	keyHiTrans   = "HITRANS"
-	keyAlarmDel  = "ALARMDEL"
-	keyBattV     = "BATTV"
-	keyLastXfer  = "LASTXFER"
-	keyNumXfers  = "NUMXFERS"
-	keyXOnBat    = "XONBATT"
-	keyTOnBatt   = "TONBATT"
-	keyCumOnBatt = "CUMONBATT"
-	keyXOffBat   = "XOFFBATT"
-	keyLastStest = "LASTSTEST"
-	keySelftest  = "SELFTEST"
-	keyStatFlag  = "STATFLAG"
-	keySerialNo  = "SERIALNO"
-	keyBattDate  = "BATTDATE"
-	keyNomInV    = "NOMINV"
-	keyNomBattV  = "NOMBATTV"
-	keyNomPower  = "NOMPOWER"
-	keyFirmware  = "FIRMWARE"
-	keyEndAPC    = "END APC"
+	keyAPC           = "APC"
+	keyDate          = "DATE"
+	keyHostname      = "HOSTNAME"
+	keyVersion       = "VERSION"
+	keyUPSName       = "UPSNAME"
+	keyCable         = "CABLE"
+	keyDriver        = "DRIVER"
+	keyUPSMode       = "UPSMODE"
+	keyStartTime     = "STARTTIME"
+	keyModel         = "MODEL"
+	keyStatus        = "STATUS"
+	keyLineV         = "LINEV"
+	keyLoadPct       = "LOADPCT"
+	keyBCharge       = "BCHARGE"
+	keyTimeLeft      = "TIMELEFT"
+	keyMBattChg      = "MBATTCHG"
+	keyMinTimeL      = "MINTIMEL"
+	keyMaxTime       = "MAXTIME"
+	keySense         = "SENSE"
+	keyLoTrans       = "LOTRANS"
+	keyHiTrans       = "HITRANS"
+	keyAlarmDel      = "ALARMDEL"
+	keyBattV         = "BATTV"
+	keyLastXfer      = "LASTXFER"
+	keyNumXfers      = "NUMXFERS"
+	keyXOnBat        = "XONBATT"
+	keyTOnBatt       = "TONBATT"
+	keyCumOnBatt     = "CUMONBATT"
+	keyXOffBat       = "XOFFBATT"
+	keyLastStest     = "LASTSTEST"
+	keySelftest      = "SELFTEST"
+	keyStatFlag      = "STATFLAG"
+	keySerialNo      = "SERIALNO"
+	keyBattDate      = "BATTDATE"
+	keyNomInV        = "NOMINV"
+	keyNomBattV      = "NOMBATTV"
+	keyNomPower      = "NOMPOWER"
+	keyFirmware      = "FIRMWARE"
+	keyEndAPC        = "END APC"
+	keyITemp         = "ITEMP"
+	keyOutV          = "OUTPUTV"
+	keyLineFrequency = "LINEFREQ"
 )
 
 // parseKVString parses a simple string into the appropriate Status field.
@@ -229,6 +235,12 @@ func (s *Status) parseKVFloat(k string, v string) (bool, error) {
 		s.NominalInputVoltage, err = parse()
 	case keyNomBattV:
 		s.NominalBatteryVoltage, err = parse()
+	case keyITemp:
+		s.InternalTemp, err = parse()
+	case keyOutV:
+		s.OutputVoltage, err = parse()
+	case keyLineFrequency:
+		s.LineFrequency, err = parse()
 	default:
 		return false, nil
 	}

diff --git a/status_test.go b/status_test.go
@@ -91,6 +91,27 @@ func TestStatus_parseKV(t *testing.T) {
 				AlarmDel: 0,
 			},
 		},
+		{
+			desc: "OK ITEMP",
+			kv:   "ITEMP    : 35.1 C",
+			s: &Status{
+				InternalTemp: 35.1,
+			},
+		},
+		{
+			desc: "OK OUTPUTV",
+			kv:   "OUTPUTV  : 230.4 Volts",
+			s: &Status{
+				OutputVoltage: 230.4,
+			},
+		},
+		{
+			desc: "OK LINEFREQ",
+			kv:   "LINEFREQ : 50.0 Hz",
+			s: &Status{
+				LineFrequency: 50.0,
+			},
+		},
 	}
 
 	for _, tt := range tests {