mfeuer-new_scripts: Merged and modified release-0.4.0-yocto_makefile

11 files changed, 24 insertions, 178 deletions

diff --git a/test/config/backend.config b/test/config/backend.config
deleted file mode 100644
index 3a7be0b..0000000
--- a/test/config/backend.config
+++ /dev/null
@@ -1,17 +0,0 @@
-%% -*- erlang -*-
-{ok, CurDir} = file:get_cwd().
-[
- {include_lib, "rvi_core/backend.config"},
- {set_env,
-  [
-   {rvi_core,
-    [{key_pair, {openssl_pem, filename:join(
-				CurDir, "basic_backend_keys/dev_priv.pem")}},
-     {provisioning_key,
-      {openssl_pem, filename:join(CurDir, "root_keys/root_pub.pem")}},
-     {authorize_jwt, filename:join(
-		       CurDir, "basic_backend_keys/dev_pub_sign.jwt")},
-     {cert_dir, filename:join(CurDir, "basic_backend_certs")}
-    ]}
-  ]}
-].
diff --git a/test/config/basic_backend.config b/test/config/basic_backend.config
deleted file mode 100644
index c4078e3..0000000
--- a/test/config/basic_backend.config
+++ /dev/null
@@ -1,6 +0,0 @@
-%% -*- erlang -*-
-{ok, CurDir} = file:get_cwd().
-[
- {include_lib, "rvi_core/test/config/backend.config"},
- {remove_apps, [bt, dlink_bt]}
-].
diff --git a/test/config/basic_sample.config b/test/config/basic_sample.config
deleted file mode 100644
index d91d235..0000000
--- a/test/config/basic_sample.config
+++ /dev/null
@@ -1,6 +0,0 @@
-%% -*- erlang -*-
-{ok, CurDir} = file:get_cwd().
-[
- {include_lib, "rvi_core/test/config/sample.config"},
- {remove_apps, [bt, dlink_bt]}
-].
diff --git a/test/config/bt_backend.config b/test/config/bt_backend.config
deleted file mode 100644
index 9ff0b9b..0000000
--- a/test/config/bt_backend.config
+++ /dev/null
@@ -1,16 +0,0 @@
-%% -*- erlang -*-
-[
- {include_lib, "rvi_core/test/config/backend.config"},
- {remove_apps, [dlink_tcp, dlink_tls]},
-
- {set_env,
-  [
-   {rvi_core,
-    [
-     { [routing_rules, ""], [{proto_json, dlink_bt_rpc}] },
-     { [components, data_link], [{dlink_bt_rpc, gen_server,
-				  [{server_opts, [{test_mode, tcp},
-						  {port, 8007}]}]}]}
-    ]}
-  ]}
-].
diff --git a/test/config/bt_sample.config b/test/config/bt_sample.config
deleted file mode 100644
index 06dabf0..0000000
--- a/test/config/bt_sample.config
+++ /dev/null
@@ -1,17 +0,0 @@
-%% -*- erlang -*-
-[
- {include_lib, "rvi_core/test/config/sample.config"},
- {remove_apps, [dlink_tcp, dlink_tls]},
- {set_env,
-  [
-   {rvi_core,
-    [
-     { [routing_rules, ""], {proto_json, dlink_bt_rpc} },
-     { [components, data_link], [{dlink_bt_rpc, gen_server,
-				  [{server_opts, [{test_mode, tcp},
-						  {port, 9007}]},
-				   {persistent_connections,
-				    ["localhost:8007"]}]}]}
-    ]}
-  ]}
-].
diff --git a/test/config/sample.config b/test/config/sample.config
deleted file mode 100644
index efdf0ca..0000000
--- a/test/config/sample.config
+++ /dev/null
@@ -1,20 +0,0 @@
-%% -*- erlang -*-
-{ok, CurDir} = file:get_cwd().
-[
- {include_lib, "rvi_core/rvi_sample.config"},
- {remove_apps, [bt, dlink_bt]},
- {set_env,
-  [
-   {rvi_core,
-    [
-     {node_service_prefix, "jlr.com/vin/abc"},
-     {key_pair, {openssl_pem, filename:join(
-				CurDir, "basic_sample_keys/dev_priv.pem")}},
-     {provisioning_key,
-      {openssl_pem, filename:join(CurDir, "root_keys/root_pub.pem")}},
-     {authorize_jwt, filename:join(
-		       CurDir, "basic_sample_keys/dev_pub_sign.jwt")},
-     {cert_dir, filename:join(CurDir, "basic_sample_certs")}
-    ]}
-  ]}
-].
diff --git a/test/config/sms_backend.config b/test/config/sms_backend.config
deleted file mode 100644
index 974fc2e..0000000
--- a/test/config/sms_backend.config
+++ /dev/null
@@ -1,25 +0,0 @@
-%% -*- erlang -*-
-[
- {include_lib, "rvi_core/test/config/backend.config"},
- {set_env,
-  [
-   {gsms,
-    [{interfaces,
-      [{gsms_plivo, plivo1, [{acct, acct1},
-                             {auth_id, "acct1"},
-                             {auth_token, "auth1"},
-                             {src_number, "+111"},
-                             {recv_port, 9200},
-                             {send_uri, "http://localhost:9100"},
-                             {recv_uri, "http://localhost:9200"}]}
-      ]}
-    ]},
-   {rvi_core,
-    [
-     { [routing_rules, ""], {proto_json, dlink_sms_rpc} },
-     { [components, data_link], [{dlink_sms_rpc, gen_server,
-				  [{server_opts, [{port, 9007}]}]}]}
-    ]}
-  ]}
-].
-
diff --git a/test/config/sms_sample.config b/test/config/sms_sample.config
deleted file mode 100644
index 0e91186..0000000
--- a/test/config/sms_sample.config
+++ /dev/null
@@ -1,25 +0,0 @@
-%% -*- erlang -*-
-[
- {include_lib, "rvi_core/test/config/sample.config"},
- {set_env,
-  [
-   {gsms,
-    [{interfaces,
-      [{gsms_plivo, plivo2, [{acct, acct2},
-                             {auth_id, "acct2"},
-                             {auth_token, "auth2"},
-                             {src_number, "+222"},
-                             {recv_port, 9300},
-                             {send_uri, "http://localhost:9100"},
-                             {recv_uri, "http://localhost:9300"}]}]
-     }]
-   },
-   {rvi_core,
-    [
-     { [routing_rules, ""], {proto_json, dlink_sms_rpc} },
-     { [components, data_link], [{dlink_sms_rpc, gen_server,
-				  [{server_opts, [{port, 9007}]}]}]}
-    ]}
-  ]}
-].
-
diff --git a/test/config/tls_backend.config b/test/config/tls_backend.config
deleted file mode 100644
index d2356f2..0000000
--- a/test/config/tls_backend.config
+++ /dev/null
@@ -1,14 +0,0 @@
-%% -*- erlang -*-
-[
- {include_lib, "rvi_core/test/config/backend.config"},
- {set_env,
-  [
-   {rvi_core,
-    [
-     { [routing_rules, ""], [{proto_msgpack_rpc, dlink_tls_rpc}] },
-     { [components, data_link], [{dlink_tls_rpc, gen_server,
-				  [{server_opts, [{port, 8007}]}]}]},
-     { [components, protocol], [{proto_msgpack_rpc, gen_server, []}] }
-    ]}
-  ]}
-].
diff --git a/test/config/tls_sample.config b/test/config/tls_sample.config
deleted file mode 100644
index 8559b8c..0000000
--- a/test/config/tls_sample.config
+++ /dev/null
@@ -1,16 +0,0 @@
-%% -*- erlang -*-
-[
- {include_lib, "rvi_core/test/config/sample.config"},
- {set_env,
-  [
-   {rvi_core,
-    [
-     { [routing_rules, ""], [{proto_json, dlink_tls_rpc}] },
-     { [components, data_link], [{dlink_tls_rpc, gen_server,
-				  [{server_opts, [{port, 9007}]},
-				   {persistent_connections,
-				    ["localhost:8007"]}]}]},
-     { [components, protocol], [{ proto_msgpack, gen_server, [] }] }
-    ]}
-  ]}
-].
diff --git a/test/rvi_core_SUITE.erl b/test/rvi_core_SUITE.erl
index c154eee..41aa15a 100644
--- a/test/rvi_core_SUITE.erl
+++ b/test/rvi_core_SUITE.erl
@@ -156,7 +156,7 @@ t_sample_keys_and_cert(Config) ->
 
 t_install_backend_node(Config) ->
     install_rvi_node("basic_backend", env(),
-		     [root(), "/test/config/basic_backend.config"]).
+		     [root(), "/priv/test_config/basic_backend.config"]).
 
 
 t_install_sample_node(_Config) ->
@@ -164,54 +164,54 @@ t_install_sample_node(_Config) ->
 
 t_install_sms_backend_node(_Config) ->
     install_rvi_node("sms_backend", env(),
-		     [root(), "/test/config/sms_backend.config"]).
+		     [root(), "/priv/test_config/sms_backend.config"]).
 
 t_install_sms_sample_node(_Config) ->
     install_sample_node("sms_sample", "sms_sample.config").
 
 t_install_tls_backend_node(_Config) ->
     install_rvi_node("tls_backend", env(),
-		     [root(), "/test/config/tls_backend.config"]).
+		     [root(), "/priv/test_config/tls_backend.config"]).
 
 t_install_tls_sample_node(_Config) ->
     install_sample_node("tls_sample", "tls_sample.config").
 
 t_install_bt_backend_node(_Config) ->
     install_rvi_node("bt_backend", env(),
-		     [root(), "/test/config/bt_backend.config"]).
+		     [root(), "/priv/test_config/bt_backend.config"]).
 
 t_install_bt_sample_node(_Config) ->
     install_sample_node("bt_sample", "bt_sample.config").
 
 t_start_basic_backend(_Config) ->
-    cmd([scripts(), "/rvi_node.sh -d -n basic_backend"]),
+    cmd(["./basic_backend/rvi.sh -s basic_backend -l ./basic_backend/rvi/log -d ./basic_backend -c ./basic_backend/priv/test_config/basic_backend.config start"]),
     await_started("basic_backend"),
     ok.
 
 t_start_basic_sample(_Config) ->
-    cmd([scripts(), "/rvi_node.sh -d -n basic_sample"]),
+    cmd(["./basic_sample/rvi.sh -s basic_sample -l ./basic_sample/rvi/log -d ./basic_sample -c ./basic_sample/priv/test_config/basic_sample.config start"]),
     await_started("basic_sample"),
     ok.
 
 t_start_bt_backend(_Config) ->
-    cmd([scripts(), "/rvi_node.sh -d -n bt_backend"]),
+    cmd(["./bt_backend/rvi.sh -s bt_backend -l ./bt_backend/rvi/log -d ./bt_backend -c ./bt_backend/priv/test_config/bt_backend.config start"]),
     await_started("bt_backend"),
     ok.
 
 t_start_bt_sample(_Config) ->
-    cmd([scripts(), "/rvi_node.sh -d -n bt_sample"]),
+    cmd(["./bt_sample/rvi.sh -s bt_sample -l ./bt_sample/rvi/log -d ./bt_sample -c ./bt_sample/priv/test_config/bt_sample.config start"]),
     await_started("bt_sample"),
     ok.
 
 t_start_tls_backend(_Config) ->
-    cmd([scripts(), "/rvi_node.sh -d -n tls_backend"]),
+    cmd(["./tls_backend/rvi.sh -s tls_backend -l ./tls_backend/rvi/log -d ./tls_backend -c ./tls_backend/priv/test_config/tls_backend.config start"]),
     await_started("tls_backend"),
     ok.
 
 t_start_tls_sample(_Config) ->
-    cmd([scripts(), "/rvi_node.sh -d -n tls_sample"]),
+    cmd(["./tls_sample/rvi.sh -s tls_sample -l ./tls_sample/rvi/log -d ./tls_sample -c ./tls_sample/priv/test_config/tls_sample.config start"]),
     await_started("tls_sample"),
-    ok.
+    ok. 
 
 t_register_lock_service(_Config) ->
     Pid =
@@ -427,19 +427,27 @@ install_rvi_node(Name, Env, ConfigF) ->
     Scripts = filename:join(Root, "scripts"),
     ct:log("Root = ~p", [Root]),
     Cmd = lists:flatten(
-	    [Env, " ", Scripts, "/setup_rvi_node.sh -d -n ", Name,
-	     " -c ", ConfigF]),
+	    [Env, " ", Scripts, "/rvi_install.sh ./", Name]),
+
     ct:log("Cmd = `~s`", [Cmd]),
     Res = cmd(Cmd),
     ct:log("install_rvi_node/1 -> ~p", [Res]),
-    Res.
+
+    
+    Res1 = cmd(lists:flatten(["install -d --mode 0755 ./", Name])),
+    ct:log("install_rvi_node/2 -> ~p", [Res1]),
+
+    Res2 = cmd(lists:flatten(["cp -r ", Root, "/priv ", Name])),
+    ct:log("install_rvi_node/3 -> ~p", [Res2]),
+
+    Res2.
 
 install_sample_node(Name, ConfigF) ->
     Env = [env(),
 	   " RVI_BACKEND=127.0.0.1 RVI_PORT=9000"
 	   " RVI_MY_NODE_ADDR=127.0.0.1:9000"],
     install_rvi_node(Name, Env,
-		     [root(), "/test/config/", ConfigF]).
+		     [root(), "/priv/test_config/", ConfigF]).
 
 in_priv_dir(F, Cfg) ->
     %% PrivDir = ?config(priv_dir, Cfg),
@@ -572,7 +580,7 @@ no_errors(Dirs, PDir) ->
     ct:log("Will check errors in ~p", [Dirs]),
     true = lists:all(
 	     fun(D) ->
-		     no_errors_(filename:join([PDir, D, "log", "lager"]), D)
+		     no_errors_(filename:join([PDir, D, "rvi", "log", "lager"]), D)
 	     end, Dirs),
     ok.