diff options
Diffstat (limited to 'src/lib/rpc')
| -rw-r--r-- | src/lib/rpc/unit-test/lib/helpers.exp | 16 | ||||
| -rwxr-xr-x | src/lib/rpc/unit-test/rpc_test_setup.sh | 14 |
2 files changed, 15 insertions, 15 deletions
diff --git a/src/lib/rpc/unit-test/lib/helpers.exp b/src/lib/rpc/unit-test/lib/helpers.exp index b69be5b6b..963fff458 100644 --- a/src/lib/rpc/unit-test/lib/helpers.exp +++ b/src/lib/rpc/unit-test/lib/helpers.exp @@ -50,7 +50,7 @@ proc expect_kadm_ok {} { global kadmin_tcl_spawn_id expect { -i $kadmin_tcl_spawn_id - -re "^OK OVSEC_KADM_OK \[^\n\]*\n" {} + -re "^OK KADM5_OK \[^\n\]*\n" {} -re "^ERROR \[^\n\]*\n" { perror "kadmin tcl subprocess reported unexpected error" } -re "^marshall_new_creds: \[^\n\]*\n" { exp_continue } -re "^gssapi_\[^\n\]*\n" { exp_continue } @@ -68,7 +68,7 @@ proc setup_database {} { send_user "TOP=$TOP\n" set_from_env TESTDIR $env(TOP)/testing - set_from_env CLNTTCL $TESTDIR/util/ovsec_kadm_clnt_tcl + set_from_env CLNTTCL $TESTDIR/util/kadm5_clnt_tcl set_from_env TCLUTIL $TESTDIR/tcl/util.t set env(TCLUTIL) $TCLUTIL set_from_env MAKE_KEYTAB $TESTDIR/scripts/make-host-keytab.pl @@ -96,22 +96,22 @@ proc setup_database {} { } expect_tcl_prompt - send_tcl_cmd_await_echo {ovsec_kadm_init admin admin $OVSEC_KADM_ADMIN_SERVICE null $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 server_handle} + send_tcl_cmd_await_echo {kadm5_init admin admin $KADM5_ADMIN_SERVICE null $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 server_handle} expect_kadm_ok expect "^% " - send_tcl_cmd_await_echo {ovsec_kadm_create_principal $server_handle [simple_principal server/$h] {OVSEC_KADM_PRINCIPAL} admin} + send_tcl_cmd_await_echo {kadm5_create_principal $server_handle [simple_principal server/$h] {KADM5_PRINCIPAL} admin} expect_kadm_ok expect "^% " - send_tcl_cmd_await_echo {ovsec_kadm_randkey_principal $server_handle server/$h key} + send_tcl_cmd_await_echo {kadm5_randkey_principal $server_handle server/$h key null} expect_kadm_ok expect "^% " - send_tcl_cmd_await_echo {ovsec_kadm_create_principal $server_handle [simple_principal notserver/$h] {OVSEC_KADM_PRINCIPAL} admin} + send_tcl_cmd_await_echo {kadm5_create_principal $server_handle [simple_principal notserver/$h] {KADM5_PRINCIPAL} admin} expect_kadm_ok expect "^% " - send_tcl_cmd_await_echo {ovsec_kadm_randkey_principal $server_handle notserver/$h key} + send_tcl_cmd_await_echo {kadm5_randkey_principal $server_handle notserver/$h key null} expect_kadm_ok expect "^% " - send_tcl_cmd_await_echo {ovsec_kadm_destroy $server_handle} + send_tcl_cmd_await_echo {kadm5_destroy $server_handle} expect_kadm_ok expect "^% " wait -nowait -i $spawn_id diff --git a/src/lib/rpc/unit-test/rpc_test_setup.sh b/src/lib/rpc/unit-test/rpc_test_setup.sh index 0f8ca9d93..968f52a67 100755 --- a/src/lib/rpc/unit-test/rpc_test_setup.sh +++ b/src/lib/rpc/unit-test/rpc_test_setup.sh @@ -8,7 +8,7 @@ # $Source$ DUMMY=${TESTDIR=$TOP/testing} -DUMMY=${CLNTTCL=$TESTDIR/util/ovsec_kadm_clnt_tcl} +DUMMY=${CLNTTCL=$TESTDIR/util/kadm5_clnt_tcl} DUMMY=${TCLUTIL=$TESTDIR/tcl/util.t}; export TCLUTIL DUMMY=${MAKE_KEYTAB=$TESTDIR/scripts/make-host-keytab.pl} @@ -26,13 +26,13 @@ export CANON_HOST cat - > /tmp/rpc_test_setup$$ <<\EOF source $env(TCLUTIL) set h $env(CANON_HOST) -puts stdout [ovsec_kadm_init admin admin $OVSEC_KADM_ADMIN_SERVICE null $OVSEC_KADM_STRUCT_VERSION $OVSEC_KADM_API_VERSION_1 server_handle] +puts stdout [kadm5_init admin admin $KADM5_ADMIN_SERVICE null $KADM5_STRUCT_VERSION $KADM5_API_VERSION_2 server_handle] if ![info exists server_handle] { exit 1 } -puts stdout [ovsec_kadm_create_principal $server_handle [simple_principal server/$h] {OVSEC_KADM_PRINCIPAL} admin] -puts stdout [ovsec_kadm_randkey_principal $server_handle server/$h key] -puts stdout [ovsec_kadm_create_principal $server_handle [simple_principal notserver/$h] {OVSEC_KADM_PRINCIPAL} admin] -puts stdout [ovsec_kadm_randkey_principal $server_handle notserver/$h key] -puts stdout [ovsec_kadm_destroy $server_handle] +puts stdout [kadm5_create_principal $server_handle [simple_principal server/$h] {KADM5_PRINCIPAL} admin] +puts stdout [kadm5_randkey_principal $server_handle server/$h key null] +puts stdout [kadm5_create_principal $server_handle [simple_principal notserver/$h] {KADM5_PRINCIPAL} admin] +puts stdout [kadm5_randkey_principal $server_handle notserver/$h key null] +puts stdout [kadm5_destroy $server_handle] EOF eval "$CLNTTCL $REDIRECT < /tmp/rpc_test_setup$$" if test $? != 0 ; then |