Merge pull request #30 from karimra/cleanup

cleanup

Author: karimra

.github/workflows/release.yml

@@ -6,11 +6,11 @@ on:
       - v*
 env:
   GOVER: 1.20.5
-  GORELEASER_VER: v0.180.3
+  GORELEASER_VER: v1.19.2
 
 jobs:  
   test:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v4
@@ -21,7 +21,7 @@ jobs:
           CGO_ENABLED: 0
 
   release:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs:
       - test
     steps:
@@ -37,6 +37,6 @@ jobs:
         uses: goreleaser/goreleaser-action@v4
         with:
           version: latest
-          args: release --rm-dist -f .goreleaser.yml
+          args: release --clean -f .goreleaser.yml
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/test.yml

@@ -8,7 +8,6 @@ on:
       - "!releases/**"
 env:
   GOVER: 1.20.5
-  GORELEASER_VER: v0.180.3
 
 jobs:
   test:

config.go

@@ -161,15 +161,28 @@ func (a *app) handleNwInstCfg(ctx context.Context, cfg *ndk.NetworkInstanceNotif
 func (a *app) handleGrpcTunnel(ctx context.Context, txCfg *ndk.ConfigNotification) {
 	switch txCfg.GetOp() {
 	case ndk.SdkMgrOperation_Create:
+		log.Infof("Create: .system.grpc_tunnel: %+v", txCfg)
 		a.handleGrpcTunnelCreate(ctx, txCfg.GetData())
 	case ndk.SdkMgrOperation_Update:
+		log.Infof("Update: .system.grpc_tunnel: %+v", txCfg)
 		a.handleGrpcTunnelChange(ctx, txCfg.GetData())
 	case ndk.SdkMgrOperation_Delete:
+		log.Infof("Delete: .system.grpc_tunnel: %+v", txCfg)
 		a.handleGrpcTunnelDelete(ctx)
 	}
 }
 
-func (a *app) handleGrpcTunnelCreate(ctx context.Context, cfgData *ndk.ConfigData) {}
+func (a *app) handleGrpcTunnelCreate(ctx context.Context, cfgData *ndk.ConfigData) {
+	newAppCfg := new(appConfig)
+	err := json.Unmarshal([]byte(cfgData.GetJson()), newAppCfg)
+	if err != nil {
+		log.Errorf("failed to unmarshal path %q config %+v", grpcTunnelPath, cfgData)
+		return
+	}
+	a.config.app = newAppCfg
+	a.config.app.OperState = operDown
+	a.updateRootLevelTelemetry(a.config.app)
+}
 
 func (a *app) handleGrpcTunnelChange(ctx context.Context, cfgData *ndk.ConfigData) {
 	// unmarshal changed config
@@ -185,7 +198,6 @@ func (a *app) handleGrpcTunnelChange(ctx context.Context, cfgData *ndk.ConfigDat
 	case a.config.app.AdminState == adminDisable && a.config.app.OperState == operUp:
 		// stop all tunnels
 		a.stopAll(ctx)
-		// TODO: update all telemetry
 		a.config.app.OperState = operDown
 	case a.config.app.AdminState == adminEnable && a.config.app.OperState != operUp:
 		// start all tunnels

telemetry.go

@@ -11,6 +11,7 @@ import (
 )
 
 func (a *app) updateTelemetryPathConfig(jsPath string, jsData string) {
+	log.Infof("updating: %s: %s", jsPath, jsData)
 	key := &ndk.TelemetryKey{JsPath: jsPath}
 	data := &ndk.TelemetryData{JsonContent: jsData}
 	info := &ndk.TelemetryInfo{Key: key, Data: data}

yaml/grpc-tunnel.yaml

@@ -5,6 +5,7 @@ grpc-tunnel:
     launch-command: ./srl-grpc-tunnel
     search-command: ./srl-grpc-tunnel
     version-command: /usr/local/bin/srl-grpc-tunnel -v
+    wait-for-config: Yes
     start-order: 100
     config-delivery-format: proto-json # json, proto-json, binary-tlvs
     failure-threshold: 10