Support cluster list at the organization level. (#1266)

Co-authored-by: Alexandra Belousov <sashabelousovrh@Alexandras-MacBook-Pro.local>

runhouse/resources/hardware/cluster.py

@@ -1955,7 +1955,7 @@ def _folder_mv(
     def _folder_exists(self, path: Union[str, Path]):
         return self.client.folder_exists(path=path)
 
-    ###############################
+
     # Cluster list
     ###############################
     @classmethod
@@ -1984,7 +1984,13 @@ def list(
         )
 
         # get clusters from den
+<<<<<<< HEAD
         den_clusters_resp = get_clusters_from_den(cluster_filters=cluster_filters)
+=======
+        den_clusters_resp = Cluster.get_clusters_from_den(
+            cluster_filters=cluster_filters, den_folder=rns_client.username
+        )
+>>>>>>> 3345c808 (Support cluster list at the organization level. (#1266))
         if den_clusters_resp.status_code != 200:
             logger.error(f"Failed to load {rns_client.username}'s clusters from Den")
             den_clusters = []

runhouse/rns/rns_client.py

@@ -96,7 +96,11 @@ def token(self):
 
     @property
     def username(self):
-        return self._configs.get("username", None)
+        return self._configs.username or self._configs.get("username", None)
+
+    @username.setter
+    def username(self, value):
+        self._configs.username = value
 
     @property
     def api_server_url(self):