new protocol & setup scripts

7 files changed, 19 insertions, 33 deletions

diff --git a/priv/config/rvi_backend.config b/priv/config/rvi_backend.config
index 4c2ed57..9d5279f 100644
--- a/priv/config/rvi_backend.config
+++ b/priv/config/rvi_backend.config
@@ -42,12 +42,6 @@ LogLevel = Env("RVI_LOGLEVEL", notice).
   [
    {rvi_core,
     [
-
-     {key_pair, {openssl_pem, "test_keys/insecure_device_key_priv.pem"}},
-     {provisioning_key, "test_keys/insecure_root_key_pub.pem"},
-     {authorize_jwt, "test_keys/insecure_device_key_pub_sign.jwt"},
-     {cert_dir, "test_certs"},
-
      { node_address, IPPort(MyIP, MyPort+7) },
 
      { node_service_prefix, "jlr.com/backend"},
diff --git a/priv/config/rvi_common.config b/priv/config/rvi_common.config
index a01d57d..87563e7 100644
--- a/priv/config/rvi_common.config
+++ b/priv/config/rvi_common.config
@@ -115,6 +115,10 @@ LogLevel = Env("RVI_LOGLEVEL", info).
    %% },
    {rvi_core,
     [
+     {device_key, "$PRIV_DIR/sample_keys/insecure_device_key.pem"},
+     {device_cert, "$PRIV_DIR/sample_certificates/insecure_device_cert.crt"},
+     {root_cert, "$PRIV_DIR/sample_certificates/insecure_root_cert.crt"},
+     {cred_dir, "$PRIV_DIR/sample_credentials"}
     ]}
   ]}
 ].
diff --git a/priv/config/rvi_sample.config b/priv/config/rvi_sample.config
index 6e7863a..95cd5f3 100644
--- a/priv/config/rvi_sample.config
+++ b/priv/config/rvi_sample.config
@@ -23,14 +23,14 @@ Env = fun(V, Def) ->
 		  Str -> Str
 	      end
       end.
+IPPort = fun(IP, Port) ->
+		 IP ++ ":" ++ integer_to_list(Port)
+	 end.
 MyPort = Env("RVI_PORT", 9000).
 MyIP = Env("RVI_MYIP", "127.0.0.1").
-MyNodeAddr = Env("RVI_MY_NODE_ADDR", "0.0.0.0:0").
+MyNodeAddr = Env("RVI_MY_NODE_ADDR", IPPort(MyIP, MyPort)).
 BackendIP = Env("RVI_BACKEND", "38.129.64.31").
 BackendPort = Env("RVI_BACKEND_PORT", 8807).
-IPPort = fun(IP, Port) ->
-		 IP ++ ":" ++ integer_to_list(Port)
-	 end.
 LogLevel = Env("RVI_LOGLEVEL", notice).
 
 [
@@ -112,12 +112,6 @@ LogLevel = Env("RVI_LOGLEVEL", notice).
 
    {rvi_core,
     [
-
-     {key_pair, {openssl_pem, "rvi_core/priv/sample_keys/insecure_device_bkey_priv.pem"}},
-     {provisioning_key, "rvi_core/priv/sample_keys/insecure_root_key_pub.pem"},
-     {authorize_jwt, "rvi_core/priv/sample_keys/insecure_device_key_pub_sign.jwt"},
-     {cert_dir, "rvi_core/priv/sample_certs"},
-
      %% Specify the node address that data_link uses to listen to
      %% incoming traffic from other rvi nodes.
      %%
diff --git a/priv/test_config/backend.config b/priv/test_config/backend.config
index fe60836..0f49784 100644
--- a/priv/test_config/backend.config
+++ b/priv/test_config/backend.config
@@ -5,13 +5,11 @@
  {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")}
+    [{device_key, "$HOME/../../basic_backend_keys/device_key.pem"},
+     {provisioning_key, "$HOME/../../root_keys/root_key.pem"},
+     {root_cert, "$HOME/../../root_keys/root_cert.crt"},
+     {device_cert, "$HOME/../../basic_backend_keys/device_cert.crt"},
+     {cred_dir, "$HOME/../../basic_backend_creds"}
     ]}
   ]}
 ].
diff --git a/priv/test_config/bt_backend.config b/priv/test_config/bt_backend.config
index dfa7645..e5d207f 100644
--- a/priv/test_config/bt_backend.config
+++ b/priv/test_config/bt_backend.config
@@ -7,7 +7,7 @@
   [
    {rvi_core,
     [
-     { [routing_rules, ""], [{proto_json, dlink_bt_rpc}] },
+     { [routing_rules, ""], [{proto_json_rpc, dlink_bt_rpc}] },
      { [components, data_link], [{dlink_bt_rpc, gen_server,
 				  [{server_opts, [{test_mode, tcp},
 						  {port, 8007}]}]}]}
diff --git a/priv/test_config/bt_sample.config b/priv/test_config/bt_sample.config
index 0159992..962f8a3 100644
--- a/priv/test_config/bt_sample.config
+++ b/priv/test_config/bt_sample.config
@@ -6,7 +6,7 @@
   [
    {rvi_core,
     [
-     { [routing_rules, ""], {proto_json, dlink_bt_rpc} },
+     { [routing_rules, ""], {proto_json_rpc, dlink_bt_rpc} },
      { [components, data_link], [{dlink_bt_rpc, gen_server,
 				  [{server_opts, [{test_mode, tcp},
 						  {port, 9007}]},
diff --git a/priv/test_config/sample.config b/priv/test_config/sample.config
index 6a7c41c..ea84a30 100644
--- a/priv/test_config/sample.config
+++ b/priv/test_config/sample.config
@@ -2,19 +2,15 @@
 {ok, CurDir} = file:get_cwd().
 [
  {include_lib, "rvi_core/priv/config/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")}
+     {device_key, "$HOME/../../basic_sample_keys/device_key.pem"},
+     {root_cert, "$HOME/../../root_keys/root_cert.crt"},
+     {device_cert, "$HOME/../../basic_sample_keys/device_cert.crt"},
+     {cred_dir, "$HOME/../../basic_sample_creds"}
     ]}
   ]}
 ].