|
95 | 95 | GraphSON3Serializer) |
96 | 96 | from cassandra.datastax.graph.query import _request_timeout_key, _GraphSONContextRowFactory |
97 | 97 | from cassandra.datastax import cloud as dscloud |
98 | | -from cassandra.scylla.cloud import CloudConfiguration |
99 | 98 | from cassandra.application_info import ApplicationInfoBase |
100 | 99 |
|
101 | 100 | try: |
@@ -1238,23 +1237,7 @@ def __init__(self, |
1238 | 1237 | self.connection_class = connection_class |
1239 | 1238 |
|
1240 | 1239 | 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) |
| 1240 | + raise NotImplementedError("scylla_cloud was removed and not supported anymore") |
1258 | 1241 |
|
1259 | 1242 | if cloud is not None: |
1260 | 1243 | self.cloud = cloud |
|
0 commit comments