[ct_netconfc] Start multiple sessions per SSH connection

The following new functions are added to ct_netconfc:

* connect/1,2 - open an SSH connection to a netconf server
* disconnect/1 - close the given SSH connectoin
* session/1,2,3 - open an SSH channel on the give connection and send
  'hello' to start a netconf session.

This allows running multiple channels on on SSH connection, realizing
one netconf session per channel. The existing ct_netconfc:open will
always run one channel(session) per SSH connection.

4 files changed, 74 insertions, 12 deletions

diff --git a/lib/common_test/test/ct_netconfc_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE.erl
index 8932f930d1..05edb45fe8 100644
--- a/lib/common_test/test/ct_netconfc_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE.erl
@@ -52,9 +52,8 @@ init_per_suite(Config) ->
     end.
 
 check_crypto_and_ssh() ->
-    (catch code:load_file(crypto)),
-    case code:is_loaded(crypto) of
-	{file,_} ->
+    case code:ensure_loaded(crypto) of
+	{module,_} ->
 	    case catch ssh:start() of
 		Ok when Ok==ok; Ok=={error,{already_started,ssh}} ->
 		    ct:log("ssh started",[]),
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
index 2aa6c4d354..6a41f0a04c 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc1_SUITE.erl
@@ -102,7 +102,9 @@ all() ->
 	     receive_one_event,
 	     receive_multiple_events,
 	     receive_event_and_rpc,
-	     receive_event_and_rpc_in_chunks
+	     receive_event_and_rpc_in_chunks,
+             multiple_channels,
+             kill_session_same_connection
 	    ]
     end.
 
@@ -124,7 +126,7 @@ end_per_testcase(_Case, _Config) ->
     ok.
 
 init_per_suite(Config) ->
-    (catch code:load_file(crypto)),
+    code:ensure_loaded(crypto),
     case {ssh:start(),code:is_loaded(crypto)} of
 	{Ok,{file,_}} when Ok==ok; Ok=={error,{already_started,ssh}} ->
 	    ct:log("ssh started",[]),
@@ -498,10 +500,11 @@ kill_session(Config) ->
 
     ?NS:hello(2),
     ?NS:expect(2,hello),
-    {ok,_OtherClient} = open(SshDir),
+    {ok,OtherClient} = open(SshDir),
 
     ?NS:expect_do_reply('kill-session',{kill,2},ok),
     ?ok = ct_netconfc:kill_session(Client,2),
+    {error,_}=ct_netconfc:get(OtherClient,{server,[{xmlns,"myns"}],[]}),
 
     ?NS:expect_do_reply('close-session',close,ok),
     ?ok = ct_netconfc:close_session(Client),
@@ -1179,13 +1182,73 @@ receive_event_and_rpc_in_chunks(Config) ->
     ?ok = ct_netconfc:close_session(Client),
     ok.
 
+multiple_channels(Config) ->
+    SshDir = ?config(ssh_dir,Config),
+    SshOpts = ?DEFAULT_SSH_OPTS(SshDir),
+    {ok,Conn} = ct_netconfc:connect(SshOpts),
+    ?NS:hello(1),
+    ?NS:expect(hello),
+    {ok,Client1} = ct_netconfc:session(Conn),
+    ?NS:hello(2),
+    ?NS:expect(2,hello),
+    {ok,Client2} = ct_netconfc:session(Conn),
+    ?NS:hello(3),
+    ?NS:expect(3,hello),
+    {ok,Client3} = ct_netconfc:session(Conn),
+
+    Data = [{server,[{xmlns,"myns"}],[{name,[],["myserver"]}]}],
+    ?NS:expect_reply(1,'get',{data,Data}),
+    {ok,Data} = ct_netconfc:get(Client1,{server,[{xmlns,"myns"}],[]}),
+    ?NS:expect_reply(2,'get',{data,Data}),
+    {ok,Data} = ct_netconfc:get(Client2,{server,[{xmlns,"myns"}],[]}),
+    ?NS:expect_reply(3,'get',{data,Data}),
+    {ok,Data} = ct_netconfc:get(Client3,{server,[{xmlns,"myns"}],[]}),
+
+    ?NS:expect_do_reply(2,'close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client2),
+
+    ?NS:expect_reply(1,'get',{data,Data}),
+    {ok,Data} = ct_netconfc:get(Client1,{server,[{xmlns,"myns"}],[]}),
+    {error,no_such_client}=ct_netconfc:get(Client2,{server,[{xmlns,"myns"}],[]}),
+    ?NS:expect_reply(3,'get',{data,Data}),
+    {ok,Data} = ct_netconfc:get(Client3,{server,[{xmlns,"myns"}],[]}),
+
+    ?NS:expect_do_reply(1,'close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client1),
+    ?NS:expect_do_reply(3,'close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client3),
+
+    ?ok = ct_netconfc:disconnect(Conn),
+    ok.
+
+kill_session_same_connection(Config) ->
+    SshDir = ?config(ssh_dir,Config),
+    SshOpts = ?DEFAULT_SSH_OPTS(SshDir),
+    {ok,Conn} = ct_netconfc:connect(SshOpts),
+    ?NS:hello(1),
+    ?NS:expect(hello),
+    {ok,Client1} = ct_netconfc:session(Conn),
+    ?NS:hello(2),
+    ?NS:expect(2,hello),
+    {ok,Client2} = ct_netconfc:session(Conn),
+
+    ?NS:expect_do_reply('kill-session',{kill,2},ok),
+    ?ok = ct_netconfc:kill_session(Client1,2),
+    timer:sleep(1000),
+    {error,no_such_client}=ct_netconfc:get(Client2,{server,[{xmlns,"myns"}],[]}),
+
+    ?NS:expect_do_reply('close-session',close,ok),
+    ?ok = ct_netconfc:close_session(Client1),
+
+    ok.
+
 %%%-----------------------------------------------------------------
 
 break(_Config) ->
-    test_server:break("break test case").
+    ct:break("break test case").
 
 br() ->
-    test_server:break("").
+    ct:break("").
 
 %%%-----------------------------------------------------------------
 %% Open a netconf session which is not specified in a config file
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_remote_SUITE.erl b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_remote_SUITE.erl
index f2580ad8e9..3ce2d18c66 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_remote_SUITE.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/netconfc_remote_SUITE.erl
@@ -62,7 +62,7 @@ stop_node(Case) ->
 
 
 init_per_suite(Config) ->
-    (catch code:load_file(crypto)),
+    code:ensure_loaded(crypto),
     case {ssh:start(),code:is_loaded(crypto)} of
 	{Ok,{file,_}} when Ok==ok; Ok=={error,{already_started,ssh}} ->
 	    ct:log("SSH started locally",[]),
diff --git a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
index 2412ea6aba..c40bf9e2cc 100644
--- a/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
+++ b/lib/common_test/test/ct_netconfc_SUITE_data/ns.erl
@@ -254,7 +254,7 @@ data(Data, State = #session{connection = ConnRef,
     end.
 
 stop_channel(CM, Ch, State) ->
-    ssh:close(CM),
+    ssh_connection:close(CM,Ch),
     {stop, Ch, State}.
 
 
@@ -290,8 +290,8 @@ send_frag({CM,Ch},Data) ->
 
 
 %%% Kill ssh connection
-kill({CM,_Ch}) ->
-    ssh:close(CM).
+kill({CM,Ch}) ->
+    ssh_connection:close(CM,Ch).
 
 add_expect(SessionId,Add) ->
     table_trans(fun do_add_expect/2,[SessionId,Add]).