From 2d3d8dcf6ef1bd2a161c69d561c629c5ec3f59c4 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Thu, 27 Sep 2018 10:29:30 -0700 Subject: Move CSIT to integration/csit repo To facilite branching of CSIT tests, all CSIT test code and scripts are relocated to the integration/csit repo. Change-Id: I6777cd414e43dbf2bfa6215f7e50849e1a6a2e59 Issue-ID: INT-671 Signed-off-by: Gary Wu --- .../tests/optf-has/has/data/plan_with_hpa.json | 260 --------------------- 1 file changed, 260 deletions(-) delete mode 100644 test/csit/tests/optf-has/has/data/plan_with_hpa.json (limited to 'test/csit/tests/optf-has/has/data/plan_with_hpa.json') diff --git a/test/csit/tests/optf-has/has/data/plan_with_hpa.json b/test/csit/tests/optf-has/has/data/plan_with_hpa.json deleted file mode 100644 index 21985776b..000000000 --- a/test/csit/tests/optf-has/has/data/plan_with_hpa.json +++ /dev/null @@ -1,260 +0,0 @@ -{ - "name":"vCPE-with-HPA", - "template":{ - "homing_template_version":"2017-10-10", - "parameters":{ - "service_name":"Residential vCPE", - "service_id":"vcpe_service_id", - "customer_lat":45.395968, - "customer_long":-71.135344, - "REQUIRED_MEM":4, - "REQUIRED_DISK":100, - "pnf_id":"some_pnf_id" - }, - "locations":{ - "customer_loc":{ - "latitude":{ - "get_param":"customer_lat" - }, - "longitude":{ - "get_param":"customer_long" - } - } - }, - "demands":{ - "vG":[ - { - "inventory_provider":"aai", - "inventory_type":"cloud" - } - ] - }, - "constraints":{ - "constraint_vg_customer":{ - "type":"distance_to_location", - "demands":[ - "vG" - ], - "properties":{ - "distance":"< 100 km", - "location":"customer_loc" - } - }, - "hpa_constraint":{ - "type":"hpa", - "demands":[ - "vG" - ], - "properties":{ - "evaluate":[ - { - "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": "False", - "score": "5", - "directives": [], - "hpa-feature-attributes":[ - { - "hpa-attribute-key":"numVirtualCpu", - "hpa-attribute-value":"4", - "operator":">=" - }, - { - "hpa-attribute-key":"virtualMemSize", - "hpa-attribute-value":"4", - "operator":">=", - "unit":"GB" - } - ] - }, - { - "hpa-feature":"numa", - "hpa-version":"v1", - "architecture":"generic", - "mandatory": "False", - "score": "5", - "directives": [], - "hpa-feature-attributes":[ - { - "hpa-attribute-key":"numaNodes", - "hpa-attribute-value":"2", - "operator":"=" - }, - { - "hpa-attribute-key":"numaCpu-0", - "hpa-attribute-value":"2", - "operator":"=" - }, - { - "hpa-attribute-key":"numaCpu-1", - "hpa-attribute-value":"4", - "operator":"=" - }, - { - "hpa-attribute-key":"numaMem-0", - "hpa-attribute-value":"2", - "operator":"=", - "unit":"GB" - }, - { - "hpa-attribute-key":"numaMem-1", - "hpa-attribute-value":"4", - "operator":"=", - "unit":"GB" - } - ] - }, - { - "hpa-feature":"cpuPinning", - "hpa-version":"v1", - "architecture":"generic", - "mandatory": "False", - "score": "5", - "directives": [], - "hpa-feature-attributes":[ - { - "hpa-attribute-key":"logicalCpuThreadPinningPolicy", - "hpa-attribute-value":"prefer", - "operator":"=" - }, - { - "hpa-attribute-key":"logicalCpuPinningPolicy", - "hpa-attribute-value":"dedicated", - "operator":"=" - } - ] - } - ] - }, - { - "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": "False", - "score": "5", - "directives":[], - "hpa-feature-attributes":[ - { - "hpa-attribute-key":"numVirtualCpu", - "hpa-attribute-value":"8", - "operator":">=" - }, - { - "hpa-attribute-key":"virtualMemSize", - "hpa-attribute-value":"16", - "operator":">=", - "unit":"GB" - } - ] - }, - { - "hpa-feature":"numa", - "hpa-version":"v1", - "architecture":"generic", - "mandatory": "False", - "score": "5", - "directives":[], - "hpa-feature-attributes":[ - { - "hpa-attribute-key":"numaNodes", - "hpa-attribute-value":"2", - "operator":"=" - }, - { - "hpa-attribute-key":"numaCpu-0", - "hpa-attribute-value":"2", - "operator":"=" - }, - { - "hpa-attribute-key":"numaCpu-1", - "hpa-attribute-value":"4", - "operator":"=" - }, - { - "hpa-attribute-key":"numaMem-0", - "hpa-attribute-value":"2", - "operator":"=", - "unit":"GB" - }, - { - "hpa-attribute-key":"numaMem-1", - "hpa-attribute-value":"4", - "operator":"=", - "unit":"GB" - } - ] - }, - { - "hpa-feature":"ovsDpdk", - "hpa-version":"v1", - "architecture":"generic", - "mandatory": "False", - "score": "5", - "directives":[], - "hpa-feature-attributes":[ - { - "hpa-attribute-key":"dataProcessingAccelerationLibrary", - "hpa-attribute-value":"v18.02", - "operator":"=" - } - ] - } - ] - } - ] - } - } - }, - "optimization":{ - "minimize":{ - "sum":[ - { - "distance_between":[ - "customer_loc", - "vG" - ] - }, - { - "distance_between":[ - "customer_loc", - "vG" - ] - } - ] - } - } - }, - "timeout":5, - "limit":3 -} -- cgit 1.2.3-korg