Skip to content

Commit

Permalink
Merge pull request #16 from cloudblue/use_new_response_classes
Browse files Browse the repository at this point in the history 
Move to response class x category
  • Loading branch information
Francesco Faraone authored May 19, 2022
2 parents 003e78e + f863b7e commit 2f7dadb
Show file tree
Hide file tree
Showing 4 changed files with 160 additions and 129 deletions.
16 changes: 1 addition & 15 deletions connectext/extension.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,5 @@
"description": "This extension is for e2e tests of EaaS.",
"version": "1.0.0",
"readme_url": "https://github.com/cloudblue/eaas-e2e-mock/blob/master/README.md",
"changelog_url": "https://github.com/cloudblue/eaas-e2e-mock/blob/master/CHANGELOG.md",
"variables": [
{
"name": "ASSET_REQUEST_APPROVE_TEMPLATE_ID",
"initial_value": "<change_with_purchase_request_approve_template_id>"
},
{
"name": "ASSET_REQUEST_CHANGE_TEMPLATE_ID",
"initial_value": "<change_with_change_request_approve_template_id>"
},
{
"name": "TIER_REQUEST_APPROVE_TEMPLATE_ID",
"initial_value": "<change_with_tier_request_approve_template_id>"
}
]
"changelog_url": "https://github.com/cloudblue/eaas-e2e-mock/blob/master/CHANGELOG.md"
}
42 changes: 20 additions & 22 deletions connectext/extension.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@
from connect.eaas.core.decorators import event, schedulable, variables
from connect.eaas.core.extension import Extension
from connect.eaas.core.responses import (
ProcessingResponse,
ValidationResponse,
ProductActionResponse,
CustomEventResponse,
BackgroundResponse,
InteractiveResponse,
ScheduledExecutionResponse,
)

Expand Down Expand Up @@ -91,7 +89,7 @@ def process_asset_purchase_request(self, request):
template_id = self.config['ASSET_REQUEST_APPROVE_TEMPLATE_ID']
self.approve_asset_request(request, template_id)

return ProcessingResponse.done()
return BackgroundResponse.done()

@event(
'asset_change_request_processing',
Expand All @@ -109,7 +107,7 @@ def process_asset_change_request(self, request):
if request['status'] == 'pending':
template_id = self.config['ASSET_REQUEST_CHANGE_TEMPLATE_ID']
self.approve_asset_request(request, template_id)
return ProcessingResponse.done()
return BackgroundResponse.done()

@event(
'asset_suspend_request_processing',
Expand All @@ -126,7 +124,7 @@ def process_asset_suspend_request(self, request):
if request['status'] == 'pending':
template_id = self.config['ASSET_REQUEST_APPROVE_TEMPLATE_ID']
self.approve_asset_request(request, template_id)
return ProcessingResponse.done()
return BackgroundResponse.done()

@event(
'asset_resume_request_processing',
Expand All @@ -143,7 +141,7 @@ def process_asset_resume_request(self, request):
if request['status'] == 'pending':
template_id = self.config['ASSET_REQUEST_APPROVE_TEMPLATE_ID']
self.approve_asset_request(request, template_id)
return ProcessingResponse.done()
return BackgroundResponse.done()

@event(
'asset_resume_cancel_processing',
Expand All @@ -160,7 +158,7 @@ def process_asset_cancel_request(self, request):
if request['status'] == 'pending':
template_id = self.config['ASSET_REQUEST_APPROVE_TEMPLATE_ID']
self.approve_asset_request(request, template_id)
return ProcessingResponse.done()
return BackgroundResponse.done()

@event(
'asset_adjustment_request_processing',
Expand All @@ -177,32 +175,32 @@ def process_asset_adjustment_request(self, request):
if request['status'] == 'pending':
template_id = self.config['ASSET_REQUEST_APPROVE_TEMPLATE_ID']
self.approve_asset_request(request, template_id)
return ProcessingResponse.done()
return BackgroundResponse.done()

@event('tier_config_setup_request_validation', statuses=['draft'])
def validate_tier_config_setup_request(self, request):
self.logger.info(f"TCR Validation with id {request['id']}")
return ValidationResponse.done(request)
return InteractiveResponse.done(body=request)

@event('tier_config_change_request_validation', statuses=['draft'])
def validate_tier_config_change_request(self, request):
self.logger.info(f"TCR Validation with id {request['id']}")
return ValidationResponse.done(request)
return InteractiveResponse.done(body=request)

@event('asset_purchase_request_validation', statuses=['draft'])
def validate_asset_purchase_request(self, request):
self.logger.info(f"Asset Validation with id {request['id']}")
return ValidationResponse.done(request)
return InteractiveResponse.done(body=request)

@event('asset_change_request_validation', statuses=['draft'])
def validate_asset_change_request(self, request):
self.logger.info(f"asset Validation with id {request['id']}")
return ValidationResponse.done(request)
return InteractiveResponse.done(body=request)

@event('product_action_execution')
def execute_product_action(self, request):
self.logger.info(f'Product action: {request}')
return ProductActionResponse.done(
return InteractiveResponse.done(
http_status=302,
headers={'Location': 'https://google.com'},
)
Expand All @@ -213,7 +211,7 @@ def process_product_custom_event(self, request):
sample_return_body = {
"response": "OK"
}
return CustomEventResponse.done(body=sample_return_body)
return InteractiveResponse.done(body=sample_return_body)

@event(
'tier_config_setup_request_processing',
Expand All @@ -239,7 +237,7 @@ def process_tier_config_setup_request(self, request):
template_id = self.config['TIER_REQUEST_APPROVE_TEMPLATE_ID']
self.approve_tier_request(request, template_id)

return ProcessingResponse.done()
return BackgroundResponse.done()

@event(
'tier_config_change_request_processing',
Expand All @@ -253,7 +251,7 @@ def process_tier_config_change_request(self, request):
if request['status'] == 'pending':
template_id = self.config['TIER_REQUEST_APPROVE_TEMPLATE_ID']
self.approve_tier_request(request, template_id)
return ProcessingResponse.done()
return BackgroundResponse.done()

@event(
'tier_config_adjustment_request_processing',
Expand All @@ -267,7 +265,7 @@ def process_tier_config_adjustment_request(self, request):
if request['status'] == 'pending':
template_id = self.config['TIER_REQUEST_APPROVE_TEMPLATE_ID']
self.approve_tier_request(request, template_id)
return ProcessingResponse.done()
return BackgroundResponse.done()

@schedulable(
'Schedulable method mock',
Expand All @@ -288,7 +286,7 @@ def process_tier_account_update_request(self, request): # pragma: no cover
f"Received event for tier account request {request['id']}, type {request['type']} "
f"in status {request['status']}",
)
return ProcessingResponse.done()
return BackgroundResponse.done()

@event(
'usage_file_request_processing',
Expand All @@ -303,7 +301,7 @@ def process_usage_file(self, request): # pragma: no cover
f"Received event for usage file {request['id']} "
f"in status {request['status']}",
)
return ProcessingResponse.done()
return BackgroundResponse.done()

@event(
'part_usage_file_request_processing',
Expand All @@ -314,4 +312,4 @@ def process_usage_chunk_file(self, request): # pragma: no cover
f"Received event for usage chunks file {request['id']} "
f"in status {request['status']}",
)
return ProcessingResponse.done()
return BackgroundResponse.done()
Loading

0 comments on commit 2f7dadb

Please sign in to comment.