_id from clients

Author: gferrate

client/app.py

@@ -42,7 +42,9 @@
 )
 
 client = Client(args.client_number, port, num_clients, args.split_type)
-state = State('client', client.client_id, port)
+
+# _id auto generated by State
+state = State('client', port, _id=None)
 
 app = Flask(__name__)
 

frontend/app.py

@@ -25,10 +25,6 @@ def check_clients_ok():
         else:
             client['check_ok'] = True
 
-def get_id(host, port):
-    return 'client_{}_{}'.format(host, port)
-
-
 @app.route('/')
 def index():
     check_clients_ok()
@@ -60,7 +56,7 @@ def fake_data():
         client = random.choice(client_types)
         status = random.choice(statuses)
         check_ok = random.choice([True, False])
-        _id = 'client_127.0.0.1_{}'.format(port)
+        _id = 'fake_client_{}'.format(port)
         data = {
             'client_type': client,
             '_id': _id,
@@ -87,7 +83,7 @@ def keep_alive():
     data = json.loads(request.data)
     host = request.remote_addr
     port = data['port']
-    _id = get_id(host, port)
+    _id = data['_id']
     if _id not in global_state['clients']:
         global_state['clients'][_id] = {
             'joined_at': datetime.now().strftime('%Y-%m-%d %H:%m'),
@@ -118,7 +114,7 @@ def get_state():
     host = request.remote_addr
     data = json.loads(request.data)
     port = data['port']
-    _id = get_id(host, port)
+    _id = data['_id']
     if _id not in global_state['clients']:
         global_state['clients'][_id] = {
             'joined_at': datetime.now().strftime('%Y-%m-%d %H:%m'),

main_server/app.py

@@ -33,7 +33,9 @@
 rsa = rsa_utils.RSAUtils()
 args = parser.parse_args()
 hosts = utils.read_hosts()
-state = State('main_server', 'client_{}'.format(args.port), args.port)
+
+# _id auto generated by State
+state = State('main_server', args.port, _id=None)
 
 app = Flask(__name__)
 

secure_aggregator/app.py

@@ -26,7 +26,9 @@
 
 use_cuda = True
 sec_agg = SecAgg(args.port, use_cuda)
-state = State('secure_aggregator', sec_agg.client_id, args.port)
+
+# _id auto generated by State
+state = State('secure_aggregator', args.port, _id=None)
 
 
 app = Flask(__name__)