updates for orchestrator replacement of consul

Author: jpswinski

sliderule/sliderule.py

@@ -379,7 +379,7 @@ def set_url (urls):
                 server_url = "http://" + serv + ":9081"
                 server_table[server_url] = 0
         elif type(urls) == str: # IP address of sliderule's service discovery
-            service_url = "http://" + urls + ":8500/v1/catalog/service/srds?passing"
+            service_url = "http://" + urls + ":8050"
         else:
             raise TypeError('expected ip address or hostname as a string or list of strings')
     # then update server table
@@ -394,9 +394,9 @@ def update_available_servers ():
         if service_url != None:
             server_index = 0
             server_table = {}
-            services = requests.get(service_url, timeout=request_timeout).json()
-            for entry in services:
-                server_url = "http://" + entry["Address"] + ":" + str(entry["ServicePort"])
+            response = requests.get(service_url, data='{"service":"sliderule"}', timeout=request_timeout).json()
+            for entry in response['members']:
+                server_url = "http://" + entry + ":9081"
                 server_table[server_url] = 0
     return len(server_table)
 

utils/query_services.py

@@ -6,32 +6,6 @@
 import requests
 import json
 
-###############################################################################
-# APIs
-###############################################################################
-
-#
-#  QUERY SERVICES
-#
-def query_services (url, service, list_only=False, passing_only=False):
-
-    # Build Request String #
-    rqst_str = url + "/v1/catalog/service/" + service
-    if passing_only:
-        rqst_str += "?passing"
-
-    # Query Services #
-    services = requests.get(rqst_str).json()
-
-    # Pull Out IPs #
-    if list_only:
-        ip_list = []
-        for entry in services:
-            ip_list.append(entry["Address"])
-        services = ip_list
-
-    return services
-
 ###############################################################################
 # MAIN
 ###############################################################################
@@ -43,26 +17,14 @@ def query_services (url, service, list_only=False, passing_only=False):
     if len(sys.argv) > 1:
         ipaddr = sys.argv[1]
 
-    # Set Listing Options #
-    list_only = False
-    if len(sys.argv) > 2:
-        if sys.argv[2] == "List":
-            list_only = True
-
-    # Set Query Options #
-    passing_only = False
-    if len(sys.argv) > 3:
-        if sys.argv[3] == "Passing":
-            passing_only = True
-
     # Set Service #
-    service = "srds"
-    if len(sys.argv) > 4:
-        service = sys.argv[4]
+    service = "sliderule"
+    if len(sys.argv) > 2:
+        service = sys.argv[2]
 
     # Query Services #
-    services = query_services("http://"+ipaddr+":8500", service, list_only, passing_only)
+    response = requests.get("http://"+ipaddr+":8050", data='{"service":"%s"}'%(service)).json()
 
     # Display Services #
-    print(json.dumps(services, indent=2))
-    print("Number of Nodes: {}".format(len(services)))
+    print(json.dumps(response, indent=2))
+    print("Number of Nodes: {}".format(len(response['members'])))