diff options
7 files changed, 369 insertions, 45 deletions
diff --git a/osdf/optimizers/placementopt/conductor/conductor.py b/osdf/optimizers/placementopt/conductor/conductor.py index 29f0bbc..357efd1 100755 --- a/osdf/optimizers/placementopt/conductor/conductor.py +++ b/osdf/optimizers/placementopt/conductor/conductor.py @@ -136,7 +136,7 @@ def conductor_response_processor(conductor_response, raw_response, req_id): name_map = {"physical-location-id": "cloudClli", "host_id": "vnfHostName",
"cloud_version": "cloudVersion", "cloud_owner": "cloudOwner",
"cloud": "cloudRegionId", "service": "serviceInstanceId", "is_rehome": "isRehome",
- "location_id": "locationId", "location_type": "locationType"}
+ "location_id": "locationId", "location_type": "locationType", "directives": "oof_directives"}
for reco in conductor_response['plans'][0]['recommendations']:
for resource in reco.keys():
c = reco[resource]['candidate']
diff --git a/test/functest/simulators/policy/response-payloads/pdp-has-vcpe-good/hpa_policy_vGMuxInfra_1.json b/test/functest/simulators/policy/response-payloads/pdp-has-vcpe-good/hpa_policy_vGMuxInfra_1.json index da4ef03..85b1e82 100644 --- a/test/functest/simulators/policy/response-payloads/pdp-has-vcpe-good/hpa_policy_vGMuxInfra_1.json +++ b/test/functest/simulators/policy/response-payloads/pdp-has-vcpe-good/hpa_policy_vGMuxInfra_1.json @@ -15,12 +15,25 @@ "policyType": "hpaPolicy", "flavorFeatures": [ { - "flavorLabel": "flavor_label_vm_01", + "id": "vgmux_1", + "type": "vnfc", + "directives": [ + { + "type": "flavor_directives", + "attributes": [ + { + "attribute_name": "flavor_label_vm_01", + "attribute_value": "" + } + ] + } + ], "flavorProperties":[ { "hpa-feature" : "cpuTopology", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key":"numCpuSockets", "hpa-attribute-value": "2","operator": ">=", "unit": ""}, {"hpa-attribute-key":"numCpuSockets", "hpa-attribute-value": "4","operator": "<=", "unit": ""}, @@ -34,6 +47,7 @@ "hpa-feature" : "basicCapabilities", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "numVirtualCpu", "hpa-attribute-value": "6", "operator": "=", "unit": ""}, {"hpa-attribute-key": "virtualMemSize", "hpa-attribute-value":"6", "operator": "=", "unit": "GB"} @@ -44,6 +58,7 @@ "mandatory" : "False", "score" : "3", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key":"dataProcessingAccelerationLibrary", "hpa-attribute-value":"ovsDpdk_version", "operator": "=", "unit":""} ] @@ -52,6 +67,7 @@ "hpa-feature" : "cpuInstructionSetExtensions", "mandatory" : "True", "architecture": "INTEL-64", + "directives":[], "hpa-feature-attributes": [ {"hpa-attribute-key":"instructionSetExtensions", "hpa-attribute-value":["<CPUINST>", "<CPUINST>"], "operator": "ALL", "unit":""} ] @@ -59,12 +75,25 @@ ] }, { - "flavorLabel": "flavor_label_vm_02", + "id": "vgmux_2", + "type": "vnfc", + "directives": [ + { + "type": "flavor_directives", + "attributes": [ + { + "attribute_name": "flavor_label_vm_02", + "attribute_value": "" + } + ] + } + ], "flavorProperties":[ { "hpa-feature" : "cpuPinningy", "mandatory" : "True", "architecture": "generic", + "directives":[], "hpa-feature-attributes": [ {"hpa-attribute-key":"logicalCpuThreadPinningPolicy", "hpa-attribute-value":"<CPUTHREADPOLICY>", "operator": "=", "unit":""}, {"hpa-attribute-key":"logicalCpuPinningPolicy", "hpa-attribute-value": "<CPUPOLICY>","operator": "=", "unit":""} @@ -74,6 +103,7 @@ "hpa-feature" : "basicCapabilities", "mandatory" : "True", "architecture": "generic", + "directives":[], "hpa-feature-attributes": [ {"hpa-attribute-key": "numVirtualCpu", "hpa-attribute-value": "6", "operator": "=", "unit": ""}, {"hpa-attribute-key": "virtualMemSize", "hpa-attribute-value":"6", "operator": "=", "unit": "GB"} @@ -84,6 +114,7 @@ "mandatory" : "False", "score" : "5", "architecture": "generic", + "directives":[], "hpa-feature-attributes": [ {"hpa-attribute-key": "diskSize", "hpa-attribute-value": "2", "operator": "=", "unit": "GB"}, {"hpa-attribute-key": "ephemeralDiskSize", "hpa-attribute-value": "2", "operator": "=", "unit": "GB"}, @@ -94,6 +125,7 @@ "hpa-feature" : "pcie", "mandatory" : "True", "architecture": "generic", + "directives":[], "hpa-feature-attributes": [ {"hpa-attribute-key": "pciCount", "hpa-attribute-value": "2", "operator": "=", "unit": ""}, {"hpa-attribute-key": "pciVendorId", "hpa-attribute-value":"8086", "operator": "=", "unit": ""}, @@ -104,13 +136,26 @@ ] }, { - "flavorLabel": "flavor_label_vm_03", + "id": "vgmux_3", + "type": "vnfc", + "directives": [ + { + "type": "flavor_directives", + "attributes": [ + { + "attribute_name": "flavor_label_vm_03", + "attribute_value": "" + } + ] + } + ], "flavorProperties":[ { "hpa-feature" : "numa", "mandatory" : "False", "score" : "5", "architecture": "generic", + "directives":[], "hpa-feature-attributes": [ {"hpa-attribute-key": "numaNodes", "hpa-attribute-value": "2", "operator": "=", "unit": ""}, {"hpa-attribute-key": "numaCpu-0", "hpa-attribute-value":"2", "operator": "=", "unit": ""}, @@ -123,6 +168,7 @@ "hpa-feature" : "basicCapabilities", "mandatory" : "True", "architecture": "generic", + "directives":[], "hpa-feature-attributes": [ {"hpa-attribute-key": "numVirtualCpu", "hpa-attribute-value": "6", "operator": "=", "unit": ""}, {"hpa-attribute-key": "virtualMemSize", "hpa-attribute-value":"6", "operator": "=", "unit": "GB"} @@ -133,6 +179,7 @@ "mandatory" : "False", "score" : "7", "architecture": "generic", + "directives":[], "hpa-feature-attributes": [ {"hpa-attribute-key": "memoryPageSize", "hpa-attribute-value": "<MEMORYPAGESIZE>", "operator": "=", "unit": ""} ] diff --git a/test/functest/simulators/policy/response-payloads/pdp-has-vcpe-good/hpa_policy_vG_1.json b/test/functest/simulators/policy/response-payloads/pdp-has-vcpe-good/hpa_policy_vG_1.json index f50ed6d..262ffe7 100644 --- a/test/functest/simulators/policy/response-payloads/pdp-has-vcpe-good/hpa_policy_vG_1.json +++ b/test/functest/simulators/policy/response-payloads/pdp-has-vcpe-good/hpa_policy_vG_1.json @@ -15,12 +15,25 @@ "policyType": "hpaPolicy", "flavorFeatures": [ { - "flavorLabel": "flavor_label_vm_01", + "id": "vg_1", + "type": "vnfc", + "directives": [ + { + "type": "flavor_directives", + "attributes": [ + { + "attribute_name": "flavor_label_vm_01", + "attribute_value": "" + } + ] + } + ], "flavorProperties":[ { "hpa-feature" : "cpuTopology", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key":"numCpuSockets", "hpa-attribute-value": "2","operator": ">=", "unit": ""}, {"hpa-attribute-key":"numCpuSockets", "hpa-attribute-value": "4","operator": "<=", "unit": ""}, @@ -34,6 +47,7 @@ "hpa-feature" : "basicCapabilities", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "numVirtualCpu", "hpa-attribute-value": "6", "operator": "=", "unit": ""}, {"hpa-attribute-key": "virtualMemSize", "hpa-attribute-value":"6", "operator": "=", "unit": "GB"} @@ -44,6 +58,7 @@ "mandatory" : "False", "score" : "3", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key":"dataProcessingAccelerationLibrary", "hpa-attribute-value":"ovsDpdk_version", "operator": "=", "unit":""} ] @@ -52,6 +67,7 @@ "hpa-feature" : "cpuInstructionSetExtensions", "mandatory" : "True", "architecture": "INTEL-64", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key":"instructionSetExtensions", "hpa-attribute-value":["<CPUINST>", "<CPUINST>"], "operator": "ALL", "unit":""} ] @@ -59,12 +75,25 @@ ] }, { - "flavorLabel": "flavor_label_vm_02", + "id": "vg_2", + "type": "vnfc", + "directives": [ + { + "type": "flavor_directives", + "attributes": [ + { + "attribute_name": "flavor_label_vm_02", + "attribute_value": "" + } + ] + } + ], "flavorProperties":[ { "hpa-feature" : "cpuPinningy", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key":"logicalCpuThreadPinningPolicy", "hpa-attribute-value":"<CPUTHREADPOLICY>", "operator": "=", "unit":""}, {"hpa-attribute-key":"logicalCpuPinningPolicy", "hpa-attribute-value": "<CPUPOLICY>","operator": "=", "unit":""} @@ -74,6 +103,7 @@ "hpa-feature" : "basicCapabilities", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "numVirtualCpu", "hpa-attribute-value": "6", "operator": "=", "unit": ""}, {"hpa-attribute-key": "virtualMemSize", "hpa-attribute-value":"6", "operator": "=", "unit": "GB"} @@ -84,6 +114,7 @@ "mandatory" : "False", "score" : "5", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "diskSize", "hpa-attribute-value": "2", "operator": "=", "unit": "GB"}, {"hpa-attribute-key": "ephemeralDiskSize", "hpa-attribute-value": "2", "operator": "=", "unit": "GB"}, @@ -94,22 +125,46 @@ "hpa-feature" : "pcie", "mandatory" : "True", "architecture": "generic", + "directives": [ + { + "type": "pcie_directives", + "attributes": [ + { + "attribute_name": "<pcie_label_name>", + "attribute_value": "<value for pcie network>" + } + ] + } + ], "hpa-feature-attributes": [ {"hpa-attribute-key": "pciCount", "hpa-attribute-value": "2", "operator": "=", "unit": ""}, {"hpa-attribute-key": "pciVendorId", "hpa-attribute-value":"8086", "operator": "=", "unit": ""}, {"hpa-attribute-key": "pciDeviceId", "hpa-attribute-value": "2", "operator": "=", "unit": ""}, - {"hpa-attribute-key": "functionType", "hpa-attribute-value": "<PCITYPEVALUE>","operator": "=", "unit": ""} + {"hpa-attribute-key": "physicalNetwork", "hpa-attribute-value": "<PCITYPEVALUE>","operator": "=", "unit": ""} ] } ] }, { - "flavorLabel": "flavor_label_vm_03", + "id": "vg_3", + "type": "vnfc", + "directives": [ + { + "type": "flavor_directives", + "attributes": [ + { + "attribute_name": "flavor_label_vm_03", + "attribute_value": "" + } + ] + } + ], "flavorProperties":[ { "hpa-feature" : "numa", "mandatory" : "False", "score" : "5", + "directives": [], "architecture": "generic", "hpa-feature-attributes": [ {"hpa-attribute-key": "numaNodes", "hpa-attribute-value": "2", "operator": "=", "unit": ""}, @@ -123,6 +178,7 @@ "hpa-feature" : "basicCapabilities", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "numVirtualCpu", "hpa-attribute-value": "6", "operator": "=", "unit": ""}, {"hpa-attribute-key": "virtualMemSize", "hpa-attribute-value":"6", "operator": "=", "unit": "GB"} @@ -133,6 +189,7 @@ "mandatory" : "False", "score" : "7", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "memoryPageSize", "hpa-attribute-value": "<MEMORYPAGESIZE>", "operator": "=", "unit": ""} ] diff --git a/test/placement-tests/conductor_response.json b/test/placement-tests/conductor_response.json index e7037c2..ee38ce9 100644 --- a/test/placement-tests/conductor_response.json +++ b/test/placement-tests/conductor_response.json @@ -24,9 +24,65 @@ "location_type": "openstack-cloud" }, "attributes": { - "flavors": { - "flavor_label_1": "vim_flavor_X", - "flavor_label_2": "vim_flavor_Y" + "directives": { + "directives": [ + { + "id": "vFW_0", + "type": "<vnfc/tocsa.nodes.nfv.Vdu.Compute>", + "directives": [ + { + "type": "flavor_directives", + "attributes": [ + { + "attribute_name": "oof_returned_flavor_label_for_firewall", + "attribute_value": "vim_flavor_X" + } + ] + }, + { + "type": "sriovNICNetwork_directives", + "attributes": [ + { + "attribute_name": "oof_returned_vnic_type_for_firewall_protected", + "attribute_value": "direct" + }, + { + "attribute_name": "oof_returned_provider_network_for_firewall_protected", + "attribute_value": "physnet1" + } + ] + }, + { + "type": "sriovNICNetwork_directives", + "attributes": [ + { + "attribute_name": "oof_returned_vnic_type_for_firewall_unprotected", + "attribute_value": "direct" + }, + { + "attribute_name": "oof_returned_provider_network_for_firewall_unprotected", + "attribute_value": "physnet2" + } + ] + } + ] + }, + { + "id": "vFW_1", + "type": "<vnfc/tocsa.nodes.nfv.Vdu.Compute>", + "directives": [ + { + "type": "flavor_directives", + "attributes": [ + { + "attribute_name": "oof_returned_flavor_label_for_generator", + "attribute_value": "vim_flavor_Y" + } + ] + } + ] + } + ] }, "cloud_owner": "CloudOwner1", "physical-location-id": "DLLSTX1A", diff --git a/test/placement-tests/response.json b/test/placement-tests/response.json index 92751ac..71963e2 100644 --- a/test/placement-tests/response.json +++ b/test/placement-tests/response.json @@ -6,44 +6,114 @@ "solutions": { "placementSolutions": [ [ - { - "resourceModuleName": "vGMuxInfra", - "serviceResourceId": "someResourceId", - "solution": { + { + "resourceModuleName": "vGMuxInfra", + "serviceResourceId": "someResourceId", + "solution": { "identifierType": "serviceInstanceId", - "identifiers": ["gjhd-098-fhd-987"] + "identifiers": [ + "gjhd-098-fhd-987" + ] + }, + "assignmentInfo": [ + { + "key": "cloudOwner", + "value": "amazon" + }, + { + "key": "vnfHostName", + "value": "ahr344gh" + }, + { + "key": "isRehome", + "value": "False" + }, + { + "key": "cloudRegionId", + "value": "1ac71fb8-ad43-4e16-9459-c3f372b8236d" + }, + { + "key": "oof_directives", + "value": { + "directives": [ + { + "id": "vgmux_1", + "type": "vnfc", + "directives": [ + { + "type": "flavor_directives", + "attributes": [ + { + "attribute_name": "flavorLabel1", + "attribute_value": "vimFlavorX" + } + ] + } + ] + }, + { + "id": "vgmux_2", + "type": "vnfc", + "directives": [ + { + "type": "flavor_directives", + "attributes": [ + { + "attribute_name": "flavorLabel2", + "attribute_value": "vimFlavorY" + } + ] + } + ] + } + ] + } + } + ] }, - "assignmentInfo": [ - { "key": "cloudOwner", "value": "amazon" }, - { "key": "vnfHostName", "value": "ahr344gh" }, - { "key": "isRehome", "value": "False" }, - { "key": "cloudRegionId", "value": "1ac71fb8-ad43-4e16-9459-c3f372b8236d" }, - { "key":"flavors", "value": { "flavorLabel1": "vimFlavorX", "flavorLabel2": "vimFlavorY"}} - ] - }, - { - "resourceModuleName": "vG", - "serviceResourceId": "someResourceId", - "solution": { + { + "resourceModuleName": "vG", + "serviceResourceId": "someResourceId", + "solution": { "identifierType": "cloudRegionId", "cloudOwner": "amazon", - "identifiers": ["gjhd-098-fhd-987"] - }, - "assignmentInfo": [ - { "key": "cloudOwner", "value": "amazon" }, - { "key": "cloudRegionId", "value": "1ac71fb8-ad43-4e16-9459-c3f372b8236d" } - ] - } + "identifiers": [ + "gjhd-098-fhd-987" + ] + }, + "assignmentInfo": [ + { + "key": "cloudOwner", + "value": "amazon" + }, + { + "key": "cloudRegionId", + "value": "1ac71fb8-ad43-4e16-9459-c3f372b8236d" + } + ] + } ] ], "licenseSolutions": [ { "resourceModuleName": "vGMuxInfra", "serviceResourceId": "someResourceId", - "entitlementPoolUUID": ["1ac71fb8-ad43-4e16-9459-c3f372b8236d", "834fc71fb8-ad43-4fh7-9459-c3f372b8236f"], - "licenseKeyGroupUUID": ["1ac71fb8-ad43-4e16-9459-c3f372b8236d", "834fc71fb8-ad43-4fh7-9459-c3f372b8236f"], - "entitlementPoolInvariantUUID": ["1ac71fb8-ad43-4e16-9459-c3f372b8236d", "834fc71fb8-ad43-4fh7-9459-c3f372b8236f"], - "licenseKeyGroupInvariantUUID": ["1ac71fb8-ad43-4e16-9459-c3f372b8236d", "834fc71fb8-ad43-4fh7-9459-c3f372b8236f"] + "entitlementPoolUUID": [ + "1ac71fb8-ad43-4e16-9459-c3f372b8236d", + "834fc71fb8-ad43-4fh7-9459-c3f372b8236f" + ], + "licenseKeyGroupUUID": [ + "1ac71fb8-ad43-4e16-9459-c3f372b8236d", + "834fc71fb8-ad43-4fh7-9459-c3f372b8236f" + ], + "entitlementPoolInvariantUUID": [ + "1ac71fb8-ad43-4e16-9459-c3f372b8236d", + "834fc71fb8-ad43-4fh7-9459-c3f372b8236f" + ], + "licenseKeyGroupInvariantUUID": [ + "1ac71fb8-ad43-4e16-9459-c3f372b8236d", + "834fc71fb8-ad43-4fh7-9459-c3f372b8236f" + ] } ] } diff --git a/test/policy-local-files/hpa_policy_vGMuxInfra_1.json b/test/policy-local-files/hpa_policy_vGMuxInfra_1.json index da4ef03..ce0b7e3 100644 --- a/test/policy-local-files/hpa_policy_vGMuxInfra_1.json +++ b/test/policy-local-files/hpa_policy_vGMuxInfra_1.json @@ -15,12 +15,25 @@ "policyType": "hpaPolicy", "flavorFeatures": [ { - "flavorLabel": "flavor_label_vm_01", + "id": "vgmux_1", + "type": "vnfc", + "directives": [ + { + "type": "flavor_directives", + "attributes": [ + { + "attribute_name": "flavor_label_vm_01", + "attribute_value": "" + } + ] + } + ], "flavorProperties":[ { "hpa-feature" : "cpuTopology", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key":"numCpuSockets", "hpa-attribute-value": "2","operator": ">=", "unit": ""}, {"hpa-attribute-key":"numCpuSockets", "hpa-attribute-value": "4","operator": "<=", "unit": ""}, @@ -34,6 +47,7 @@ "hpa-feature" : "basicCapabilities", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "numVirtualCpu", "hpa-attribute-value": "6", "operator": "=", "unit": ""}, {"hpa-attribute-key": "virtualMemSize", "hpa-attribute-value":"6", "operator": "=", "unit": "GB"} @@ -44,6 +58,7 @@ "mandatory" : "False", "score" : "3", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key":"dataProcessingAccelerationLibrary", "hpa-attribute-value":"ovsDpdk_version", "operator": "=", "unit":""} ] @@ -52,6 +67,7 @@ "hpa-feature" : "cpuInstructionSetExtensions", "mandatory" : "True", "architecture": "INTEL-64", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key":"instructionSetExtensions", "hpa-attribute-value":["<CPUINST>", "<CPUINST>"], "operator": "ALL", "unit":""} ] @@ -59,12 +75,25 @@ ] }, { - "flavorLabel": "flavor_label_vm_02", + "id": "vgmux_2", + "type": "vnfc", + "directives": [ + { + "type": "flavor_directives", + "attributes": [ + { + "attribute_name": "flavor_label_vm_02", + "attribute_value": "" + } + ] + } + ], "flavorProperties":[ { "hpa-feature" : "cpuPinningy", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key":"logicalCpuThreadPinningPolicy", "hpa-attribute-value":"<CPUTHREADPOLICY>", "operator": "=", "unit":""}, {"hpa-attribute-key":"logicalCpuPinningPolicy", "hpa-attribute-value": "<CPUPOLICY>","operator": "=", "unit":""} @@ -74,6 +103,7 @@ "hpa-feature" : "basicCapabilities", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "numVirtualCpu", "hpa-attribute-value": "6", "operator": "=", "unit": ""}, {"hpa-attribute-key": "virtualMemSize", "hpa-attribute-value":"6", "operator": "=", "unit": "GB"} @@ -84,6 +114,7 @@ "mandatory" : "False", "score" : "5", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "diskSize", "hpa-attribute-value": "2", "operator": "=", "unit": "GB"}, {"hpa-attribute-key": "ephemeralDiskSize", "hpa-attribute-value": "2", "operator": "=", "unit": "GB"}, @@ -94,6 +125,7 @@ "hpa-feature" : "pcie", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "pciCount", "hpa-attribute-value": "2", "operator": "=", "unit": ""}, {"hpa-attribute-key": "pciVendorId", "hpa-attribute-value":"8086", "operator": "=", "unit": ""}, @@ -104,13 +136,26 @@ ] }, { - "flavorLabel": "flavor_label_vm_03", + "id": "vgmux_3", + "type": "vnfc", + "directives": [ + { + "type": "flavor_directives", + "attributes": [ + { + "attribute_name": "flavor_label_vm_03", + "attribute_value": "" + } + ] + } + ], "flavorProperties":[ { "hpa-feature" : "numa", "mandatory" : "False", "score" : "5", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "numaNodes", "hpa-attribute-value": "2", "operator": "=", "unit": ""}, {"hpa-attribute-key": "numaCpu-0", "hpa-attribute-value":"2", "operator": "=", "unit": ""}, @@ -123,6 +168,7 @@ "hpa-feature" : "basicCapabilities", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "numVirtualCpu", "hpa-attribute-value": "6", "operator": "=", "unit": ""}, {"hpa-attribute-key": "virtualMemSize", "hpa-attribute-value":"6", "operator": "=", "unit": "GB"} @@ -133,6 +179,7 @@ "mandatory" : "False", "score" : "7", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "memoryPageSize", "hpa-attribute-value": "<MEMORYPAGESIZE>", "operator": "=", "unit": ""} ] diff --git a/test/policy-local-files/hpa_policy_vG_1.json b/test/policy-local-files/hpa_policy_vG_1.json index f50ed6d..4dfb6ce 100644 --- a/test/policy-local-files/hpa_policy_vG_1.json +++ b/test/policy-local-files/hpa_policy_vG_1.json @@ -15,12 +15,25 @@ "policyType": "hpaPolicy", "flavorFeatures": [ { - "flavorLabel": "flavor_label_vm_01", + "id": "vg_1", + "type": "vnfc", + "directives": [ + { + "type": "flavor_directives", + "attributes": [ + { + "attribute_name": "flavor_label_vm_01", + "attribute_value": "" + } + ] + } + ], "flavorProperties":[ { "hpa-feature" : "cpuTopology", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key":"numCpuSockets", "hpa-attribute-value": "2","operator": ">=", "unit": ""}, {"hpa-attribute-key":"numCpuSockets", "hpa-attribute-value": "4","operator": "<=", "unit": ""}, @@ -34,6 +47,7 @@ "hpa-feature" : "basicCapabilities", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "numVirtualCpu", "hpa-attribute-value": "6", "operator": "=", "unit": ""}, {"hpa-attribute-key": "virtualMemSize", "hpa-attribute-value":"6", "operator": "=", "unit": "GB"} @@ -44,6 +58,7 @@ "mandatory" : "False", "score" : "3", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key":"dataProcessingAccelerationLibrary", "hpa-attribute-value":"ovsDpdk_version", "operator": "=", "unit":""} ] @@ -52,6 +67,7 @@ "hpa-feature" : "cpuInstructionSetExtensions", "mandatory" : "True", "architecture": "INTEL-64", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key":"instructionSetExtensions", "hpa-attribute-value":["<CPUINST>", "<CPUINST>"], "operator": "ALL", "unit":""} ] @@ -59,12 +75,25 @@ ] }, { - "flavorLabel": "flavor_label_vm_02", + "id": "vg_2", + "type": "vnfc", + "directives": [ + { + "type": "flavor_directives", + "attributes": [ + { + "attribute_name": "flavor_label_vm_02", + "attribute_value": "" + } + ] + } + ], "flavorProperties":[ { "hpa-feature" : "cpuPinningy", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key":"logicalCpuThreadPinningPolicy", "hpa-attribute-value":"<CPUTHREADPOLICY>", "operator": "=", "unit":""}, {"hpa-attribute-key":"logicalCpuPinningPolicy", "hpa-attribute-value": "<CPUPOLICY>","operator": "=", "unit":""} @@ -74,6 +103,7 @@ "hpa-feature" : "basicCapabilities", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "numVirtualCpu", "hpa-attribute-value": "6", "operator": "=", "unit": ""}, {"hpa-attribute-key": "virtualMemSize", "hpa-attribute-value":"6", "operator": "=", "unit": "GB"} @@ -84,6 +114,7 @@ "mandatory" : "False", "score" : "5", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "diskSize", "hpa-attribute-value": "2", "operator": "=", "unit": "GB"}, {"hpa-attribute-key": "ephemeralDiskSize", "hpa-attribute-value": "2", "operator": "=", "unit": "GB"}, @@ -94,6 +125,7 @@ "hpa-feature" : "pcie", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "pciCount", "hpa-attribute-value": "2", "operator": "=", "unit": ""}, {"hpa-attribute-key": "pciVendorId", "hpa-attribute-value":"8086", "operator": "=", "unit": ""}, @@ -104,13 +136,26 @@ ] }, { - "flavorLabel": "flavor_label_vm_03", + "id": "vg_3", + "type": "vnfc", + "directives": [ + { + "type": "flavor_directives", + "attributes": [ + { + "attribute_name": "flavor_label_vm_03", + "attribute_value": "" + } + ] + } + ], "flavorProperties":[ { "hpa-feature" : "numa", "mandatory" : "False", "score" : "5", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "numaNodes", "hpa-attribute-value": "2", "operator": "=", "unit": ""}, {"hpa-attribute-key": "numaCpu-0", "hpa-attribute-value":"2", "operator": "=", "unit": ""}, @@ -123,6 +168,7 @@ "hpa-feature" : "basicCapabilities", "mandatory" : "True", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "numVirtualCpu", "hpa-attribute-value": "6", "operator": "=", "unit": ""}, {"hpa-attribute-key": "virtualMemSize", "hpa-attribute-value":"6", "operator": "=", "unit": "GB"} @@ -133,6 +179,7 @@ "mandatory" : "False", "score" : "7", "architecture": "generic", + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "memoryPageSize", "hpa-attribute-value": "<MEMORYPAGESIZE>", "operator": "=", "unit": ""} ] |