Skip to content

Commit 0566078

Browse files
clevesquewmudge
authored andcommitted
Update CDE wrappers for PvC - cdpcli 0.9.105
Update CDE wrappers for PvC - cdpcli 0.9.105 Signed-off-by: Chuck Levesque <clevesque@cloudera.com>
1 parent cefd4ab commit 0566078

File tree

2 files changed

+60
-8
lines changed

2 files changed

+60
-8
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
.pytest_cache
22
.tox
33
build
4-
.coverage
4+
.coverage
5+
src/cdpy.egg-info/

src/cdpy/de.py

Lines changed: 58 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,10 @@ def list_vcs(self, cluster_id):
3131
)
3232

3333
def create_vc(self, name, cluster_id, cpu_requests, memory_requests, chart_value_overrides=None,
34-
runtime_spot_component=None, spark_version=None, acl_users=None):
34+
runtime_spot_component=None, spark_version=None, acl_users=None,
35+
gpu_requests=None, guaranteed_cpu_requests=None,
36+
guaranteed_memory_requests=None, guaranteed_gpu_requests=None,
37+
smtp_configs=None, vc_tier='CORE' ):
3538
return self.sdk.call(
3639
svc='de', func='create_vc', ret_field='Vc', squelch=[
3740
Squelch(value='PATH_DISABLED', warning=ENTITLEMENT_DISABLED)
@@ -43,7 +46,13 @@ def create_vc(self, name, cluster_id, cpu_requests, memory_requests, chart_value
4346
chartValueOverrides=chart_value_overrides,
4447
runtimeSpotComponent=runtime_spot_component,
4548
sparkVersion=spark_version,
46-
aclUsers=acl_users
49+
aclUsers=acl_users,
50+
gpuRequests=gpu_requests,
51+
guaranteedCpuRequests=guaranteed_cpu_requests,
52+
guaranteedMemoryRequests=guaranteed_memory_requests,
53+
guaranteedGpuRequests=guaranteed_gpu_requests,
54+
smtpConfigs=smtp_configs,
55+
vcTier=vc_tier
4756
)
4857

4958
def delete_vc(self, cluster_id, vc_id):
@@ -73,11 +82,17 @@ def list_services(self, env=None, remove_deleted=False):
7382
)
7483
return [s for s in services if env is None or s['environmentName'] == env]
7584

76-
def enable_service(self, name, env, instance_type, minimum_instances, maximum_instances,
77-
initial_instances=None, minimum_spot_instances=None, maximum_spot_instances=None,
78-
initial_spot_instances=None, chart_value_overrides=None, enable_public_endpoint=False,
79-
enable_private_network=False, enable_workload_analytics=False, root_volume_size=None,
80-
skip_validation=False, tags=None, use_ssd=None, loadbalancer_allowlist=None, whitelist_ips=None):
85+
86+
def enable_service(self, name, env, instance_type, minimum_instances,
87+
maximum_instances, initial_instances=None,
88+
minimum_spot_instances=None, maximum_spot_instances=None,
89+
initial_spot_instances=None, chart_value_overrides=None,
90+
enable_public_endpoint=False, enable_private_network=False,
91+
enable_workload_analytics=False, root_volume_size=None,
92+
skip_validation=False, tags=None, use_ssd=None,
93+
loadbalancer_allowlist=None, whitelist_ips=None, subnets=None,
94+
cpu_requests=None, memory_requests=None, gpu_requests=None,
95+
resource_pool=None, nfs_storage_class=None ):
8196
return self.sdk.call(
8297
svc='de', func='enable_service', ret_field='service', squelch=[
8398
Squelch(value='PATH_DISABLED', warning=ENTITLEMENT_DISABLED)
@@ -101,6 +116,12 @@ def enable_service(self, name, env, instance_type, minimum_instances, maximum_in
101116
useSsd=use_ssd,
102117
whitelistIps=whitelist_ips,
103118
loadbalancerAllowlist=loadbalancer_allowlist
119+
subnets=subnets,
120+
cpuRequests=cpu_requests,
121+
memoryRequests=memory_requests,
122+
gpuRequests=gpu_requests,
123+
resourcePool=resource_pool,
124+
nfsStorageClass=nfs_storage_class
104125
)
105126

106127
def disable_service(self, cluster_id, force=False):
@@ -137,3 +158,33 @@ def get_vc_id_by_name(self, name, cluster_id, remove_deleted=True):
137158
vc_id = vc['vcId']
138159
break
139160
return vc_id
161+
162+
def update_service(self, cluster_id, minimum_instances=None, maximum_instances=None,
163+
minimum_spot_instances=None, maximum_spot_instances=None,
164+
whitelist_ips=None, loadbalancer_allowlist=None,
165+
cpu_requests=None, memory_requests=None, gpu_requests=None ):
166+
return self.sdk.call(
167+
svc='de', func='update_service', ret_field='service', squelch=[
168+
Squelch(value='PATH_DISABLED', warning=ENTITLEMENT_DISABLED)
169+
],
170+
clusterId=cluster_id,
171+
minimumInstances=minimum_instances,
172+
maximumInstances=maximum_instances,
173+
minimumSpotInstances=minimum_spot_instances,
174+
maximumSpotInstances=maximum_spot_instances,
175+
whitelistIps=whitelist_ips,
176+
loadbalancerAllowlist=loadbalancer_allowlist,
177+
cpuRequests=cpu_requests,
178+
memoryRequests=memory_requests,
179+
gpuRequests=gpu_requests
180+
)
181+
182+
def update_vc(self, cluster_id, vc_id, acl_users=None ):
183+
return self.sdk.call(
184+
svc='de', func='update_vc', ret_field='Vc', squelch=[
185+
Squelch(value='PATH_DISABLED', warning=ENTITLEMENT_DISABLED)
186+
],
187+
clusterId=cluster_id,
188+
vcId=vc_id,
189+
aclUsers=acl_users
190+
)

0 commit comments

Comments
 (0)