9595 GraphSON3Serializer )
9696from cassandra .datastax .graph .query import _request_timeout_key , _GraphSONContextRowFactory
9797from cassandra .datastax import cloud as dscloud
98- from cassandra .scylla .cloud import CloudConfiguration
9998from cassandra .application_info import ApplicationInfoBase
10099
101100try :
@@ -1212,7 +1211,6 @@ def __init__(self,
12121211 monitor_reporting_interval = 30 ,
12131212 client_id = None ,
12141213 cloud = None ,
1215- scylla_cloud = None ,
12161214 shard_aware_options = None ,
12171215 metadata_request_timeout : Optional [float ] = None ,
12181216 column_encryption_policy = None ,
@@ -1237,25 +1235,6 @@ def __init__(self,
12371235 if connection_class is not None :
12381236 self .connection_class = connection_class
12391237
1240- if scylla_cloud is not None :
1241- if contact_points is not _NOT_SET or ssl_context or ssl_options :
1242- raise ValueError ("contact_points, ssl_context, and ssl_options "
1243- "cannot be specified with a scylla cloud configuration" )
1244- if shard_aware_options and not shard_aware_options .disable_shardaware_port :
1245- raise ValueError ("shard_aware_options.disable_shardaware_port=False "
1246- "cannot be specified with a scylla cloud configuration" )
1247- uses_twisted = TwistedConnection and issubclass (self .connection_class , TwistedConnection )
1248- uses_eventlet = EventletConnection and issubclass (self .connection_class , EventletConnection )
1249-
1250- scylla_cloud_config = CloudConfiguration .create (scylla_cloud , pyopenssl = uses_twisted or uses_eventlet ,
1251- endpoint_factory = endpoint_factory )
1252- ssl_context = scylla_cloud_config .ssl_context
1253- endpoint_factory = scylla_cloud_config .endpoint_factory
1254- contact_points = scylla_cloud_config .contact_points
1255- ssl_options = scylla_cloud_config .ssl_options
1256- auth_provider = scylla_cloud_config .auth_provider
1257- shard_aware_options = ShardAwareOptions (shard_aware_options , disable_shardaware_port = True )
1258-
12591238 if cloud is not None :
12601239 self .cloud = cloud
12611240 if contact_points is not _NOT_SET or endpoint_factory or ssl_context or ssl_options :
0 commit comments