Merge pull request #31 from karimra/async-sysinfo

async sysinfo

Author: karimra

config.go

@@ -104,10 +104,6 @@ type stringValue struct {
 	Value string `json:"value,omitempty"`
 }
 
-// type uint64Value struct {
-// 	Value uint64 `json:"value,omitempty"`
-// }
-
 type boolValue struct {
 	Value bool `json:"value,omitempty"`
 }

example/acls.yaml

@@ -21,4 +21,10 @@ updates:
         source-port:
           range:
             start: 57401  
-            end: 57502
+            end: 57502
+
+  - path: /system/gnmi-server/unix-socket
+    encoding: json_ietf
+    value:
+      admin-state: enable
+      use-authentication: false

example/run.sh

@@ -1,7 +1,8 @@
 #!/bin/bash
 
 # download the RPM file
-wget -qL https://github.com/karimra/srl-grpc-tunnel/releases/download/v0.0.1/srl-grpc-tunnel_0.0.1_Linux_x86_64.rpm -P rpm/
+
+wget -qL https://github.com/karimra/srl-grpc-tunnel/releases/download/v0.0.1/srl-grpc-tunnel_0.1.5_Linux_x86_64.rpm -P rpm/
 
 #deploy the lab
 sudo clab deploy -t grpc_tunnel.clab.yaml --reconfigure 

main.go

@@ -50,17 +50,26 @@ CRAGENT:
 
 	a := newApp(ctx, WithAgent(app))
 	//
-SYSINFO:
-	log.Info("getting system info...")
-	sysInfo, err := a.getSystemInfo(ctx)
-	if err != nil {
-		log.Errorf("failed to get system info %q: %v", agentName, err)
-		log.Infof("retrying in %s", retryInterval)
-		time.Sleep(retryInterval)
-		goto SYSINFO
-	}
-	log.Infof("system info: %+v", sysInfo)
-	a.config.sysInfo = *sysInfo
+	go func() {
+		for {
+			select {
+			case <-ctx.Done():
+				return
+			default:
+				log.Info("getting system info...")
+				sysInfo, err := a.getSystemInfo(ctx)
+				if err != nil {
+					log.Errorf("failed to get system info %q: %v", agentName, err)
+					log.Infof("retrying in %s", retryInterval)
+					time.Sleep(retryInterval)
+					continue
+				}
+				log.Infof("system info: %+v", sysInfo)
+				a.config.sysInfo = *sysInfo
+				return
+			}
+		}
+	}()
 	log.Info("starting config handler...")
 	a.start(ctx)
 }

sysinfo.go

@@ -21,28 +21,28 @@ var sysInfoPaths = []*gnmi.Path{
 			{Name: "host-name"},
 		},
 	},
-	{
-		Elem: []*gnmi.PathElem{
-			{Name: "interface",
-				Key: map[string]string{"name": "mgmt0"},
-			},
-			{Name: "subinterface"},
-			{Name: "ipv4"},
-			{Name: "address"},
-			{Name: "status"},
-		},
-	},
-	{
-		Elem: []*gnmi.PathElem{
-			{Name: "interface",
-				Key: map[string]string{"name": "mgmt0"},
-			},
-			{Name: "subinterface"},
-			{Name: "ipv6"},
-			{Name: "address"},
-			{Name: "status"},
-		},
-	},
+	// {
+	// 	Elem: []*gnmi.PathElem{
+	// 		{Name: "interface",
+	// 			Key: map[string]string{"name": "mgmt0"},
+	// 		},
+	// 		{Name: "subinterface"},
+	// 		{Name: "ipv4"},
+	// 		{Name: "address"},
+	// 		{Name: "status"},
+	// 	},
+	// },
+	// {
+	// 	Elem: []*gnmi.PathElem{
+	// 		{Name: "interface",
+	// 			Key: map[string]string{"name": "mgmt0"},
+	// 		},
+	// 		{Name: "subinterface"},
+	// 		{Name: "ipv6"},
+	// 		{Name: "address"},
+	// 		{Name: "status"},
+	// 	},
+	// },
 	{
 		Elem: []*gnmi.PathElem{
 			{Name: "system"},
@@ -61,14 +61,11 @@ var sysInfoPaths = []*gnmi.Path{
 type systemInfo struct {
 	Name                string
 	Version             string
-	ChassisType         string
-	ChassisMacAddress   string
-	ChassisCLEICode     string
-	ChassisPartNumber   string
-	ChassisSerialNumber string
-	//NetworkInstance     string
-	IPAddrV4 string
-	IPAddrV6 string
+	ChassisType         string `json:"type,omitempty"`
+	ChassisMacAddress   string `json:"hw-mac-address,omitempty"`
+	ChassisCLEICode     string `json:"clei-code,omitempty"`
+	ChassisPartNumber   string `json:"part-number,omitempty"`
+	ChassisSerialNumber string `json:"serial-number,omitempty"`
 }
 
 func createGNMIClient(ctx context.Context) (gnmi.GNMIClient, error) {
@@ -84,7 +81,10 @@ func createGNMIClient(ctx context.Context) (gnmi.GNMIClient, error) {
 }
 
 func (a *app) getSystemInfo(ctx context.Context) (*systemInfo, error) {
-	ctx = metadata.AppendToOutgoingContext(ctx, "username", a.config.username, "password", a.config.password)
+	ctx = metadata.AppendToOutgoingContext(ctx,
+		"username", a.config.username,
+		"password", a.config.password,
+	)
 	sctx, cancel := context.WithCancel(ctx)
 	defer cancel()
 START:
@@ -94,7 +94,7 @@ START:
 	default:
 		gnmiClient, err := createGNMIClient(sctx)
 		if err != nil {
-			log.Infof("failed to create a gnmi connection to %q: %v", gnmiServerUnixSocket, err)
+			log.Errorf("failed to create a gnmi connection to %q: %v", gnmiServerUnixSocket, err)
 			time.Sleep(retryInterval)
 			goto START
 		}
@@ -115,16 +115,6 @@ START:
 		for _, n := range rsp.GetNotification() {
 			for _, u := range n.GetUpdate() {
 				path := utils.GnmiPathToXPath(u.GetPath(), true)
-				if strings.HasPrefix(path, "interface") {
-					if strings.Contains(path, "/ipv4/address/status") {
-						ip := getPathKeyVal(u.GetPath(), "address", "ip-prefix")
-						sysInfo.IPAddrV4 = strings.Split(ip, "/")[0]
-					}
-					if strings.Contains(path, "/ipv6/address/status") {
-						ip := getPathKeyVal(u.GetPath(), "address", "ip-prefix")
-						sysInfo.IPAddrV6 = strings.Split(ip, "/")[0]
-					}
-				}
 				if strings.Contains(path, "system/name") {
 					sysInfo.Name = u.GetVal().GetStringVal()
 				}
@@ -152,12 +142,3 @@ START:
 		return sysInfo, nil
 	}
 }
-
-func getPathKeyVal(p *gnmi.Path, elem, key string) string {
-	for _, e := range p.GetElem() {
-		if e.Name == elem {
-			return e.Key[key]
-		}
-	}
-	return ""
-}