Merge pull request #140 from MalloZup/fix-type

Fix strconv.ParseInt: parsing \"0s\": invalid

Author: Stefano Torresi

collector/pacemaker/cib/data.go

@@ -46,11 +46,12 @@ type Primitive struct {
 	InstanceAttributes []Attribute `xml:"instance_attributes>nvpair"`
 	MetaAttributes     []Attribute `xml:"meta_attributes>nvpair"`
 	Operations         []struct {
-		Id       string `xml:"id,attr"`
-		Name     string `xml:"name,attr"`
-		Role     string `xml:"role,attr"`
-		Interval int    `xml:"interval,attr"`
-		Timeout  int    `xml:"timeout,attr"`
+		Id   string `xml:"id,attr"`
+		Name string `xml:"name,attr"`
+		Role string `xml:"role,attr"`
+		// todo: interval and timeout are time based vars. We should in future parse them correctly insteaf of string
+		Interval string `xml:"interval,attr"`
+		Timeout  string `xml:"timeout,attr"`
 	} `xml:"operations>op"`
 }
 

collector/pacemaker/cib/parser_test.go

@@ -34,26 +34,26 @@ func TestParse(t *testing.T) {
 	assert.Equal(t, 5, len(data.Configuration.Resources.Masters[0].Primitive.Operations))
 	assert.Equal(t, "rsc_SAPHana_PRD_HDB00-start-0", data.Configuration.Resources.Masters[0].Primitive.Operations[0].Id)
 	assert.Equal(t, "start", data.Configuration.Resources.Masters[0].Primitive.Operations[0].Name)
-	assert.Equal(t, 0, data.Configuration.Resources.Masters[0].Primitive.Operations[0].Interval)
-	assert.Equal(t, 3600, data.Configuration.Resources.Masters[0].Primitive.Operations[0].Timeout)
+	assert.Equal(t, "0", data.Configuration.Resources.Masters[0].Primitive.Operations[0].Interval)
+	assert.Equal(t, "3600", data.Configuration.Resources.Masters[0].Primitive.Operations[0].Timeout)
 	assert.Equal(t, "rsc_SAPHana_PRD_HDB00-stop-0", data.Configuration.Resources.Masters[0].Primitive.Operations[1].Id)
 	assert.Equal(t, "stop", data.Configuration.Resources.Masters[0].Primitive.Operations[1].Name)
-	assert.Equal(t, 0, data.Configuration.Resources.Masters[0].Primitive.Operations[1].Interval)
-	assert.Equal(t, 3600, data.Configuration.Resources.Masters[0].Primitive.Operations[1].Timeout)
+	assert.Equal(t, "0", data.Configuration.Resources.Masters[0].Primitive.Operations[1].Interval)
+	assert.Equal(t, "3600", data.Configuration.Resources.Masters[0].Primitive.Operations[1].Timeout)
 	assert.Equal(t, "rsc_SAPHana_PRD_HDB00-promote-0", data.Configuration.Resources.Masters[0].Primitive.Operations[2].Id)
 	assert.Equal(t, "promote", data.Configuration.Resources.Masters[0].Primitive.Operations[2].Name)
-	assert.Equal(t, 0, data.Configuration.Resources.Masters[0].Primitive.Operations[2].Interval)
-	assert.Equal(t, 3600, data.Configuration.Resources.Masters[0].Primitive.Operations[2].Timeout)
+	assert.Equal(t, "0", data.Configuration.Resources.Masters[0].Primitive.Operations[2].Interval)
+	assert.Equal(t, "3600", data.Configuration.Resources.Masters[0].Primitive.Operations[2].Timeout)
 	assert.Equal(t, "rsc_SAPHana_PRD_HDB00-monitor-60", data.Configuration.Resources.Masters[0].Primitive.Operations[3].Id)
 	assert.Equal(t, "monitor", data.Configuration.Resources.Masters[0].Primitive.Operations[3].Name)
 	assert.Equal(t, "Master", data.Configuration.Resources.Masters[0].Primitive.Operations[3].Role)
-	assert.Equal(t, 60, data.Configuration.Resources.Masters[0].Primitive.Operations[3].Interval)
-	assert.Equal(t, 700, data.Configuration.Resources.Masters[0].Primitive.Operations[3].Timeout)
+	assert.Equal(t, "60", data.Configuration.Resources.Masters[0].Primitive.Operations[3].Interval)
+	assert.Equal(t, "700", data.Configuration.Resources.Masters[0].Primitive.Operations[3].Timeout)
 	assert.Equal(t, "rsc_SAPHana_PRD_HDB00-monitor-61", data.Configuration.Resources.Masters[0].Primitive.Operations[4].Id)
 	assert.Equal(t, "monitor", data.Configuration.Resources.Masters[0].Primitive.Operations[4].Name)
 	assert.Equal(t, "Slave", data.Configuration.Resources.Masters[0].Primitive.Operations[4].Role)
-	assert.Equal(t, 61, data.Configuration.Resources.Masters[0].Primitive.Operations[4].Interval)
-	assert.Equal(t, 700, data.Configuration.Resources.Masters[0].Primitive.Operations[4].Timeout)
+	assert.Equal(t, "61", data.Configuration.Resources.Masters[0].Primitive.Operations[4].Interval)
+	assert.Equal(t, "700", data.Configuration.Resources.Masters[0].Primitive.Operations[4].Timeout)
 	assert.Equal(t, "test", data.Configuration.Resources.Primitives[2].Id)
 	assert.Equal(t, "ocf", data.Configuration.Resources.Primitives[2].Class)
 	assert.Equal(t, "heartbeat", data.Configuration.Resources.Primitives[2].Provider)