Skip to content

Commit bb0e47d

Browse files
authored
Minor bug fixes for sflow transformer (#170)
- Added missing samping-rate node in deviation file - Give error when delete op is done at collector/config nodes
1 parent e0cfe3e commit bb0e47d

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

models/yang/extensions/openconfig-sampling-sflow-deviation.yang

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ module openconfig-sampling-sflow-deviation {
4848
deviate not-supported;
4949
}
5050

51+
deviation /oc-sampling:sampling/oc-sampling:sflow/oc-sampling:state/oc-sampling:sampling-rate {
52+
deviate not-supported;
53+
}
54+
5155
deviation /oc-sampling:sampling/oc-sampling:sflow/oc-sampling:collectors/oc-sampling:collector/oc-sampling:state/oc-sampling:packets-sent {
5256
deviate not-supported;
5357
}

translib/transformer/xfmr_sflow.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -276,9 +276,14 @@ var YangToDb_sflow_collector_xfmr SubTreeXfmrYangToDb = func(inParams XfmrParams
276276
log.V(3).Info("sFlow Collector YangToDBSubTreeXfmr: ", inParams.uri)
277277
col_map := make(map[string]db.Value)
278278
sflowObj := getSflowRootObject(inParams.ygRoot)
279+
targetUriPath, _, _ := XfmrRemoveXPATHPredicates(inParams.requestUri)
279280

280281
key := makeColKey(inParams.uri)
281282
if inParams.oper == DELETE {
283+
if strings.HasPrefix(targetUriPath, SAMPLING_SFLOW_COLS_COL_CONFIG) {
284+
return res_map, errors.New("Delete operation not supported for this xpath")
285+
}
286+
282287
if key != "" {
283288
col_map[key] = db.Value{Field: make(map[string]string)}
284289
}
@@ -378,7 +383,7 @@ var YangToDb_sflow_interface_xfmr SubTreeXfmrYangToDb = func(inParams XfmrParams
378383
intf_map := make(map[string]db.Value)
379384
sflowObj := getSflowRootObject(inParams.ygRoot)
380385
targetUriPath, _, _ := XfmrRemoveXPATHPredicates(inParams.requestUri)
381-
log.V(3).Infof("Subscribe_sflow_xfmr: targetUri %v ", targetUriPath)
386+
log.V(3).Infof("YangToDb_sflow_interface_xfmr: targetUri %v ", targetUriPath)
382387

383388
if inParams.oper == DELETE {
384389
if !strings.Contains(targetUriPath, SAMPLING_SFLOW_INTFS_INTF) {

0 commit comments

Comments
 (0)