diff options
| author |   Dileep Ranganathan <dileep.ranganathan@intel.com> | 2018-09-19 09:08:21 -0700 |
|---|---|---|
| committer | Dileep Ranganathan <dileep.ranganathan@intel.com> | 2018-09-19 09:08:21 -0700 |
| commit | a014bc832ce5e59b6dd52a6ac9dd5cea03a0ceec (patch) | |
| tree | f1a26ca3ff440fdb8b0c8a7c0a34eae786178011 | |
| parent | 530f19600fd9ee0f9eeab05473c85a83b61f50c3 (diff) | |
Add Optimization policy for hpa_score
Added policy for hpa_score optimization function for vCPE with weights.
Change-Id: Ic6f3081510cbe94c519bcb7b2a7a99137bc29e12
Issue-ID: OPTFRA-313
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
3 files changed, 13 insertions, 1 deletions
diff --git a/osdf/optimizers/placementopt/conductor/translation.py b/osdf/optimizers/placementopt/conductor/translation.py index 76cbabd..d856a22 100644 --- a/osdf/optimizers/placementopt/conductor/translation.py +++ b/osdf/optimizers/placementopt/conductor/translation.py @@ -54,7 +54,7 @@ def gen_optimization_policy(vnf_list, optimization_policy): for policy in optimization_policy: content = policy['content'] parameter_list = [] - parameters = ["cloud_version"] + parameters = ["cloud_version", "hpa_score"] for attr in content['objectiveParameter']['parameterAttributes']: parameter = attr['parameter'] if attr['parameter'] in parameters else attr['parameter']+"_between" diff --git a/test/functest/simulators/policy/response-payloads/pdp-has-vcpe-good/Placement_Optimization_1.json b/test/functest/simulators/policy/response-payloads/pdp-has-vcpe-good/Placement_Optimization_1.json index b81b15f..ab3c586 100644 --- a/test/functest/simulators/policy/response-payloads/pdp-has-vcpe-good/Placement_Optimization_1.json +++ b/test/functest/simulators/policy/response-payloads/pdp-has-vcpe-good/Placement_Optimization_1.json @@ -24,6 +24,12 @@ "parameter": "distance", "weight": "1", "operator": "product" + }, + { + "resources": ["vG"], + "parameter": "hpa_score", + "weight": "200", + "operator": "product" } ], "operator": "sum" diff --git a/test/policy-local-files/Placement_Optimization_1.json b/test/policy-local-files/Placement_Optimization_1.json index b81b15f..ab3c586 100644 --- a/test/policy-local-files/Placement_Optimization_1.json +++ b/test/policy-local-files/Placement_Optimization_1.json @@ -24,6 +24,12 @@ "parameter": "distance", "weight": "1", "operator": "product" + }, + { + "resources": ["vG"], + "parameter": "hpa_score", + "weight": "200", + "operator": "product" } ], "operator": "sum" |