diff options
| author |   vrvarma <vv8305@att.com> | 2018-09-25 11:28:01 -0400 |
|---|---|---|
| committer | vrvarma <vv8305@att.com> | 2018-10-01 22:02:48 -0400 |
| commit | cfee73cdf05a76edf69ebdea23a87e2105637c89 (patch) | |
| tree | 65df1cc509968e052c5e9c1a2eee850235ab9c67 /test/functest/simulators/policy | |
| parent | e93d457429f0cb5eb01c5a5ec78c912c1e911a9a (diff) | |
Dockerize osdf simulators for csit
Dockerfile modifications
Adding intellectual property headers
Fixing simulators for policy, add policy name, etc.
Fix the hpa policy files based on the comments
Change-Id: I337e3200cc92fc1f205bb6e6151620968fc59c7e
Signed-off-by: vrvarma <vv8305@att.com>
Issue-ID: OPTFRA-286
Diffstat (limited to 'test/functest/simulators/policy')
2 files changed, 12 insertions, 23 deletions
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 85b1e82..ce0b7e3 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 @@ -67,7 +67,7 @@ "hpa-feature" : "cpuInstructionSetExtensions", "mandatory" : "True", "architecture": "INTEL-64", - "directives":[], + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key":"instructionSetExtensions", "hpa-attribute-value":["<CPUINST>", "<CPUINST>"], "operator": "ALL", "unit":""} ] @@ -93,7 +93,7 @@ "hpa-feature" : "cpuPinningy", "mandatory" : "True", "architecture": "generic", - "directives":[], + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key":"logicalCpuThreadPinningPolicy", "hpa-attribute-value":"<CPUTHREADPOLICY>", "operator": "=", "unit":""}, {"hpa-attribute-key":"logicalCpuPinningPolicy", "hpa-attribute-value": "<CPUPOLICY>","operator": "=", "unit":""} @@ -103,7 +103,7 @@ "hpa-feature" : "basicCapabilities", "mandatory" : "True", "architecture": "generic", - "directives":[], + "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"} @@ -114,7 +114,7 @@ "mandatory" : "False", "score" : "5", "architecture": "generic", - "directives":[], + "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"}, @@ -125,7 +125,7 @@ "hpa-feature" : "pcie", "mandatory" : "True", "architecture": "generic", - "directives":[], + "directives": [], "hpa-feature-attributes": [ {"hpa-attribute-key": "pciCount", "hpa-attribute-value": "2", "operator": "=", "unit": ""}, {"hpa-attribute-key": "pciVendorId", "hpa-attribute-value":"8086", "operator": "=", "unit": ""}, @@ -155,7 +155,7 @@ "mandatory" : "False", "score" : "5", "architecture": "generic", - "directives":[], + "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": ""}, @@ -168,7 +168,7 @@ "hpa-feature" : "basicCapabilities", "mandatory" : "True", "architecture": "generic", - "directives":[], + "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"} @@ -179,7 +179,7 @@ "mandatory" : "False", "score" : "7", "architecture": "generic", - "directives":[], + "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 262ffe7..5d2499f 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 @@ -122,25 +122,14 @@ ] }, { - "hpa-feature" : "pcie", + "hpa-feature" : "pciePassthrough", "mandatory" : "True", "architecture": "generic", - "directives": [ - { - "type": "pcie_directives", - "attributes": [ - { - "attribute_name": "<pcie_label_name>", - "attribute_value": "<value for pcie network>" - } - ] - } - ], + "directives": [], "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": "physicalNetwork", "hpa-attribute-value": "<PCITYPEVALUE>","operator": "=", "unit": ""} + {"hpa-attribute-key": "pciDeviceId", "hpa-attribute-value": "2", "operator": "=", "unit": ""} ] } ] @@ -164,8 +153,8 @@ "hpa-feature" : "numa", "mandatory" : "False", "score" : "5", - "directives": [], "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": ""}, |