Revert "txn: remove default values (IBM#219)" (IBM#220)

This reverts commit 50f2430.
roytman · Jun 13, 2021 · a6513a0 · a6513a0
1 parent 50f2430
commit a6513a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/pkg/ovsdb/transact.go b/pkg/ovsdb/transact.go
@@ -52,7 +52,7 @@ const (
 func init() {
 	fs := flag.NewFlagSet("fs", flag.PanicOnError)
 	klog.InitFlags(fs)
-	//fs.Set("v", "10")
+	fs.Set("v", "10")
 }
 
 func isEqualSet(expected, actual interface{}) bool {
@@ -1686,7 +1686,7 @@ func doInsert(txn *Transaction, ovsOp *libovsdb.Operation, ovsResult *libovsdb.O
 	key := common.NewDataKey(txn.request.DBName, *ovsOp.Table, uuid)
 	row := txn.cache.Row(key)
 	*row = *ovsOp.Row
-	// txn.schemas.Default(txn.request.DBName, *ovsOp.Table, row)
+	txn.schemas.Default(txn.request.DBName, *ovsOp.Table, row)
 	setRowUUID(row, uuid)
 
 	err = txn.RowPrepare(tableSchema, txn.mapUUID, ovsOp.Row)

diff --git a/pkg/ovsdb/transact_test.go b/pkg/ovsdb/transact_test.go
@@ -289,7 +289,6 @@ func TestTransactInsertSimple(t *testing.T) {
 	table := "table1"
 	row := map[string]interface{}{
 		"key1": "val1",
-		"key2": int(0),
 	}
 	req := &libovsdb.Transact{
 		DBName: "simple",
@@ -314,7 +313,6 @@ func testTransactInsertSimpleScale(t *testing.T, n int) {
 	table := "table1"
 	row := map[string]interface{}{
 		"key1": "val1",
-		"key2": int(0),
 	}
 	op := libovsdb.Operation{
 		Op:    OP_INSERT,
@@ -367,7 +365,6 @@ func TestTransactInsertSimpleWithUUID(t *testing.T) {
 	table := "table1"
 	row := map[string]interface{}{
 		"key1": "val1",
-		"key2": int(0),
 	}
 	req := &libovsdb.Transact{
 		DBName: "simple",
@@ -393,7 +390,6 @@ func TestTransactInsertSimpleWithUUIDName(t *testing.T) {
 	table := "table1"
 	row := map[string]interface{}{
 		"key1": "val1",
-		"key2": int(0),
 	}
 	uuidName := "myuuid"
 	req := &libovsdb.Transact{