Changes kops server to use ZMQ

dockerfiles/kops.dockerfile

@@ -22,6 +22,7 @@ USER root
 RUN apt-get update
 RUN apt-get install -y wget curl python3 python3-pip vim jq git
 RUN pip3 install awscli
+RUN pip3 install zmq
 
 # install kops
 RUN wget -O kops https://github.com/kubernetes/kops/releases/download/$(curl -s https://api.github.com/repos/kubernetes/kops/releases/latest | grep -Po '"tag_name": "\K.*?(?=")')/kops-linux-amd64

k8s/kops_server.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 #  Copyright 2018 U.C. Berkeley RISE Lab
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
@@ -12,67 +14,48 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-#!/usr/bin/env python3
-
-from http.server import HTTPServer, BaseHTTPRequestHandler
 import os
+import subprocess
 import logging
+import zmq
 
 logging.basicConfig(filename='log.txt',level=logging.INFO)
 
-class KopsHandler(BaseHTTPRequestHandler):
-    def do_POST(self):
-        if '/add/memory' in self.path:
-            num = list(filter(lambda a: a != '', self.path.split('/')))[-1]
-            print('Adding ' + num + 'new memory nodes...')
-            logging.info('Adding ' + num + ' new memory nodes...')
-            if os.system('./add_nodes.sh ' + num + ' 0 0 0') == 0:
-                self.send_response(200)
-                self.wfile.write(bytes('Successfully added ' + num + ' memory node.', 'utf-8'))
-            else:
-                self.send_response(500)
-                self.wfile.write(bytes('Unexpected error while adding nodes.', 'utf-8'))
-        elif '/add/ebs' in self.path:
-            num = list(filter(lambda a: a != '', self.path.split('/')))[-1]
-            print('Adding ' + num + 'new EBS nodes...')
-            logging.info('Adding ' + num + ' new EBS nodes...')
-            if os.system('./add_nodes.sh 0 ' + num + ' 0 0') == 0:
-                self.send_response(200)
-                self.wfile.write(bytes('Successfully added ' + num + ' EBS node.', 'utf-8'))
-            else:
-                self.send_response(500)
-                self.wfile.write(bytes('Unexpected error while adding nodes.', 'utf-8'))
-        elif '/remove/ebs' in self.path:
-            print('Removing an EBS node...')
-            logging.info('Removing an EBS node...')
-            nid = list(filter(lambda a: a != '', self.path.split('/')))[-1]
-            if os.system('./remove_node.sh e ' + nid) == 0:
-                self.send_response(200)
-                self.wfile.write(bytes('Successfully removed an EBS node.', 'utf-8'))
+def run():
+    context = zmq.Context(1)
+    request_pull_socket = context.socket(zmq.PULL)
+    request_pull_socket.bind('tcp://*:7000')
+
+    while True:
+        msg = request_pull_socket.recv_string()
+        args = msg.split(':')
+
+        if args[0] == 'add':
+            num = int(args[1])
+            ntype = args[2]
+            logging.info('Adding %d new %s nodes...' % (num, ntype))
+
+            if ntype == 'memory':
+                resp = os.system('./add_nodes.sh ' + str(num) + ' 0 0 0')
             else:
-                self.send_response(500)
-                self.wfile.write(bytes('Unexpected error while removing a node.', 'utf-8'))
-        elif '/remove/memory' in self.path:
-            print('Removing a memory node...')
-            logging.info('Removing a memory node...')
-            nid = list(filter(lambda a: a != '', self.path.split('/')))[-1]
-            if os.system('./remove_node.sh m ' + nid) == 0:
-                self.send_response(200)
-                self.wfile.write(bytes('Successfully removed a memory node.', 'utf-8'))
+                resp = os.system('./add_nodes.sh 0 ' + str(num) + ' 0 0')
+
+            if resp == 0:
+                logging.info('Successfully added %d %s nodes.' % (num, ntype))
             else:
-                self.send_response(500)
-                self.wfile.write(bytes('Unexpected error while removing a node.', 'utf-8'))
-        else:
-            self.send_response(404)
-            self.wfile.write(bytes('Invalid path: ' + self.path, 'utf-8'))
+                logging.error('Unexpected error while adding nodes.')
+        elif args[0] = 'remove':
+            ip = args[1]
+            ntype = args[2]
+            logging.info('Removing %s node with IP %s.' % (ntype, ip))
 
-def run():
-    print('starting server...')
+            resp = os.system('./remove_node.sh %s %s' % (ntype, ip))
+
+            if resp == 0:
+                logging.info('Successfully removed nodes %s.' % (ip))
+            else:
+                logging.error('Unexpected error while removing node %s.' % (ip))
 
-    server_address = ('', 80)
-    httpd = HTTPServer(server_address, KopsHandler)
-    print('running server...')
-    httpd.serve_forever()
 
 
 run()