Skip to content

Changes for DF Beta inclusion #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wmudge merged 2 commits into from
Jul 13, 2021
Merged

Changes for DF Beta inclusion #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c94bc0
Changes for DF Beta inclusion
Chaffelson Jun 24, 2021
1d9c41d
Combine disable and delete calls for DF removal as the control logic …
Chaffelson Jul 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/cdpy/common.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,8 @@ def _warning_format(message, category, filename, lineno, line=None):
'EXTERNAL_DATABASE_STOP_IN_PROGRESS',
'STOP_IN_PROGRESS',
'STOPPED',
'ENV_STOPPED'
'ENV_STOPPED',
'NOT_ENABLED' # DF
]

self.FAILED_STATES = [
Expand All @@ -193,7 +194,7 @@ def _warning_format(message, category, filename, lineno, line=None):
'DELETE_FAILED',
'Error', # DW
'installation:failed', # ML
'BAD_HEALTH' # DF
'BAD_HEALTH', # DF
]

self.REMOVABLE_STATES = [
Expand Down
18 changes: 14 additions & 4 deletions src/cdpy/df.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-

from cdpy.common import CdpSdkBase, Squelch
from cdpy.common import CdpSdkBase, Squelch, CdpError


class CdpyDf(CdpSdkBase):
Expand Down Expand Up @@ -37,9 +37,19 @@ def enable_environment(self, env_crn: str, authorized_ips: list = None, min_node
usePublicLoadBalancer=enable_public_ip, authorizedIpRanges=authorized_ips
)

def disable_environment(self, env_crn: str, persist: bool = False):
def disable_environment(self, env_crn: str, persist: bool = False, force: bool = False):
self.sdk.validate_crn(env_crn)
return self.sdk.call(
svc='df', func='disable_environment', ret_field='status',
resp = self.sdk.call(
svc='df', func='disable_environment', ret_field='status', ret_error=True,
crn=env_crn, persist=persist
)
if isinstance(resp, CdpError):
if force:
return self.sdk.call(
svc='df', func='delete_environment',
crn=env_crn
)
else:
resp.update(message=resp.violations)
self.sdk.throw_error(resp)
return resp