test: Allow beta protocol to be disabled by default

* For gtests use: `--disable-beta-protocol`
* For boost tests set environment variable `BETA_PROTOCOL=false`

Note: Certain tests may override this setting

Author: Michael Fero

gtests/src/integration/integration.cpp

@@ -55,7 +55,7 @@ Integration::Integration()
   , is_ccm_start_node_individually_(false)
   , is_session_requested_(true)
   , is_test_chaotic_(false)
-  , is_beta_protocol_(true)
+  , is_beta_protocol_(Options::is_beta_protocol())
   , protocol_version_(CASS_HIGHEST_SUPPORTED_PROTOCOL_VERSION)
   , create_keyspace_query_("")
   , start_time_(0ull) {

gtests/src/integration/options.cpp

@@ -48,6 +48,7 @@ std::string Options::public_key_ = "public.key";
 std::string Options::private_key_ = "private.key";
 bool Options::is_verbose_ccm_ = false;
 bool Options::is_verbose_integration_ = false;
+bool Options::is_beta_protocol_ = true;
 
 // Static initialization is not guaranteed for the following types
 CCM::DseCredentialsType Options::dse_credentials_type_;
@@ -181,6 +182,8 @@ bool Options::initialize(int argc, char* argv[]) {
           is_verbose_ccm_ = true;
           is_verbose_integration_ = true;
         }
+      } else if (key == "--disable-beta-protocol") {
+        is_beta_protocol_ = false;
       }
 #ifdef CASS_USE_LIBSSH2
       else if (key == "--authentication") {
@@ -355,6 +358,9 @@ void Options::print_help() {
     << std::endl;
   std::cout << "  --verbose(=ccm,integration)" << std::endl << "      "
     << "Enable verbose output for component(s)." << std::endl;
+  std::cout << "  --disable-beta-protocol" << std::endl << "      "
+    << "Disable beta protocol use by default." << std::endl << "      "
+    << "NOTE: Individual tests may override this setting." << std::endl;
   std::cout << std::endl;
 }
 
@@ -533,6 +539,10 @@ bool Options::is_verbose_integration() {
   return is_verbose_integration_;
 }
 
+bool Options::is_beta_protocol() {
+  return is_beta_protocol_;
+}
+
 Options::Options() {
 }
 

gtests/src/integration/options.hpp

@@ -208,6 +208,13 @@ class Options {
    *         otherwise
    */
   static bool is_verbose_integration();
+  /**
+   * Flag to determine if beta protocol should be enabled or not; should only
+   * pertain to the default setting.
+   *
+   * @return True if beta protocol should be enabled; false otherwise
+   */
+  static bool is_beta_protocol();
   /**
    * Get a CCM instance based on the options
    *
@@ -325,6 +332,13 @@ class Options {
    * Flag to determine if verbose integration output should enabled
    */
   static bool is_verbose_integration_;
+  /**
+   * Flag to determine if beta protocol should be enabled or not; should only
+   * pertain to the default setting.
+   *
+   * NOTE: Individual tests can still override this.
+   */
+  static bool is_beta_protocol_;
 
   /**
    * Hidden default constructor

test/ccm_bridge/src/bridge.cpp

@@ -92,7 +92,7 @@
 #define CCM_CONFIGURATION_KEY_USE_INSTALL_DIR "use_install_dir"
 #define CCM_CONFIGURATION_KEY_INSTALL_DIR "install_dir"
 #define CCM_CONFIGURATION_KEY_DEPLOYMENT_TYPE "deployment_type"
-#define CCM_CONFIGURATION_VERBOSE "verbose"
+#define CCM_CONFIGURATION_KEY_VERBOSE "verbose"
 #define CCM_CONFIGURATION_KEY_USE_DSE "use_dse"
 #define CCM_CONFIGURATION_KEY_DSE_VERSION "dse_version"
 #define CCM_CONFIGURATION_KEY_DSE_CREDENTIALS_TYPE "dse_credentials_type"
@@ -355,14 +355,14 @@ CCM::Bridge::Bridge(const std::string& configuration_file)
           } else if (key.compare(CCM_CONFIGURATION_KEY_SSH_PRIVATE_KEY) == 0) {
             private_key = value;
 #endif
-          } else if (key.compare(CCM_CONFIGURATION_VERBOSE) == 0) {
+          } else if (key.compare(CCM_CONFIGURATION_KEY_VERBOSE) == 0) {
             //Convert the value
             std::stringstream ss(value);
             if (!(ss >> std::boolalpha >> is_verbose_).fail()) {
               continue;
             } else {
               LOG_ERROR("Invalid flag \"" << value << "\" for "
-                        << CCM_CONFIGURATION_VERBOSE << "; defaulting to \""
+                        << CCM_CONFIGURATION_KEY_VERBOSE << "; defaulting to \""
                         << (DEFAULT_IS_VERBOSE ? "true" : "false") << "\"");
               is_verbose_ = DEFAULT_IS_VERBOSE;
             }

test/integration_tests/src/test_utils.cpp

@@ -246,7 +246,8 @@ MultipleNodesTest::MultipleNodesTest(unsigned int num_nodes_dc1,
   cass_cluster_set_max_concurrent_creation(cluster, 8);
   if (version.major_version >= 3 && version.minor_version >= 10 &&
       protocol_version == CASS_HIGHEST_SUPPORTED_PROTOCOL_VERSION) {
-    cass_cluster_set_use_beta_protocol_version(cluster, cass_true);
+    cass_cluster_set_use_beta_protocol_version(cluster,
+                                               is_beta_protocol() ? cass_true : cass_false);
   } else {
     cass_cluster_set_protocol_version(cluster, protocol_version);
   }
@@ -259,6 +260,16 @@ bool MultipleNodesTest::check_version(const std::string& required) {
   return false;
 }
 
+bool MultipleNodesTest::is_beta_protocol() {
+  std::string value;
+  char* temp = getenv("BETA_PROTOCOL");
+  if (temp) {
+    value.assign(temp);
+    std::transform(value.begin(), value.end(), value.begin(), ::tolower);
+  }
+  return !value.empty() && value != "0" && value != "false";
+}
+
 MultipleNodesTest::~MultipleNodesTest() {
   cass_uuid_gen_free(uuid_gen);
   cass_cluster_free(cluster);

test/integration_tests/src/test_utils.hpp

@@ -1196,6 +1196,7 @@ struct MultipleNodesTest {
     bool is_ssl = false);
 
   bool check_version(const std::string& required);
+  bool is_beta_protocol();
 
   virtual ~MultipleNodesTest();