From fc3ead31e631f69fabf0baaa20c10bf955ce374b Mon Sep 17 00:00:00 2001 From: Lukasz Rajewski Date: Mon, 8 Apr 2019 15:05:22 +0200 Subject: Traffic Distributtion support added * New local polcies for vFW TD use case * Fixed encoding for conductor_request template and parameters section modified to accept all requestParameters * Conductor request can have many attributes in the 'attributes' section - all that are defined in the vnf policy file * Conductor request can have many request parameters in the 'requestParameters' section. The parameters come from QueryPolicies. Before list of suppoted parameters was hardcoded * Optional 'unique' parameter added to the placementDemand section. It is already supported by conductor for all inventory types * Improved debug logs for local policies * Unit tests added for expanded request format Change-Id: I41f219c366a3a77881c7096e64a6272edbada23b Issue-ID: OPTFRA-443 Signed-off-by: Lukasz Rajewski --- test/placement-tests/request_placement_vfmod.json | 88 +++++++++++++++++++++++ 1 file changed, 88 insertions(+) create mode 100644 test/placement-tests/request_placement_vfmod.json (limited to 'test/placement-tests/request_placement_vfmod.json') diff --git a/test/placement-tests/request_placement_vfmod.json b/test/placement-tests/request_placement_vfmod.json new file mode 100644 index 0000000..4233416 --- /dev/null +++ b/test/placement-tests/request_placement_vfmod.json @@ -0,0 +1,88 @@ +{ + "name": "de4f04e3-0a65-470b-9d07-8ea6c2fb3e10", + "template": { + "constraints": { + "affinity_vFW_TD": { + "demands": ["vFW-SINK", "vPGN"], + "properties": { + "category": "region", + "qualifier": "same" + }, + "type": "zone" + } + }, + "parameters": { + "service_name": "vFW_TD", + "chosen_region": "RegionOne", + "service_id": "3e8d118c-10ca-4b4b-b3db-089b5e9e6a1c", + "customer_long": 2.2, + "REQUIRED_MEM": "", + "customer_lat": 1.1, + "REQUIRED_DISK": "" + }, + "locations": { + "customer_loc": { + "longitude": { + "get_param": "customer_long" + }, + "latitude": { + "get_param": "customer_lat" + } + } + }, + "demands": { + "vFW-SINK": [{ + "attributes": { + "global-customer-id": "Demonstration", + "cloud-region-id": { + "get_param": "chosen_region" + }, + "model-version-id": "763731df-84fd-494b-b824-01fc59a5ff2d", + "orchestration-status": ["active"], + "model-invariant-id": "e7227847-dea6-4374-abca-4561b070fe7d", + "service_instance_id": { + "get_param": "service_id" + }, + "prov-status": "ACTIVE" + }, + "inventory_provider": "aai", + "service_resource_id": "vFW-SINK-XX", + "inventory_type": "vfmodule", + "service_type": "vFW-SINK-XX", + "excluded_candidates": [{ + "inventory_type": "vfmodule", + "candidate_id": ["e765d576-8755-4145-8536-0bb6d9b1dc9a"] + }] + }], + "vPGN": [{ + "attributes": { + "global-customer-id": "Demonstration", + "cloud-region-id": { + "get_param": "chosen_region" + }, + "model-version-id": "e02a7e5c-9d27-4360-ab7c-73bb83b07e3b", + "orchestration-status": ["active"], + "model-invariant-id": "762472ef-5284-4daa-ab32-3e7bee2ec355", + "service_instance_id": { + "get_param": "service_id" + }, + "prov-status": "ACTIVE" + }, + "inventory_provider": "aai", + "service_resource_id": "vPGN-XX", + "unique": "false", + "inventory_type": "vfmodule", + "service_type": "vPGN-XX" + }] + }, + "optimization": { + "minimize": { + "sum": [] + } + }, + "homing_template_version": "2017-10-10" + }, + "limit": 100, + "files": {}, + "timeout": 1200 +} \ No newline at end of file -- cgit 1.2.3-korg