Complete optf-has csit for M4

Issue-ID: OPTFRA-204

Change-Id: I09afb088c343699be78d2195638596ac09a0c875
Signed-off-by: Leonardo Bellini <leonardo.bellini@att.com>

4 files changed, 36 insertions, 107 deletions

diff --git a/test/csit/tests/optf-has/has/data/plan_with_long_distance_constraint.json b/test/csit/tests/optf-has/has/data/plan_with_long_distance_constraint.json
deleted file mode 100644
index 3e6d26791..000000000
--- a/test/csit/tests/optf-has/has/data/plan_with_long_distance_constraint.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-   "name":"onap template with short distance constraint",
-   "template":{
-      "homing_template_version":"2017-10-10",
-      "parameters":{
-         "service_name":"Residential vCPE",
-         "service_id":"vcpe_service_id",
-         "customer_lat":25.395968,
-         "customer_long":-51.135344,
-         "physical_location":"DLLSTX233",
-         "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":{
-         "distance-vg":{
-            "type":"distance_to_location",
-            "demands":[
-               "vG"
-            ],
-            "properties":{
-               "distance":"< 1 km",
-               "location":"customer_loc"
-            }
-         }
-      },
-      "optimization":{
-
-      }
-   }
-}
diff --git a/test/csit/tests/optf-has/has/data/plan_with_long_distance_constraint.json.service b/test/csit/tests/optf-has/has/data/plan_with_long_distance_constraint.json.service
deleted file mode 100644
index b0d6478fc..000000000
--- a/test/csit/tests/optf-has/has/data/plan_with_long_distance_constraint.json.service
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-   "name":"onap template with long distance constraint",
-   "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,
-         "physical_location":"DLLSTX233",
-         "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":"service",
-               "service_type": "VVIG", 
-               "customer_id": "21014aa2-526b-11e6-beb8-9e71128cae77"
-            }
-         ]
-      },
-      "constraints":{
-         "distance-vg":{
-            "type":"distance_to_location",
-            "demands":[
-               "vG"
-            ],
-            "properties":{
-               "distance":"> 100 km",
-               "location":"customer_loc"
-            }
-         }
-      },
-      "optimization":{
-
-      }
-   }
-}
diff --git a/test/csit/tests/optf-has/has/data/plan_with_short_distance_constraint.json b/test/csit/tests/optf-has/has/data/plan_with_short_distance_constraint.json
index 85a1a7387..68a7e119b 100644
--- a/test/csit/tests/optf-has/has/data/plan_with_short_distance_constraint.json
+++ b/test/csit/tests/optf-has/has/data/plan_with_short_distance_constraint.json
@@ -5,8 +5,8 @@
       "parameters":{
          "service_name":"Residential vCPE",
          "service_id":"vcpe_service_id",
-         "customer_lat":45.395968,
-         "customer_long":-71.135344,
+         "customer_lat":25.395968,
+         "customer_long":-51.135344,
          "physical_location":"DLLSTX233",
          "REQUIRED_MEM":4,
          "REQUIRED_DISK":100,
@@ -43,7 +43,22 @@
          }
       },
       "optimization":{
-
+    "minimize": {
+      "sum": [
+        {
+          "distance_between": [
+            "customer_loc",
+            "vG"
+          ]
+        },
+        {
+          "distance_between": [
+            "customer_loc",
+            "vG"
+          ]
+        }
+      ]
+    }
       }
    }
 }
diff --git a/test/csit/tests/optf-has/has/data/plan_with_long_distance_constraint.json.orig b/test/csit/tests/optf-has/has/data/plan_with_wrong_distance_constraint.json
index be410086c..9f25c2dff 100644
--- a/test/csit/tests/optf-has/has/data/plan_with_long_distance_constraint.json.orig
+++ b/test/csit/tests/optf-has/has/data/plan_with_wrong_distance_constraint.json
@@ -1,5 +1,5 @@
 {
-   "name":"onap template with long distance constraint",
+   "name":"onap template with wrong distance constraint",
    "template":{
       "homing_template_version":"2017-10-10",
       "parameters":{
@@ -32,18 +32,32 @@
       },
       "constraints":{
          "distance-vg":{
-            "type":"distance_to_location",
             "demands":[
                "vG"
             ],
             "properties":{
-               "distance":"> 100 km",
+               "distance":"< 1 km",
                "location":"customer_loc"
             }
          }
       },
       "optimization":{
-
+    "minimize": {
+      "sum": [
+        {
+          "distance_between": [
+            "customer_loc",
+            "vG"
+          ]
+        },
+        {
+          "distance_between": [
+            "customer_loc",
+            "vG"
+          ]
+        }
+      ]
+    }
       }
    }
 }