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

premium product purchase code formatting.

Browse Source
This commit is contained in:
Philip Kalinsky 2020-01-30 14:50:16 -05:00
parent 7493b9c3d6
commit de992eeed8
2 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
atst/domain/csp/cloud/azure_cloud_provider.py
View File

@ -497,9 +497,7 @@ class AzureCloudProvider(CloudProviderInterface):
else:
return self._error(result.json())
def create_product_purchase(
self, payload: ProductPurchaseCSPPayload
):
def create_product_purchase(self, payload: ProductPurchaseCSPPayload):
sp_token = self._get_sp_token(payload.creds)
if sp_token is None:
raise AuthenticationException(
@ -508,11 +506,13 @@ class AzureCloudProvider(CloudProviderInterface):
payload_as_dict = payload.dict(by_alias=True)
create_product_purchase_body = {
create_product_purchase_body = {
"type": "AADPremium",
"sku": "AADP1",
"productProperties": {
"beneficiaryTenantId": payload_as_dict["productProperties"]["beneficiaryTenantId"],
"beneficiaryTenantId": payload_as_dict["productProperties"][
"beneficiaryTenantId"
],
},
"quantity": payload_as_dict.get("quantity"),
}
@ -537,7 +537,6 @@ class AzureCloudProvider(CloudProviderInterface):
else:
return self._error(result.json())
def create_product_purchase_verification(
self, payload: ProductPurchaseVerificationCSPPayload
):
@ -560,11 +559,14 @@ class AzureCloudProvider(CloudProviderInterface):
# 202 has location/retry after headers
return self._ok(ProductPurchaseCSPResult(**result.headers))
elif result.status_code == 200:
return self._ok(ProductPurchaseVerificationCSPResult(premium_purchase_date=premium_purchase_date))
return self._ok(
ProductPurchaseVerificationCSPResult(
premium_purchase_date=premium_purchase_date
)
)
else:
return self._error(result.json())
def create_remote_admin(self, creds, tenant_details):
# create app/service principal within tenant, with name constructed from tenant details
# assign principal global admin

7
atst/domain/csp/cloud/mock_cloud_provider.py
View File

@ -281,10 +281,7 @@ class MockCloudProvider(CloudProviderInterface):
}
)
def create_product_purchase(
self, payload: ProductPurchaseCSPPayload
):
def create_product_purchase(self, payload: ProductPurchaseCSPPayload):
self._maybe_raise(self.NETWORK_FAILURE_PCT, self.NETWORK_EXCEPTION)
self._maybe_raise(self.SERVER_FAILURE_PCT, self.SERVER_EXCEPTION)
self._maybe_raise(self.UNAUTHORIZED_RATE, self.AUTHORIZATION_EXCEPTION)
@ -296,8 +293,6 @@ class MockCloudProvider(CloudProviderInterface):
)
)
def create_product_purchase_verification(
self, payload: ProductPurchaseVerificationCSPPayload
):