Skip to content

Commit

Permalink
server: Ensure mutate operations write back to db
Browse files Browse the repository at this point in the history
Signed-off-by: Dave Tucker <[email protected]>
  • Loading branch information
dave-tucker committed Jun 9, 2021
1 parent c8481d3 commit 2afc57f
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 1 deletion.
2 changes: 1 addition & 1 deletion server/database.go
Original file line number Diff line number Diff line change
Expand Up @@ -286,10 +286,10 @@ func (db *inMemoryDatabase) Mutate(database, table string, where []ovsdb.Conditi
panic(err)
}
new := mutate(current, m.Mutator, nativeValue)

if err := info.SetField(m.Column, new); err != nil {
panic(err)
}
targetDb.Table(table).Update(uuid.(string), new)
newRow, err := targetDb.Mapper().NewRow(table, old)
if err != nil {
panic(err)
Expand Down
68 changes: 68 additions & 0 deletions server/database_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,12 @@ import (
"reflect"
"testing"

"github.com/google/uuid"
"github.com/ovn-org/libovsdb/mapper"
"github.com/ovn-org/libovsdb/model"
"github.com/ovn-org/libovsdb/ovsdb"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
)

func TestMutate(t *testing.T) {
Expand Down Expand Up @@ -179,3 +184,66 @@ func TestMutate(t *testing.T) {
})
}
}

func TestMutateOp(t *testing.T) {
defDB, err := model.NewDBModel("Open_vSwitch", map[string]model.Model{
"Open_vSwitch": &ovsType{},
"Bridge": &bridgeType{}})
require.Nil(t, err)
db := NewInMemoryDatabase(map[string]*model.DBModel{"Open_vSwitch": defDB})
schema, err := getSchema()
require.Nil(t, err)

db.CreateDatabase("Open_vSwitch", schema)

ovsUUID := uuid.NewString()
bridgeUUID := uuid.NewString()

m := mapper.NewMapper(schema)

ovs := ovsType{}
ovsRow, err := m.NewRow("Open_vSwitch", &ovs)
require.Nil(t, err)

bridge := bridgeType{
Name: "foo",
}
bridgeRow, err := m.NewRow("Bridge", &bridge)
require.Nil(t, err)

res, _ := db.Insert("Open_vSwitch", "Open_vSwitch", ovsUUID, ovsRow)
_, err = ovsdb.CheckOperationResults([]ovsdb.OperationResult{res}, []ovsdb.Operation{{Op: "insert"}})
require.Nil(t, err)

res, _ = db.Insert("Open_vSwitch", "Bridge", bridgeUUID, bridgeRow)
_, err = ovsdb.CheckOperationResults([]ovsdb.OperationResult{res}, []ovsdb.Operation{{Op: "insert"}})
require.Nil(t, err)

gotResult, gotUpdate := db.Mutate(
"Open_vSwitch",
"Open_vSwitch",
[]ovsdb.Condition{
ovsdb.NewCondition("_uuid", ovsdb.ConditionEqual, ovsdb.UUID{GoUUID: ovsUUID}),
},
[]ovsdb.Mutation{
*ovsdb.NewMutation("bridges", ovsdb.MutateOperationInsert, ovsdb.UUID{GoUUID: bridgeUUID}),
},
)
assert.Equal(t, ovsdb.OperationResult{Count: 1}, gotResult)

bridgeSet, err := ovsdb.NewOvsSet([]ovsdb.UUID{{GoUUID: bridgeUUID}})
assert.Nil(t, err)
assert.Equal(t, ovsdb.TableUpdates{
"Open_vSwitch": ovsdb.TableUpdate{
ovsUUID: &ovsdb.RowUpdate{
Old: &ovsdb.Row{
"_uuid": ovsdb.UUID{GoUUID: ovsUUID},
},
New: &ovsdb.Row{
"_uuid": ovsdb.UUID{GoUUID: ovsUUID},
"bridges": bridgeSet,
},
},
},
}, gotUpdate)
}

0 comments on commit 2afc57f

Please sign in to comment.