added index for client_id & made sure client_id is used for /add_clie…

…nt as well

fedn/network/api/interface.py

@@ -554,7 +554,7 @@ def add_combiner(self, combiner_id, secure_grpc, address, remote_addr, fqdn, por
 
         return jsonify(payload)
 
-    def add_client(self, client_id, preferred_combiner, remote_addr):
+    def add_client(self, client_id, preferred_combiner, remote_addr, name):
         """Add a client to the network.
 
         :param client_id: The client id to add.
@@ -600,7 +600,8 @@ def add_client(self, client_id, preferred_combiner, remote_addr):
                 )
 
         client_config = {
-            "name": client_id,
+            "client_id": client_id,
+            "name": name,
             "combiner_preferred": preferred_combiner,
             "combiner": combiner.name,
             "ip": remote_addr,

fedn/network/api/network.py

@@ -113,10 +113,10 @@ def add_client(self, client):
         :type client: dict
         :return: None
         """
-        if self.get_client(client["name"]):
+        if self.get_client(client["client_id"]):
             return
 
-        logger.info("adding client {}".format(client["name"]))
+        logger.info("adding client {}".format(client["client_id"]))
         self.statestore.set_client(client)
 
     def get_client(self, name):

fedn/network/clients/connect.py

@@ -74,7 +74,7 @@ def assign(self):
         """
         try:
             retval = None
-            payload = {"client_id": self.name, "preferred_combiner": self.preferred_combiner}
+            payload = {"name": self.name, "client_id": self.id, "preferred_combiner": self.preferred_combiner}
             retval = requests.post(
                 self.connect_string + FEDN_CUSTOM_URL_PREFIX + "/add_client",
                 json=payload,

fedn/network/storage/statestore/mongostatestore.py

@@ -81,6 +81,7 @@ def connect(self):
 
     def init_index(self):
         self.package.create_index([("id", pymongo.DESCENDING)])
+        self.clients.create_index([("client_id", pymongo.DESCENDING)])
 
     def is_inited(self):
         """Check if the statestore is intialized.
@@ -726,18 +727,18 @@ def set_client(self, client_data):
         :return:
         """
         client_data["updated_at"] = str(datetime.now())
-        self.clients.update_one({"name": client_data["name"]}, {"$set": client_data}, True)
+        self.clients.update_one({"client_id": client_data["client_id"]}, {"$set": client_data}, True)
 
-    def get_client(self, name):
-        """Get client by name.
+    def get_client(self, client_id):
+        """Get client by client_id.
 
-        :param name: name of client to get.
-        :type name: str
+        :param client_id: client_id of client to get.
+        :type client_id: str
         :return: The client. None if not found.
         :rtype: ObjectId
         """
         try:
-            ret = self.clients.find({"key": name})
+            ret = self.clients.find({"key": client_id})
             if list(ret) == []:
                 return None
             else: