Updated the conductor adaptor

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

diff --git a/osdf/templates/conductor_interface.json b/osdf/templates/conductor_interface.json
index 2b48647..ec01cc8 100755 (executable)
--- a/osdf/templates/conductor_interface.json
+++ b/osdf/templates/conductor_interface.json
@@ -4,52 +4,18 @@
   "timeout": {{ timeout }},\r
   "limit": {{ limit }},\r
   "template": {\r
-    "conductor_template_version": "2018-02-01",\r
+    "homing_template_version": "2018-02-01",\r
     "parameters": {\r
-           "REQUEST_TYPE": "{{ requestType }}",\r
-        "CHOSEN_REGION": "{{ chosenRegion }}",\r
-        "LATITUDE": "{{ latitude }}",\r
-        "LONGITUDE": "{{ longitude }}",\r
-        {% if serviceType == 'DHV' %}\r
-        "E2EVPNKEY": "{{ e2eVpnKey }}",\r
-        "UCPEHOST": "{{ ucpeHostName }}",\r
-        "EFFECTIVE_BANDWIDTH": "{{ effectiveBandwidth }}",\r
-        "WAN_PORT1_UP": "{{ ipsec_bw_up }}",\r
-        "WAN_PORT1_DOWN": "{{ ipsec_bw_down }}",\r
-        "WAN_PORT2_UP": "{{ ipsec2_bw_up }}",\r
-        "WAN_PORT2_DOWN": "{{ ipsec2_bw_down }}",\r
-        {% endif %}\r
-        {% if serviceType != 'DHV' %}\r
-        "GW_TENANT_ID": "{{ gwTenantId }}",\r
-        "PORTAL_TENANT_ID": "{{ portalTenantId }}",\r
-        {% endif %}\r
-        "CHOSEN_COMPLEX": "{{ chosenComplex }}",\r
-        {% if serviceType == 'ADIOD' or serviceType == 'VPE' %}\r
-        "BANDWIDTH": "{{ bandwidth }}",\r
-        "UNIT": "{{ bandwidth_unit }}",\r
-        {% endif %}\r
-        "SERVICE_INST": "{{ serviceInstance }}",\r
-       "PROV_STATUS": {{ json.dumps(provStatus) }}\r
+           "service_name": "{{ service_name }}",\r
+        "service_id": "{{ service_id }}",\r
+        "customer_lat": "{{ latitude }}",\r
+        "customer_long": "{{ longitude }}"\r
     },\r
     "locations": {\r
-        {% if serviceType == 'DHV' %}\r
         "customer_loc": {\r
-            "host_name": { "get_param": "UCPEHOST" }\r
+            "latitude": { "get_param": "customer_lat" },\r
+            "longitude": { "get_param": "customer_long" }\r
         }\r
-        {% elif serviceType == 'ADIOD' %}\r
-        "customer_pref_location": {\r
-            "clli_code": { "get_param": "CHOSEN_COMPLEX" }\r
-        }\r
-        {% elif serviceType == 'NETBOND' %}\r
-        "peering_point": {\r
-            "latitude": { "get_param": "LATITUDE" },\r
-            "longitude": { "get_param": "LONGITUDE" }\r
-        }\r
-        {% else %}\r
-        "customer_pref_loc": {\r
-            "clli_code": { "get_param": "CHOSEN_COMPLEX" }\r
-        }\r
-        {% endif %}\r
     },\r
     "demands": {{ json.dumps(demand_list) }},\r
     {% set comma_main = joiner(",") %}\r
@@ -61,14 +27,6 @@
         {% endfor %}\r
       {% endfor %}\r
     },\r
-    "reservation": {\r
-      {% set comma=joiner(",") %}\r
-      {% for elem in reservation_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