scylla/cloud.py: support using ip address in server

Align with scylladb/gocql#106, so:
When host information was missing, driver used resolved IP address as TLS.ServerName.
Instead it should connect to Server specified in ConnectionConfig and use NodeDomain as SNI.

Depends: scylladb/scylla-ccm#412
Ref: scylladb/gocql#106

Author: fruch

cassandra/scylla/cloud.py

@@ -83,13 +83,12 @@ def __init__(self, configuration_file, pyopenssl=False, endpoint_factory=None):
         if username and password:
             self.auth_provider = PlainTextAuthProvider(username, password)
 
-
     @property
     def contact_points(self):
         _contact_points = []
         for data_center in self.data_centers.values():
-            address, _, _ = self.get_server(data_center)
-            _contact_points.append(self.endpoint_factory.create_from_sni(address))
+            _, _, node_domain = self.get_server(data_center)
+            _contact_points.append(self.endpoint_factory.create_from_sni(node_domain))
         return _contact_points
 
     def get_server(self, data_center):

tests/integration/standard/test_scylla_cloud.py

@@ -5,7 +5,6 @@
 
 from tests.integration import use_cluster
 from cassandra.cluster import Cluster, TwistedConnection
-from cassandra.connection import SniEndPointFactory
 from cassandra.io.asyncorereactor import AsyncoreConnection
 from cassandra.io.libevreactor import LibevConnection
 from cassandra.io.geventreactor import GeventConnection
@@ -45,21 +44,17 @@ def start_cluster_with_proxy(self):
         ccm_cluster.sni_proxy_listen_port = listen_port
         ccm_cluster._update_config()
 
-        config_data_yaml, config_path_yaml = create_cloud_config(ccm_cluster.get_path(), listen_port)
-
-        endpoint_factory = SniEndPointFactory(listen_address, port=int(listen_port),
-                                              node_domain="cluster-id.scylla.com")
-
-        return config_data_yaml, config_path_yaml, endpoint_factory
+        config_data_yaml, config_path_yaml = create_cloud_config(ccm_cluster.get_path(),
+                                                                 port=listen_port, address=listen_address)
+        return config_data_yaml, config_path_yaml
 
     def test_1_node_cluster(self):
         self.ccm_cluster = use_cluster("sni_proxy", [1], start=False)
-        config_data_yaml, config_path_yaml, endpoint_factory = self.start_cluster_with_proxy()
+        config_data_yaml, config_path_yaml = self.start_cluster_with_proxy()
 
         for config in [config_path_yaml, config_data_yaml]:
             for connection_class in supported_connection_classes:
-                cluster = Cluster(scylla_cloud=config, connection_class=connection_class,
-                                  endpoint_factory=endpoint_factory)
+                cluster = Cluster(scylla_cloud=config, connection_class=connection_class)
                 with cluster.connect() as session:
                     res = session.execute("SELECT * FROM system.local")
                     assert res.all()
@@ -69,12 +64,11 @@ def test_1_node_cluster(self):
 
     def test_3_node_cluster(self):
         self.ccm_cluster = use_cluster("sni_proxy", [3], start=False)
-        config_data_yaml, config_path_yaml, endpoint_factory = self.start_cluster_with_proxy()
+        config_data_yaml, config_path_yaml = self.start_cluster_with_proxy()
 
         for config in [config_path_yaml, config_data_yaml]:
             for connection_class in supported_connection_classes:
-                cluster = Cluster(scylla_cloud=config, connection_class=connection_class,
-                                  endpoint_factory=endpoint_factory)
+                cluster = Cluster(scylla_cloud=config, connection_class=connection_class)
                 with cluster.connect() as session:
                     res = session.execute("SELECT * FROM system.local")
                     assert res.all()