X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2FEventOperation.hpp;h=1f0a4abb4886f1737b561ad94073e982e097a867;hb=60870aeb874273396e495c5c188ba12a614b5b1b;hp=59ede335073e8c9220f41d81dc8716bf59f6eb22;hpb=c881c12ed7e116f1d43760a0d9873f860c10a357;p=anna.git

diff --git a/example/diameter/launcher/EventOperation.hpp b/example/diameter/launcher/EventOperation.hpp
index 59ede33..1f0a4ab 100644
--- a/example/diameter/launcher/EventOperation.hpp
+++ b/example/diameter/launcher/EventOperation.hpp
@@ -100,30 +100,31 @@ public:
   bool show_stats(std::string &response);
 
   // Flow operations
-  bool sendmsg2e(std::string &response, const std::string & diameterJson);
-  bool sendmsg2c(std::string &response, const std::string & diameterJson);
-  bool answermsg2e(std::string &response, const std::string & diameterJson);
-  bool answermsg2c(std::string &response, const std::string & diameterJson);
-  bool answermsg2e_action(std::string &response, const std::string & action = "list");
-  bool answermsg2c_action(std::string &response, const std::string & action = "list");
-  bool sendhex2e(std::string &response, const std::string & diameterHex);
-  bool sendhex2c(std::string &response, const std::string & diameterHex);
+  bool sendmsg_hex_2e(std::string &response, const std::string & diameterJson_or_Hex, bool msg_or_hex);
+  bool sendmsg_hex_2c(std::string &response, const std::string & diameterJson_or_Hex, bool msg_or_hex);
+  bool answermsg_action_2e(std::string &response, const std::string & diameterJson_or_action, bool msg_or_action);
+  bool answermsg_action_2c(std::string &response, const std::string & diameterJson_or_action, bool msg_or_action);
 
   // FSM testing
   // test_id__<command>
   bool test_id__description(std::string &response, unsigned int id, const std::string & description);
   bool test_id__ip_limit(std::string &response, unsigned int id, int amount = 1);
   bool test_id__timeout(std::string &response, unsigned int id, int msecs);
-  bool test_id__sendmsg2e(std::string &response, unsigned int id, const std::string & diameterJson, int stepNumber = -1);
-  bool test_id__sendmsg2c(std::string &response, unsigned int id, const std::string & diameterJson, int stepNumber = -1);
+  bool test_id__sendmsg2e_2c(std::string &response, unsigned int id, bool _2e_or_2c, const std::string & diameterJson, int stepNumber = -1);
   bool test_id__delay(std::string &response, unsigned int id, int msecs);
   bool test_id__sh_command(std::string &response, unsigned int id, const std::string & script);
-  bool test_id__waitfe_hex(std::string &response, unsigned int id, const std::string & hex, bool strict = false);
-  bool test_id__waitfc_hex(std::string &response, unsigned int id, const std::string & hex, bool strict = false);
-  bool test_id__waitfe_msg(std::string &response, unsigned int id, const std::string & diameterJson, bool strict = false);
-  bool test_id__waitfc_msg(std::string &response, unsigned int id, const std::string & diameterJson, bool strict = false);
-  bool test_id__waitfe(std::string &response, unsigned int id, const std::string & condition);
-  bool test_id__waitfc(std::string &response, unsigned int id, const std::string & condition);
+  bool test_id__waitfefc_hex(std::string &response, unsigned int id, bool fe_or_fc, const std::string & hex, bool strict = false);
+  bool test_id__waitfefc_msg(std::string &response, unsigned int id, bool fe_or_fc, const std::string & diameterJson, bool strict = false);
+  bool test_id__waitfefc(std::string &response, unsigned int id, bool fe_or_fc,
+                         const std::string & code,
+                         const std::string & bitR,
+                         const std::string & hopByHop,
+                         const std::string & applicationId,
+                         const std::string & sessionId,
+                         const std::string & resultCode,
+                         const std::string & msisdn,
+                         const std::string & imsi,
+                         const std::string & serviceContextId);
 
   // Testcases execution
   // test__<command>
@@ -135,7 +136,7 @@ public:
   bool test__look(std::string &response, int id = -1 /* current */);
   bool test__state(std::string &response, int id = -1 /* current */);
   bool test__interact(std::string &response, int amount, unsigned int id = -1 /* current */);
-  bool test__reset(std::string &response, bool soft_hard = true, unsigned int id = -2 /* apply to all the tests */);
+  bool test__reset(std::string &response, bool soft_hard = true, int id = -1 /* apply to all the tests */);
   bool test__repeats(std::string &response, int amount);
   bool test__auto_reset(std::string &response, bool soft_hard);
   bool test__initialized(std::string &response);