diff options
| author |   Sastry Isukapalli <sastry@research.att.com> | 2018-03-28 22:21:30 -0400 |
|---|---|---|
| committer | Sastry Isukapalli <sastry@research.att.com> | 2018-03-28 22:57:12 -0400 |
| commit | ab7a87456538e561d60d209fe534c175ddd0269c (patch) | |
| tree | 1724b218d148f989cf8e3647bc1bd703526f08c8 /osdf/optimizers/placementopt/conductor | |
| parent | ad29f38cbcb164a7f328b26daf789dbff90deb98 (diff) | |
Functest scripts, simulators, and payloads
osdf/adapters/policy/utils.py:
Removed duplicated code (group_policies and group_policies_gen are very similar,
and group_policies seems to be not used
osdf/optimizers/placementopt/conductor/api_builder.py:
changed param name from "grouped_policies" to "flat_policies"
tox.ini
added starup and shutdown of simulators (flask app with mock payloads) in tox tests
rest all files/changes in "test/" folder
quite a few payload files
Patch set 2: removed a "print()" statement from simulator code
Issue-ID: OPTFRA-22
Change-Id: I0006c577fc459c7c884b55e8316c689afd151780
Signed-off-by: Sastry Isukapalli <sastry@research.att.com>
Diffstat (limited to 'osdf/optimizers/placementopt/conductor')
| -rw-r--r-- | osdf/optimizers/placementopt/conductor/api_builder.py | 3 | ||||
| -rw-r--r-- | osdf/optimizers/placementopt/conductor/conductor.py | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/osdf/optimizers/placementopt/conductor/api_builder.py b/osdf/optimizers/placementopt/conductor/api_builder.py index e359500..b2a5bf7 100644 --- a/osdf/optimizers/placementopt/conductor/api_builder.py +++ b/osdf/optimizers/placementopt/conductor/api_builder.py @@ -25,7 +25,8 @@ from osdf.adapters.policy.utils import group_policies_gen from osdf.utils.programming_utils import list_flatten -def conductor_api_builder(request_json, flat_policies: list, local_config, template="templates/conductor_interface.json"): +def conductor_api_builder(request_json, flat_policies: list, local_config, + template="osdf/templates/conductor_interface.json"): """Build an OSDF southbound API call for HAS-Conductor/Placement optimization :param request_json: parameter data received from a client :param flat_policies: policy data received from the policy platform (flat policies) diff --git a/osdf/optimizers/placementopt/conductor/conductor.py b/osdf/optimizers/placementopt/conductor/conductor.py index 41b901c..663857b 100644 --- a/osdf/optimizers/placementopt/conductor/conductor.py +++ b/osdf/optimizers/placementopt/conductor/conductor.py @@ -32,12 +32,12 @@ from osdf.utils.interfaces import RestClient from osdf.operation.exceptions import BusinessException -def request(req_object, osdf_config, grouped_policies): +def request(req_object, osdf_config, flat_policies): """ Process a placement request from a Client (build Conductor API call, make the call, return result) :param req_object: Request parameters from the client :param osdf_config: Configuration specific to SNIRO application (core + deployment) - :param grouped_policies: policies related to placement (fetched based on request, and grouped by policy type) + :param flat_policies: policies related to placement (fetched based on request) :param prov_status: provStatus retrieved from Subscriber policy :return: response from Conductor (accounting for redirects from Conductor service """ @@ -53,7 +53,7 @@ def request(req_object, osdf_config, grouped_policies): ping_wait_time = config.get('conductorPingWaitTime', 60) rc = RestClient(userid=uid, passwd=passwd, method="GET", log_func=debug_log.debug, headers=headers) - conductor_req_json_str = conductor_api_builder(req_object, grouped_policies, local_config) + conductor_req_json_str = conductor_api_builder(req_object, flat_policies, local_config) conductor_req_json = json.loads(conductor_req_json_str) debug_log.debug("Sending first Conductor request for request_id {}".format(req_id)) |