summaryrefslogtreecommitdiffstats
path: root/test/csit/tests/optf-has/has/data/plan_with_hpa_score_multi_objective.json
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-09-18 16:44:39 +0000
committerGerrit Code Review <gerrit@onap.org>2018-09-18 16:44:39 +0000
commit4ca7a59514fb93ad9068bee9f13129ffe14be43c (patch)
tree2c3bc0a917651004623951bcfd60a565b7308770 /test/csit/tests/optf-has/has/data/plan_with_hpa_score_multi_objective.json
parent259378a195e1079cc5d78f1933ecc1734b84849b (diff)
parent6c9628f1ef2f01b2a08bb0d5052b64dcdaff9fbf (diff)
Merge "Update OOF CSIT plans with new policy model"
Diffstat (limited to 'test/csit/tests/optf-has/has/data/plan_with_hpa_score_multi_objective.json')
-rw-r--r--test/csit/tests/optf-has/has/data/plan_with_hpa_score_multi_objective.json34
1 files changed, 32 insertions, 2 deletions
diff --git a/test/csit/tests/optf-has/has/data/plan_with_hpa_score_multi_objective.json b/test/csit/tests/optf-has/has/data/plan_with_hpa_score_multi_objective.json
index 55536f3c0..4a6d3bc8d 100644
--- a/test/csit/tests/optf-has/has/data/plan_with_hpa_score_multi_objective.json
+++ b/test/csit/tests/optf-has/has/data/plan_with_hpa_score_multi_objective.json
@@ -48,13 +48,26 @@
"properties": {
"evaluate": [
{
- "flavorLabel": "flavor_label_1",
+ "id":"vg_1",
+ "type":"vnfc",
+ "directives":[
+ {
+ "type":"flavor_directives",
+ "attributes":[
+ {
+ "attribute_name":"flavor_label_1",
+ "attribute_value":""
+ }
+ ]
+ }
+ ],
"flavorProperties": [
{
"hpa-feature": "basicCapabilities",
"hpa-version": "v1",
"architecture": "generic",
"mandatory": "True",
+ "directives":[],
"hpa-feature-attributes": [
{
"hpa-attribute-key": "numVirtualCpu",
@@ -74,6 +87,7 @@
"hpa-version": "v1",
"architecture": "Intel64",
"mandatory": "True",
+ "directives":[],
"hpa-feature-attributes": [
{
"hpa-attribute-key": "instructionSetExtensions",
@@ -94,6 +108,7 @@
"architecture": "generic",
"mandatory": "False",
"score": "3",
+ "directives":[],
"hpa-feature-attributes": [
{
"hpa-attribute-key": "numaNodes",
@@ -127,13 +142,26 @@
]
},
{
- "flavorLabel": "flavor_label_2",
+ "id":"vg_2",
+ "type":"vnfc",
+ "directives":[
+ {
+ "type":"flavor_directives",
+ "attributes":[
+ {
+ "attribute_name":"flavor_label_2",
+ "attribute_value":""
+ }
+ ]
+ }
+ ],
"flavorProperties": [
{
"hpa-feature": "basicCapabilities",
"hpa-version": "v1",
"architecture": "generic",
"mandatory": "True",
+ "directives":[],
"hpa-feature-attributes": [
{
"hpa-attribute-key": "numVirtualCpu",
@@ -154,6 +182,7 @@
"architecture": "generic",
"mandatory": "False",
"score": "5",
+ "directives":[],
"hpa-feature-attributes": [
{
"hpa-attribute-key": "dataProcessingAccelerationLibrary",
@@ -168,6 +197,7 @@
"architecture": "generic",
"mandatory": "False",
"score": "3",
+ "directives":[],
"hpa-feature-attributes": [
{
"hpa-attribute-key": "numaNodes",