diff options
Diffstat (limited to 'osdf')
-rw-r--r-- | osdf/models/policy/placement/tosca/affinityPolicy-v20181031.yml (renamed from osdf/models/policy/placement/tosca/affinityPolicy-v20180326.yml) | 2 | ||||
-rw-r--r-- | osdf/models/policy/placement/tosca/distancePolicy-v20181031.yml (renamed from osdf/models/policy/placement/tosca/distancePolicy-v20180326.yml) | 2 | ||||
-rw-r--r-- | osdf/models/policy/placement/tosca/hpaPolicy-v20181031.yml (renamed from osdf/models/policy/placement/tosca/hpaPolicy-v20180326.yml) | 10 | ||||
-rw-r--r-- | osdf/models/policy/placement/tosca/optimizationPolicy-v20181031.yml (renamed from osdf/models/policy/placement/tosca/optimizationPolicy-v20180326.yml) | 2 | ||||
-rw-r--r-- | osdf/models/policy/placement/tosca/queryPolicy-v20181031.yml (renamed from osdf/models/policy/placement/tosca/queryPolicy-v20180326.yml) | 2 | ||||
-rw-r--r-- | osdf/optimizers/placementopt/conductor/api_builder.py | 6 | ||||
-rwxr-xr-x | osdf/templates/conductor_interface.json | 8 |
7 files changed, 19 insertions, 13 deletions
diff --git a/osdf/models/policy/placement/tosca/affinityPolicy-v20180326.yml b/osdf/models/policy/placement/tosca/affinityPolicy-v20181031.yml index 4db64db..89a3e9d 100644 --- a/osdf/models/policy/placement/tosca/affinityPolicy-v20180326.yml +++ b/osdf/models/policy/placement/tosca/affinityPolicy-v20181031.yml @@ -19,7 +19,7 @@ node_types: type: string consraints: - valid_values: - - affinityPolicy + - zone identity: type: string required: true diff --git a/osdf/models/policy/placement/tosca/distancePolicy-v20180326.yml b/osdf/models/policy/placement/tosca/distancePolicy-v20181031.yml index 53d15dd..9c3bd29 100644 --- a/osdf/models/policy/placement/tosca/distancePolicy-v20180326.yml +++ b/osdf/models/policy/placement/tosca/distancePolicy-v20181031.yml @@ -19,7 +19,7 @@ node_types: type: string consraints: - valid_values: - - distancePolicy + - distance_to_location identity: type: string required: true diff --git a/osdf/models/policy/placement/tosca/hpaPolicy-v20180326.yml b/osdf/models/policy/placement/tosca/hpaPolicy-v20181031.yml index 293cb63..baa654a 100644 --- a/osdf/models/policy/placement/tosca/hpaPolicy-v20180326.yml +++ b/osdf/models/policy/placement/tosca/hpaPolicy-v20181031.yml @@ -19,10 +19,12 @@ node_types: type: string consraints: - valid_values: - - hpaPolicy - resource: - type: string + - hpa + resources: + type: list required: true + entry_schema: + type: string identity: type: string required: true @@ -30,7 +32,7 @@ node_types: type: list required: true entry_schema: - - type: policy.data.flavorFeatures_properties + type: policy.data.flavorFeatures_properties data_types: policy.data.flavorFeatures_properties: derived_from: tosca.nodes.Root diff --git a/osdf/models/policy/placement/tosca/optimizationPolicy-v20180326.yml b/osdf/models/policy/placement/tosca/optimizationPolicy-v20181031.yml index 0a3b94f..166799c 100644 --- a/osdf/models/policy/placement/tosca/optimizationPolicy-v20180326.yml +++ b/osdf/models/policy/placement/tosca/optimizationPolicy-v20181031.yml @@ -19,7 +19,7 @@ node_types: type: string consraints: - valid_values: - - optimizationPolicy + - placement_optimization identity: type: string required: true diff --git a/osdf/models/policy/placement/tosca/queryPolicy-v20180326.yml b/osdf/models/policy/placement/tosca/queryPolicy-v20181031.yml index 2488769..805b5a2 100644 --- a/osdf/models/policy/placement/tosca/queryPolicy-v20180326.yml +++ b/osdf/models/policy/placement/tosca/queryPolicy-v20181031.yml @@ -19,7 +19,7 @@ node_types: type: string consraints: - valid_values: - - queryPolicy + - request_param_query identity: type: string required: true diff --git a/osdf/optimizers/placementopt/conductor/api_builder.py b/osdf/optimizers/placementopt/conductor/api_builder.py index e841f48..187f9f5 100644 --- a/osdf/optimizers/placementopt/conductor/api_builder.py +++ b/osdf/optimizers/placementopt/conductor/api_builder.py @@ -50,11 +50,11 @@ def conductor_api_builder(request_json, flat_policies: list, local_config, demand_vnf_name_list, gp['instance_fit']) resource_region_policy_list = tr.gen_resource_region_policy(demand_vnf_name_list, gp['region_fit']) zone_policy_list = tr.gen_zone_policy(demand_vnf_name_list, gp['zone']) - optimization_policy_list = tr.gen_optimization_policy(demand_vnf_name_list, gp['placementOptimization']) + optimization_policy_list = tr.gen_optimization_policy(demand_vnf_name_list, gp['placement_optimization']) reservation_policy_list = tr.gen_reservation_policy(demand_vnf_name_list, gp['instance_reservation']) capacity_policy_list = tr.gen_capacity_policy(demand_vnf_name_list, gp['vim_fit']) hpa_policy_list = tr.gen_hpa_policy(demand_vnf_name_list, gp['hpa']) - req_params_dict = tr.get_opt_query_data(request_json, gp['optimizationQueryPolicy']) + req_params_dict = tr.get_opt_query_data(request_json, gp['request_param_query']) conductor_policies = [attribute_policy_list, distance_to_location_policy_list, inventory_policy_list, resource_instance_policy_list, resource_region_policy_list, zone_policy_list, reservation_policy_list, capacity_policy_list, hpa_policy_list] @@ -74,6 +74,8 @@ def conductor_api_builder(request_json, flat_policies: list, local_config, service_id=request_json['serviceInfo']['serviceInstanceId'], latitude=req_params_dict.get("customerLatitude", 0.0), longitude=req_params_dict.get("customerLongitude", 0.0), + required_disk=req_params_dict.get("requiredDisk", ""), + required_mem=req_params_dict.get("requiredMemory", ""), json=json) json_payload = json.dumps(json.loads(rendered_req)) # need this because template's JSON is ugly! return json_payload diff --git a/osdf/templates/conductor_interface.json b/osdf/templates/conductor_interface.json index d2258a0..7377c48 100755 --- a/osdf/templates/conductor_interface.json +++ b/osdf/templates/conductor_interface.json @@ -6,10 +6,12 @@ "template": {
"homing_template_version": "2017-10-10",
"parameters": {
- "service_name": "{{ service_name }}",
+ "service_name": "{{ service_type }}",
"service_id": "{{ service_id }}",
"customer_lat": {{ latitude }},
- "customer_long": {{ longitude }}
+ "customer_long": {{ longitude }},
+ "REQUIRED_DISK": "{{ required_disk }}",
+ "REQUIRED_MEM": "{{ required_mem }}"
},
"locations": {
"customer_loc": {
@@ -36,4 +38,4 @@ {% endfor %}
}
}
-}
\ No newline at end of file +}
|