Merge branch 'master' into dev/liuh/add_gnmi_cert_name

sonic-net · Jun 13, 2024 · 9b65bde · 9b65bde
2 parents 90322b3 + 424212b
commit 9b65bde
Show file tree

Hide file tree

Showing 4 changed files with 402 additions and 10 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -90,6 +90,7 @@ stages:
     - script: |
         # PYTEST
         sudo pip3 install -U pytest
+        sudo pip3 install -U jsonpatch
 
         # REDIS
         sudo apt-get update

diff --git a/sonic_data_client/mixed_db_client.go b/sonic_data_client/mixed_db_client.go
@@ -43,6 +43,9 @@ const RETRY_DELAY_FACTOR uint = 2
 const CHECK_POINT_PATH string = "/etc/sonic"
 const ELEM_INDEX_DATABASE = 0
 const ELEM_INDEX_INSTANCE = 1
+const UPDATE_OPERATION = "add"
+const DELETE_OPERATION = "remove"
+const REPLACE_OPERATION = "replace"
 
 const (
     opAdd = iota
@@ -1110,7 +1113,7 @@ func (c *MixedDbClient) handleTableData(tblPaths []tablePath) error {
 }
 
 /* Populate the JsonPatch corresponding each GNMI operation. */
-func (c *MixedDbClient) ConvertToJsonPatch(prefix *gnmipb.Path, path *gnmipb.Path, t *gnmipb.TypedValue, output *string) error {
+func (c *MixedDbClient) ConvertToJsonPatch(prefix *gnmipb.Path, path *gnmipb.Path, t *gnmipb.TypedValue, operation string, output *string) error {
 	if t != nil {
 		if len(t.GetJsonIetfVal()) == 0 {
 			return fmt.Errorf("Value encoding is not IETF JSON")
@@ -1122,11 +1125,7 @@ func (c *MixedDbClient) ConvertToJsonPatch(prefix *gnmipb.Path, path *gnmipb.Pat
 	}
 
 	elems := fullPath.GetElem()
-	if t == nil {
-		*output = `{"op": "remove", "path": "/`
-	} else {
-		*output = `{"op": "add", "path": "/`
-	}
+	*output = `{"op": "` + operation + `", "path": "/`
 
 	if elems != nil {
 		/* Iterate through elements. */
@@ -1237,7 +1236,7 @@ func (c *MixedDbClient) SetIncrementalConfig(delete []*gnmipb.Path, replace []*g
 			}
 		}
 		curr = ``
-		err = c.ConvertToJsonPatch(c.prefix, path, nil, &curr)
+		err = c.ConvertToJsonPatch(c.prefix, path, nil, DELETE_OPERATION, &curr)
 		if err != nil {
 			return err
 		}
@@ -1276,7 +1275,7 @@ func (c *MixedDbClient) SetIncrementalConfig(delete []*gnmipb.Path, replace []*g
 			}
 		}
 		curr = ``
-		err = c.ConvertToJsonPatch(c.prefix, path.GetPath(), path.GetVal(), &curr)
+		err = c.ConvertToJsonPatch(c.prefix, path.GetPath(), path.GetVal(), REPLACE_OPERATION, &curr)
 		if err != nil {
 			return err
 		}
@@ -1311,7 +1310,7 @@ func (c *MixedDbClient) SetIncrementalConfig(delete []*gnmipb.Path, replace []*g
 			}
 		}
 		curr = ``
-		err = c.ConvertToJsonPatch(c.prefix, path.GetPath(), path.GetVal(), &curr)
+		err = c.ConvertToJsonPatch(c.prefix, path.GetPath(), path.GetVal(), UPDATE_OPERATION, &curr)
 		if err != nil {
 			return err
 		}

diff --git a/test/test_gnmi_configdb.py b/test/test_gnmi_configdb.py
@@ -252,7 +252,7 @@ def test_gnmi_incremental_replace(self, test_data):
             test_path = item['path']
             test_value = item['value']
             for patch_data in patch_json:
-                assert patch_data['op'] == 'add', "Invalid operation"
+                assert patch_data['op'] == 'replace', "Invalid operation"
                 if test_path == '/sonic-db:CONFIG_DB/localhost' + patch_data['path'] and test_value == patch_data['value']:
                     break
             else: