properly set the heartbeat interval for a target defined subscription

openconfig · Jan 20, 2025 · 378fb7c · 378fb7c
1 parent 90be036
commit 378fb7c
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/pkg/config/subscriptions.go b/pkg/config/subscriptions.go
@@ -314,7 +314,19 @@ func (c *Config) subscriptionOpts(sc *types.SubscriptionConfig, tc *types.Target
 					subGnmiOpts = append(subGnmiOpts, api.HeartbeatInterval(*sc.HeartbeatInterval))
 				}
 				subGnmiOpts = append(subGnmiOpts, api.SubscriptionMode(sc.StreamMode))
-			case gnmi.SubscriptionMode_SAMPLE, gnmi.SubscriptionMode_TARGET_DEFINED:
+			case gnmi.SubscriptionMode_TARGET_DEFINED:
+				if sc.HeartbeatInterval != nil {
+					subGnmiOpts = append(subGnmiOpts, api.HeartbeatInterval(*sc.HeartbeatInterval))
+				}
+				if sc.SampleInterval != nil {
+					subGnmiOpts = append(subGnmiOpts, api.SampleInterval(*sc.SampleInterval))
+				}
+				subGnmiOpts = append(subGnmiOpts, api.SuppressRedundant(sc.SuppressRedundant))
+				if sc.SuppressRedundant && sc.HeartbeatInterval != nil {
+					subGnmiOpts = append(subGnmiOpts, api.HeartbeatInterval(*sc.HeartbeatInterval))
+				}
+				subGnmiOpts = append(subGnmiOpts, api.SubscriptionMode(sc.StreamMode))
+			case gnmi.SubscriptionMode_SAMPLE:
 				if sc.SampleInterval != nil {
 					subGnmiOpts = append(subGnmiOpts, api.SampleInterval(*sc.SampleInterval))
 				}