pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formatting fixes

Browse Source
This commit is contained in:
tomdds 2020-01-24 11:03:38 -05:00
parent ea040a914e
commit 910920af44
3 changed files with 62 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
atst/domain/csp/cloud.py
View File

@ -662,60 +662,70 @@ class MockCloudProvider(CloudProviderInterface):
} }
).dict() ).dict()
def create_task_order_billing_creation(self, payload: TaskOrderBillingCreationCSPPayload): def create_task_order_billing_creation(
self, payload: TaskOrderBillingCreationCSPPayload
):
self._maybe_raise(self.NETWORK_FAILURE_PCT, self.NETWORK_EXCEPTION) self._maybe_raise(self.NETWORK_FAILURE_PCT, self.NETWORK_EXCEPTION)
self._maybe_raise(self.SERVER_FAILURE_PCT, self.SERVER_EXCEPTION) self._maybe_raise(self.SERVER_FAILURE_PCT, self.SERVER_EXCEPTION)
self._maybe_raise(self.UNAUTHORIZED_RATE, self.AUTHORIZATION_EXCEPTION) self._maybe_raise(self.UNAUTHORIZED_RATE, self.AUTHORIZATION_EXCEPTION)
return TaskOrderBillingCreationCSPResult(**{"Location": "https://somelocation", "Retry-After": "10"}).dict() return TaskOrderBillingCreationCSPResult(
**{"Location": "https://somelocation", "Retry-After": "10"}
).dict()
def create_task_order_billing_verification(self, payload: TaskOrderBillingVerificationCSPPayload): def create_task_order_billing_verification(
self, payload: TaskOrderBillingVerificationCSPPayload
):
self._maybe_raise(self.NETWORK_FAILURE_PCT, self.NETWORK_EXCEPTION) self._maybe_raise(self.NETWORK_FAILURE_PCT, self.NETWORK_EXCEPTION)
self._maybe_raise(self.SERVER_FAILURE_PCT, self.SERVER_EXCEPTION) self._maybe_raise(self.SERVER_FAILURE_PCT, self.SERVER_EXCEPTION)
self._maybe_raise(self.UNAUTHORIZED_RATE, self.AUTHORIZATION_EXCEPTION) self._maybe_raise(self.UNAUTHORIZED_RATE, self.AUTHORIZATION_EXCEPTION)
return TaskOrderBillingVerificationCSPResult(**{ return TaskOrderBillingVerificationCSPResult(
"id": "/providers/Microsoft.Billing/billingAccounts/7c89b735-b22b-55c0-ab5a-c624843e8bf6:de4416ce-acc6-44b1-8122-c87c4e903c91_2019-05-31/billingProfiles/XC36-GRNZ-BG7-TGB", **{
"name": "XC36-GRNZ-BG7-TGB", "id": "/providers/Microsoft.Billing/billingAccounts/7c89b735-b22b-55c0-ab5a-c624843e8bf6:de4416ce-acc6-44b1-8122-c87c4e903c91_2019-05-31/billingProfiles/XC36-GRNZ-BG7-TGB",
"properties": { "name": "XC36-GRNZ-BG7-TGB",
"address": { "properties": {
"addressLine1": "123 S Broad Street, Suite 2400", "address": {
"city": "Philadelphia", "addressLine1": "123 S Broad Street, Suite 2400",
"companyName": "Promptworks", "city": "Philadelphia",
"country": "US", "companyName": "Promptworks",
"postalCode": "19109", "country": "US",
"region": "PA" "postalCode": "19109",
"region": "PA",
},
"currency": "USD",
"displayName": "First Portfolio Billing Profile",
"enabledAzurePlans": [
{
"productId": "DZH318Z0BPS6",
"skuId": "0001",
"skuDescription": "Microsoft Azure Plan",
}
],
"hasReadAccess": True,
"invoiceDay": 5,
"invoiceEmailOptIn": False,
}, },
"currency": "USD", "type": "Microsoft.Billing/billingAccounts/billingProfiles",
"displayName": "First Portfolio Billing Profile", }
"enabledAzurePlans": [ ).dict()
{
"productId": "DZH318Z0BPS6",
"skuId": "0001",
"skuDescription": "Microsoft Azure Plan"
}
],
"hasReadAccess": True,
"invoiceDay": 5,
"invoiceEmailOptIn": False
},
"type": "Microsoft.Billing/billingAccounts/billingProfiles"
}).dict()
def create_billing_instruction(self, payload: BillingInstructionCSPPayload): def create_billing_instruction(self, payload: BillingInstructionCSPPayload):
self._maybe_raise(self.NETWORK_FAILURE_PCT, self.NETWORK_EXCEPTION) self._maybe_raise(self.NETWORK_FAILURE_PCT, self.NETWORK_EXCEPTION)
self._maybe_raise(self.SERVER_FAILURE_PCT, self.SERVER_EXCEPTION) self._maybe_raise(self.SERVER_FAILURE_PCT, self.SERVER_EXCEPTION)
self._maybe_raise(self.UNAUTHORIZED_RATE, self.AUTHORIZATION_EXCEPTION) self._maybe_raise(self.UNAUTHORIZED_RATE, self.AUTHORIZATION_EXCEPTION)
return BillingInstructionCSPResult(**{ return BillingInstructionCSPResult(
"name": "TO1:CLIN001", **{
"properties": { "name": "TO1:CLIN001",
"amount": 1000.0, "properties": {
"endDate": "2020-03-01T00:00:00+00:00", "amount": 1000.0,
"startDate": "2020-01-01T00:00:00+00:00" "endDate": "2020-03-01T00:00:00+00:00",
}, "startDate": "2020-01-01T00:00:00+00:00",
"type": "Microsoft.Billing/billingAccounts/billingProfiles/billingInstructions" },
}).dict() "type": "Microsoft.Billing/billingAccounts/billingProfiles/billingInstructions",
}
).dict()
def create_or_update_user(self, auth_credentials, user_info, csp_role_id): def create_or_update_user(self, auth_credentials, user_info, csp_role_id):
self._authorize(auth_credentials) self._authorize(auth_credentials)
@ -844,8 +854,10 @@ class AzureCloudProvider(CloudProviderInterface):
try: try:
return secret_client.set_secret(secret_key, secret_value) return secret_client.set_secret(secret_key, secret_value)
except self.exceptions.HttpResponseError as exc: except self.exceptions.HttpResponseError as exc:
app.logger.error(f"Could not SET secret in Azure keyvault for key {secret_key}.", exc_info=1) app.logger.error(
f"Could not SET secret in Azure keyvault for key {secret_key}.",
exc_info=1,
)
def get_secret(secret_key): def get_secret(secret_key):
credential = self._get_client_secret_credential_obj() credential = self._get_client_secret_credential_obj()
@ -855,7 +867,10 @@ class AzureCloudProvider(CloudProviderInterface):
try: try:
return secret_client.get_secret(secret_key).value return secret_client.get_secret(secret_key).value
except self.exceptions.HttpResponseError as exc: except self.exceptions.HttpResponseError as exc:
app.logger.error(f"Could not GET secret in Azure keyvault for key {secret_key}.", exc_info=1) app.logger.error(
f"Could not GET secret in Azure keyvault for key {secret_key}.",
exc_info=1,
)
def create_environment( def create_environment(
self, auth_credentials: Dict, user: User, environment: Environment self, auth_credentials: Dict, user: User, environment: Environment

8
atst/models/mixins/state_machines.py
View File

@ -109,12 +109,16 @@ class FSMMixin:
fail_trigger = "fail" + stage fail_trigger = "fail" + stage
if fail_trigger in self.machine.get_triggers(self.current_state.name): if fail_trigger in self.machine.get_triggers(self.current_state.name):
self.trigger(fail_trigger) self.trigger(fail_trigger)
app.logger.info(f"calling fail trigger '{fail_trigger}' for '{self.__repr__()}'") app.logger.info(
f"calling fail trigger '{fail_trigger}' for '{self.__repr__()}'"
)
def finish_stage(self, stage): def finish_stage(self, stage):
finish_trigger = "finish_" + stage finish_trigger = "finish_" + stage
if finish_trigger in self.machine.get_triggers(self.current_state.name): if finish_trigger in self.machine.get_triggers(self.current_state.name):
app.logger.info(f"calling finish trigger '{finish_trigger}' for '{self.__repr__()}'") app.logger.info(
f"calling finish trigger '{finish_trigger}' for '{self.__repr__()}'"
)
self.trigger(finish_trigger) self.trigger(finish_trigger)
def prepare_init(self, event): def prepare_init(self, event):

1
tests/domain/test_portfolio_state_machine.py
View File

@ -152,4 +152,3 @@ def test_fsm_transition_start(portfolio: Portfolio):
csp_data = portfolio.csp_data csp_data = portfolio.csp_data
else: else:
csp_data = {} csp_data = {}