do not include an empty UseModels List if not specified by --model

karimra · Mar 6, 2020 · dcf54e4 · dcf54e4
1 parent c60c33b
commit dcf54e4
Showing 1 changed file with 15 additions and 2 deletions.
diff --git a/cmd/subscribe.go b/cmd/subscribe.go
@@ -284,6 +284,19 @@ func createSubscribeRequest() (*gnmi.SubscribeRequest, error) {
 	models := make([]*gnmi.ModelData, 1)
 	if model != "" {
 		models[0] = &gnmi.ModelData{Name: model}
+		return &gnmi.SubscribeRequest{
+			Request: &gnmi.SubscribeRequest_Subscribe{
+				Subscribe: &gnmi.SubscriptionList{
+					Prefix:       gnmiPrefix,
+					Mode:         gnmi.SubscriptionList_Mode(modeVal),
+					Encoding:     gnmi.Encoding(encodingVal),
+					Subscription: subscriptions,
+					UseModels:    models,
+					Qos:          qos,
+				},
+			},
+		}, nil
+
 	}
 	return &gnmi.SubscribeRequest{
 		Request: &gnmi.SubscribeRequest_Subscribe{
@@ -292,8 +305,8 @@ func createSubscribeRequest() (*gnmi.SubscribeRequest, error) {
 				Mode:         gnmi.SubscriptionList_Mode(modeVal),
 				Encoding:     gnmi.Encoding(encodingVal),
 				Subscription: subscriptions,
-				UseModels:    models,
-				Qos:          qos,
+				//UseModels:    models,
+				Qos: qos,
 			},
 		},
 	}, nil