Skip to content

Commit 63b35ec

Browse files
azhou-niciraazhou-nicira
committed
test: change replication test to use unix domain socket
The ovsdb replication feature is not specific to the ovsdb socket types. Switching the tests to use Unix domain socket simplifies the tests. Signed-off-by: Andy Zhou <azhou@ovn.org> Acked-by: Ben Pfaff <blp@ovn.org>
1 parent c8d7a71 commit 63b35ec

1 file changed

Lines changed: 30 additions & 40 deletions

File tree

‎tests/ovsdb-server.at‎

Lines changed: 30 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -978,7 +978,7 @@ m4_define([OVSDB_CHECK_EXECUTION],
978978

979979
EXECUTION_EXAMPLES
980980

981-
AT_BANNER([OVSDB -- ovsdb-server replication (TCP IPv4 sockets)])
981+
AT_BANNER([OVSDB -- ovsdb-server replication])
982982

983983
# OVSDB_CHECK_EXECUTION(TITLE, SCHEMA, TRANSACTIONS, OUTPUT, [KEYWORDS])
984984
#
@@ -998,21 +998,19 @@ m4_define([OVSDB_CHECK_EXECUTION],
998998
AT_CHECK([ovsdb-tool create db1 schema], [0], [stdout], [ignore])
999999
AT_CHECK([ovsdb-tool create db2 schema], [0], [stdout], [ignore])
10001000

1001-
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db1], [0], [ignore], [ignore])
1002-
PARSE_LISTENING_PORT([ovsdb-server1.log], [TCP_PORT1])
1001+
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log --pidfile="`pwd`"/pid --remote=punix:db.sock --unixctl="`pwd`"/unixctl db1], [0], [ignore], [ignore])
10031002

1004-
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log --pidfile="`pwd`"/pid2 --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl2 --sync-from=tcp:127.0.0.1:$TCP_PORT1 db2], [0], [ignore], [ignore])
1005-
PARSE_LISTENING_PORT([ovsdb-server2.log], [TCP_PORT2])
1003+
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log --pidfile="`pwd`"/pid2 --remote=punix:db2.sock --unixctl="`pwd`"/unixctl2 --sync-from=unix:db.sock db2], [0], [ignore], [ignore])
10061004

10071005
m4_foreach([txn], [$3],
1008-
[AT_CHECK([ovsdb-client transact tcp:127.0.0.1:$TCP_PORT1 'txn'; sleep 2], [0], [stdout], [ignore],
1006+
[AT_CHECK([ovsdb-client transact 'txn'; sleep 2], [0], [stdout], [ignore],
10091007
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
10101008
])
10111009

1012-
AT_CHECK([ovsdb-client dump tcp:127.0.0.1:$TCP_PORT1], [0], [stdout], [ignore],
1010+
AT_CHECK([ovsdb-client dump], [0], [stdout], [ignore],
10131011
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
10141012
cat stdout >> dump1
1015-
AT_CHECK([ovsdb-client dump tcp:127.0.0.1:$TCP_PORT2], [0], [stdout], [ignore],
1013+
AT_CHECK([ovsdb-client dump unix:db2.sock], [0], [stdout], [ignore],
10161014
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
10171015
cat stdout >> dump2
10181016

@@ -1024,7 +1022,7 @@ m4_define([OVSDB_CHECK_EXECUTION],
10241022

10251023
EXECUTION_EXAMPLES
10261024

1027-
AT_BANNER([OVSDB -- ovsdb-server replication table-exclusion (TCP IPv4 sockets)])
1025+
AT_BANNER([OVSDB -- ovsdb-server replication table-exclusion])
10281026

10291027
# OVSDB_CHECK_REPLICATION(TITLE, SCHEMA, TRANSACTIONS, OUTPUT, [KEYWORDS])
10301028
#
@@ -1049,21 +1047,19 @@ m4_define([OVSDB_CHECK_REPLICATION],
10491047
AT_CHECK([ovsdb-tool create db1 schema], [0], [stdout], [ignore])
10501048
AT_CHECK([ovsdb-tool create db2 schema], [0], [stdout], [ignore])
10511049

1052-
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db1], [0], [ignore], [ignore])
1053-
PARSE_LISTENING_PORT([ovsdb-server1.log], [TCP_PORT1])
1050+
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log --pidfile="`pwd`"/pid --remote=punix:db.sock --unixctl="`pwd`"/unixctl db1], [0], [ignore], [ignore])
10541051

1055-
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log --pidfile="`pwd`"/pid2 --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl2 --sync-from=tcp:127.0.0.1:$TCP_PORT1 --sync-exclude-tables=mydb:b db2], [0], [ignore], [ignore])
1056-
PARSE_LISTENING_PORT([ovsdb-server2.log], [TCP_PORT2])
1052+
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log --pidfile="`pwd`"/pid2 --remote=punix:db2.sock --unixctl="`pwd`"/unixctl2 --sync-from=unix:db.sock --sync-exclude-tables=mydb:b db2], [0], [ignore], [ignore])
10571053

10581054
m4_foreach([txn], [$3],
1059-
[AT_CHECK([ovsdb-client transact tcp:127.0.0.1:$TCP_PORT1 'txn'; sleep 2], [0], [stdout], [ignore],
1055+
[AT_CHECK([ovsdb-client transact 'txn'; sleep 2], [0], [stdout], [ignore],
10601056
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
10611057
])
10621058

1063-
AT_CHECK([ovsdb-client dump tcp:127.0.0.1:$TCP_PORT1], [0], [stdout], [ignore],
1059+
AT_CHECK([ovsdb-client dump], [0], [stdout], [ignore],
10641060
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
10651061
cat stdout >> dump1
1066-
AT_CHECK([ovsdb-client dump tcp:127.0.0.1:$TCP_PORT2], [0], [stdout], [ignore],
1062+
AT_CHECK([ovsdb-client dump unix:db2.sock], [0], [stdout], [ignore],
10671063
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
10681064
cat stdout >> dump2
10691065

@@ -1130,15 +1126,13 @@ replication_schema > schema
11301126
AT_CHECK([ovsdb-tool create db1 schema], [0], [stdout], [ignore])
11311127
AT_CHECK([ovsdb-tool create db2 schema], [0], [stdout], [ignore])
11321128

1133-
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db1], [0], [ignore], [ignore])
1134-
PARSE_LISTENING_PORT([ovsdb-server1.log], [TCP_PORT1])
1129+
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log --pidfile="`pwd`"/pid --remote=punix:db.sock --unixctl="`pwd`"/unixctl db1], [0], [ignore], [ignore])
11351130

1136-
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log --pidfile="`pwd`"/pid2 --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl2 --sync-from=tcp:127.0.0.1:$TCP_PORT1 db2], [0], [ignore], [ignore])
1137-
PARSE_LISTENING_PORT([ovsdb-server2.log], [TCP_PORT2])
1131+
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log --pidfile="`pwd`"/pid2 --remote=punix:db2.sock --unixctl="`pwd`"/unixctl2 --sync-from=unix:db.sock db2], [0], [ignore], [ignore])
11381132

11391133
AT_CHECK([ovs-appctl -t "`pwd`"/unixctl2 ovsdb-server/set-sync-excluded-tables mydb:b], [0], [ignore], [ignore], [test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
11401134

1141-
AT_CHECK([ovsdb-client transact tcp:127.0.0.1:$TCP_PORT1 \
1135+
AT_CHECK([ovsdb-client transact unix:db.sock \
11421136
'[["mydb",
11431137
{"op": "insert",
11441138
"table": "a",
@@ -1149,10 +1143,10 @@ AT_CHECK([ovsdb-client transact tcp:127.0.0.1:$TCP_PORT1 \
11491143
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
11501144
sleep 2
11511145

1152-
AT_CHECK([ovsdb-client dump tcp:127.0.0.1:$TCP_PORT1], [0], [stdout], [ignore],
1146+
AT_CHECK([ovsdb-client dump unix:db.sock], [0], [stdout], [ignore],
11531147
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
11541148
cat stdout >> dump1
1155-
AT_CHECK([ovsdb-client dump tcp:127.0.0.1:$TCP_PORT2], [0], [stdout], [ignore],
1149+
AT_CHECK([ovsdb-client dump unix:db2.sock], [0], [stdout], [ignore],
11561150
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
11571151
cat stdout >> dump2
11581152

@@ -1180,18 +1174,16 @@ replication_schema > schema
11801174
AT_CHECK([ovsdb-tool create db1 schema], [0], [stdout], [ignore])
11811175
AT_CHECK([ovsdb-tool create db2 schema], [0], [stdout], [ignore])
11821176

1183-
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db1], [0], [ignore], [ignore])
1184-
PARSE_LISTENING_PORT([ovsdb-server1.log], [TCP_PORT1])
1177+
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log --pidfile="`pwd`"/pid --remote=punix:db.sock --unixctl="`pwd`"/unixctl db1], [0], [ignore], [ignore])
11851178

1186-
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log --pidfile="`pwd`"/pid2 --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl2 db2], [0], [ignore], [ignore])
1187-
PARSE_LISTENING_PORT([ovsdb-server2.log], [TCP_PORT2])
1179+
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log --pidfile="`pwd`"/pid2 --remote=punix:db2.sock --unixctl="`pwd`"/unixctl2 db2], [0], [ignore], [ignore])
11881180

1189-
AT_CHECK([ovs-appctl -t "`pwd`"/unixctl2 ovsdb-server/set-remote-ovsdb-server tcp:127.0.0.1:$TCP_PORT1], [0], [ignore], [ignore], [test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
1181+
AT_CHECK([ovs-appctl -t "`pwd`"/unixctl2 ovsdb-server/set-remote-ovsdb-server unix:db.sock], [0], [ignore], [ignore], [test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
11901182

11911183
AT_CHECK([ovs-appctl -t "`pwd`"/unixctl2 ovsdb-server/connect-remote-ovsdb-server], [0], [ignore], [ignore],
11921184
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
11931185

1194-
AT_CHECK([ovsdb-client transact tcp:127.0.0.1:$TCP_PORT1 \
1186+
AT_CHECK([ovsdb-client transact unix:db.sock \
11951187
'[["mydb",
11961188
{"op": "insert",
11971189
"table": "a",
@@ -1200,10 +1192,10 @@ AT_CHECK([ovsdb-client transact tcp:127.0.0.1:$TCP_PORT1 \
12001192
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
12011193
sleep 2
12021194

1203-
AT_CHECK([ovsdb-client dump tcp:127.0.0.1:$TCP_PORT1], [0], [stdout], [ignore],
1195+
AT_CHECK([ovsdb-client dump unix:db.sock], [0], [stdout], [ignore],
12041196
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
12051197
cat stdout >> dump1
1206-
AT_CHECK([ovsdb-client dump tcp:127.0.0.1:$TCP_PORT2], [0], [stdout], [ignore],
1198+
AT_CHECK([ovsdb-client dump unix:db2.sock], [0], [stdout], [ignore],
12071199
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
12081200
cat stdout >> dump2
12091201

@@ -1219,36 +1211,34 @@ replication_schema > schema
12191211
AT_CHECK([ovsdb-tool create db1 schema], [0], [stdout], [ignore])
12201212
AT_CHECK([ovsdb-tool create db2 schema], [0], [stdout], [ignore])
12211213

1222-
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log --pidfile="`pwd`"/pid --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl db1], [0], [ignore], [ignore])
1223-
PARSE_LISTENING_PORT([ovsdb-server1.log], [TCP_PORT1])
1214+
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server1.log --pidfile="`pwd`"/pid --remote=punix:db.sock --unixctl="`pwd`"/unixctl db1], [0], [ignore], [ignore])
12241215

1225-
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log --pidfile="`pwd`"/pid2 --remote=ptcp:0:127.0.0.1 --unixctl="`pwd`"/unixctl2 --sync-from=tcp:127.0.0.1:$TCP_PORT1 db2], [0], [ignore], [ignore])
1226-
PARSE_LISTENING_PORT([ovsdb-server2.log], [TCP_PORT2])
1216+
AT_CHECK([ovsdb-server --detach --no-chdir --log-file=ovsdb-server2.log --pidfile="`pwd`"/pid2 --remote=punix:db2.sock --unixctl="`pwd`"/unixctl2 --sync-from=unix:db.sock db2], [0], [ignore], [ignore])
12271217

1228-
AT_CHECK([ovsdb-client transact tcp:127.0.0.1:$TCP_PORT1 \
1218+
AT_CHECK([ovsdb-client transact unix:db.sock \
12291219
'[["mydb",
12301220
{"op": "insert",
12311221
"table": "a",
12321222
"row": {"number": 0, "name": "zero"}}]]'], [0], [stdout], [ignore],
12331223
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
12341224

1235-
OVS_WAIT_UNTIL([ovsdb-client dump tcp:127.0.0.1:$TCP_PORT2 | grep zero])
1225+
OVS_WAIT_UNTIL([ovsdb-client dump unix:db2.sock | grep zero])
12361226

12371227
AT_CHECK([ovs-appctl -t "`pwd`"/unixctl2 ovsdb-server/disconnect-remote-ovsdb-server], [0], [ignore], [ignore],
12381228
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
12391229

1240-
AT_CHECK([ovsdb-client transact tcp:127.0.0.1:$TCP_PORT1 \
1230+
AT_CHECK([ovsdb-client transact unix:db.sock \
12411231
'[["mydb",
12421232
{"op": "insert",
12431233
"table": "b",
12441234
"row": {"number": 1, "name": "one"}}]]'], [0], [stdout], [ignore],
12451235
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
12461236

1247-
AT_CHECK([ovsdb-client dump tcp:127.0.0.1:$TCP_PORT1], [0], [stdout], [ignore],
1237+
AT_CHECK([ovsdb-client dump unix:db.sock], [0], [stdout], [ignore],
12481238
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
12491239
cat stdout >> dump1
12501240

1251-
AT_CHECK([ovsdb-client dump tcp:127.0.0.1:$TCP_PORT2], [0], [stdout], [ignore],
1241+
AT_CHECK([ovsdb-client dump unix:db2.sock], [0], [stdout], [ignore],
12521242
[test ! -e pid || kill `cat pid`; test ! -e pid2 || kill `cat pid2`])
12531243
cat stdout >> dump2
12541244

0 commit comments

Comments
 (0)