Fix OSDF input to HAS to use num_solution

[optf/osdf.git] / osdf / templates / conductor_interface.json

diff --git a/osdf/templates/conductor_interface.json b/osdf/templates/conductor_interface.json
index 64f9c4f..04ed29f 100755 (executable)
--- a/osdf/templates/conductor_interface.json
+++ b/osdf/templates/conductor_interface.json
@@ -1,41 +1,39 @@
-{\r
-  "name": "{{ name }}",\r
-  "files": {},\r
-  "timeout": {{ timeout }},\r
-  "limit": {{ limit }},\r
-  "template": {\r
-    "homing_template_version": "2017-10-10",\r
-    "parameters": {\r
-           "service_name": "{{ service_name }}",\r
-        "service_id": "{{ service_id }}",\r
-        "customer_lat": "{{ latitude }}",\r
-        "customer_long": "{{ longitude }}",\r
-        "REQUIRED_MEM": "{{ memory }}",\r
-        "REQUIRED_DISK": "{{ storage }}"\r
-    },\r
-    "locations": {\r
-        "customer_loc": {\r
-            "latitude": { "get_param": "customer_lat" },\r
-            "longitude": { "get_param": "customer_long" }\r
-        }\r
-    },\r
-    "demands": {{ json.dumps(demand_list) }},\r
-    {% set comma_main = joiner(",") %}\r
-    "constraints": {\r
-      {% set comma=joiner(",") %}\r
-      {% for elem in policy_groups %} {{ comma() }}\r
-        {% for key, value in elem.items() %}\r
-          "{{key}}": {{ json.dumps(value) }}\r
-        {% endfor %}\r
-      {% endfor %}\r
-    },\r
-    "optimization": {\r
-      {% set comma=joiner(",") %}\r
-      {% for elem in optimization_policies %} {{ comma() }}\r
-        {% for key, value in elem.items() %}\r
-          "{{key}}": {{ json.dumps(value) }}\r
-        {% endfor %}\r
-      {% endfor %}\r
-    }\r
-  }\r
-}
\ No newline at end of file
+{
+  "name": "{{ name }}",
+  "files": {},
+  "timeout": {{ timeout }},
+  "num_solution": {{ limit }},
+  "template": {
+    "homing_template_version": "2017-10-10",
+    "parameters": {
+      {% set comma=joiner(",") %}
+      {% for key, value in request_params.items() %} {{ comma() }}
+        "{{key}}": {{ json.dumps(value) }}
+      {% endfor %}
+    },
+    "locations": {
+        "customer_loc": {
+            "latitude": { "get_param": "customer_lat" },
+            "longitude": { "get_param": "customer_long" }
+        }
+    },
+    "demands": {{ json.dumps(demand_list) }},
+    {% set comma_main = joiner(",") %}
+    "constraints": {
+      {% set comma=joiner(",") %}
+      {% for elem in policy_groups %} {{ comma() }}
+        {% for key, value in elem.items() %}
+          "{{key}}": {{ json.dumps(value) }}
+        {% endfor %}
+      {% endfor %}
+    },
+    "optimization": {
+      {% set comma=joiner(",") %}
+      {% for elem in optimization_policies %} {{ comma() }}
+        {% for key, value in elem.items() %}
+          "{{key}}": {{ json.dumps(value) }}
+        {% endfor %}
+      {% endfor %}
+    }
+  }
+}