adding netconf as a feature czerwonk#2

Author: lethalwp

accounting/collector.go

@@ -126,10 +126,16 @@ func (c *accountingCollector) accountingFlows(client *rpc.Client) (*AccountingFl
 
 func (c *accountingCollector) accountingFailures(client *rpc.Client) (*AccountingError, error) {
 	var x = AccountingFlowErrorRpc{}
-//	err := client.RunCommandAndParse("show services accounting errors inline-jflow fpc-slot 0", &x)
-	err := client.RunCommandAndParse("<get-service-accounting-error-inline-jflow-information><inline-jflow-error-information>0</inline-jflow-error-information></get-service-accounting-error-inline-jflow-information>", &x)
-	if err != nil {
-		return nil, err
+	if client.Netconf {
+		err := client.RunCommandAndParse("<get-service-accounting-error-inline-jflow-information><inline-jflow-error-information>0</inline-jflow-error-information></get-service-accounting-error-inline-jflow-information>", &x)
+		if err != nil {
+			return nil, err
+		}
+	} else {
+		err := client.RunCommandAndParse("show services accounting errors inline-jflow fpc-slot 0", &x)
+		if err != nil {
+			return nil, err
+		}
 	}
 
 	return &AccountingError{

bgp/collector.go

@@ -79,19 +79,16 @@ func (c *bgpCollector) collect(client *rpc.Client, ch chan<- prometheus.Metric,
 	var cmd strings.Builder
 	if client.Netconf {
 		cmd.WriteString("<get-bgp-neighbor-information/>")
-		err := client.RunCommandAndParse(cmd.String(), &x)
-		if err != nil {
-			return err
-		}
 	} else {
 		cmd.WriteString("show bgp neighbor")
 		if c.LogicalSystem != "" {
 			cmd.WriteString(" logical-system " + c.LogicalSystem)
 		}
-		err := client.RunCommandAndParse(cmd.String(), &x)
-		if err != nil {
-			return err
-		}
+	}
+
+	err := client.RunCommandAndParse(cmd.String(), &x)
+	if err != nil {
+		return err
 	}
 
 

fpc/collector.go

@@ -129,12 +129,20 @@ func (c *fpcCollector) CollectFPCDetail(client *rpc.Client, ch chan<- prometheus
 // Collect collects metrics from JunOS
 func (c *fpcCollector) CollectFPC(client *rpc.Client, ch chan<- prometheus.Metric, labelValues []string) error {
 	r := RpcReply{}
-//	err := client.RunCommandAndParseWithParser("show chassis fpc", func(b []byte) error {
-	err := client.RunCommandAndParseWithParser("<get-fpc-information/>", func(b []byte) error {
-		return parseXML(b, &r)
-	})
-	if err != nil {
-		return err
+	if client.Netconf {
+		err := client.RunCommandAndParseWithParser("<get-fpc-information/>", func(b []byte) error {
+			return parseXML(b, &r)
+		})
+		if err != nil {
+			return err
+		}
+	} else {
+		err := client.RunCommandAndParseWithParser("show chassis fpc", func(b []byte) error {
+			return parseXML(b, &r)
+		})
+		if err != nil {
+			return err
+		}
 	}
 
 	for _, r := range r.MultiRoutingEngineResults.RoutingEngine {
@@ -148,12 +156,20 @@ func (c *fpcCollector) CollectFPC(client *rpc.Client, ch chan<- prometheus.Metri
 
 func (c *fpcCollector) CollectPIC(client *rpc.Client, ch chan<- prometheus.Metric, labelValues []string) error {
 	r := RpcReply{}
-//	err := client.RunCommandAndParseWithParser("show chassis fpc pic-status", func(b []byte) error {
-	err := client.RunCommandAndParseWithParser("<get-pic-information/>", func(b []byte) error {
-		return parseXML(b, &r)
-	})
-	if err != nil {
-		return err
+	if client.Netconf {
+		err := client.RunCommandAndParseWithParser("<get-pic-information/>", func(b []byte) error {
+			return parseXML(b, &r)
+		})
+		if err != nil {
+			return err
+		}
+	} else {
+		err := client.RunCommandAndParseWithParser("show chassis fpc pic-status", func(b []byte) error {
+			return parseXML(b, &r)
+		})
+		if err != nil {
+			return err
+		}
 	}
 	for _, r := range r.MultiRoutingEngineResults.RoutingEngine {
 		labels := append(labelValues, r.Name)