-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Rename mila_account_username as mila_cluster_username
- Loading branch information
Showing
24 changed files
with
76 additions
and
76 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -328,7 +328,7 @@ def get_available_clusters_from_user_dict(D_user): | |
"mila_email_username": "[email protected]", | ||
"status": "enabled", | ||
"clockwork_api_key": "000aaa00", | ||
"mila_account_username": "milauser00", | ||
"mila_cluster_username": "milauser00", | ||
"cc_account_username": "ccuser00", | ||
"cc_account_update_key": null, | ||
"web_settings": { | ||
|
@@ -338,19 +338,19 @@ def get_available_clusters_from_user_dict(D_user): | |
} | ||
} | ||
In this example, the fields we are interested in are the "mila_account_username" | ||
In this example, the fields we are interested in are the "mila_cluster_username" | ||
and the "cc_account_username". They are referred in the account fields (one | ||
of the two input sources mentioned previously). The latter is as follows: | ||
{ | ||
"cc_account_username": ["beluga", "cedar", "graham", "narval"], | ||
"mila_account_username": ["mila"], | ||
"mila_cluster_username": ["mila"], | ||
"test_cluster_username": ["test_cluster"] | ||
} | ||
and is built from the cluster data provided by the configuration file. | ||
Considering this example, the user "[email protected]" has access to the clusters: | ||
"beluga", "cedar", "graham" and "narval" because of its field "cc_account_username", | ||
and "mila" through the "mila_account_username". However, it does not have access to | ||
and "mila" through the "mila_cluster_username". However, it does not have access to | ||
the cluster "test_cluster" because its user dictionary does not contain a field | ||
"test_cluster_username". | ||
|
@@ -393,7 +393,7 @@ def get_available_clusters_from_db(mila_email_username): | |
"mila_email_username": "[email protected]", | ||
"status": "enabled", | ||
"clockwork_api_key": "000aaa00", | ||
"mila_account_username": "milauser00", | ||
"mila_cluster_username": "milauser00", | ||
"cc_account_username": "ccuser00", | ||
"cc_account_update_key": null, | ||
"web_settings": { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1232,7 +1232,7 @@ def test_get_users_one_known_user(app, fake_data): | |
"mila_email_username": "[email protected]", | ||
"status": "enabled", | ||
"clockwork_api_key": "000aaa01", | ||
"mila_account_username": "milauser1", | ||
"mila_cluster_username": "milauser1", | ||
"cc_account_username": "ccuser1", | ||
"cc_account_update_key": None, | ||
"web_settings": {"nbr_items_per_page": 40, "dark_mode": False}, | ||
|
@@ -1247,7 +1247,7 @@ def test_get_users_one_known_user(app, fake_data): | |
"mila_email_username": "[email protected]", | ||
"status": "enabled", | ||
"clockwork_api_key": "000aaa01", | ||
"mila_account_username": "milauser1", | ||
"mila_cluster_username": "milauser1", | ||
"cc_account_username": None, | ||
"cc_account_update_key": None, | ||
"web_settings": {"nbr_items_per_page": 40, "dark_mode": False}, | ||
|
@@ -1263,7 +1263,7 @@ def test_get_users_one_known_user(app, fake_data): | |
"mila_email_username": "[email protected]", | ||
"status": "enabled", | ||
"clockwork_api_key": "000aaa01", | ||
"mila_account_username": None, | ||
"mila_cluster_username": None, | ||
"cc_account_username": "ccuser1", | ||
"cc_account_update_key": None, | ||
"web_settings": {"nbr_items_per_page": 40, "dark_mode": False}, | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,7 @@ | |
"status": "enabled", | ||
"clockwork_api_key": "000aaa" | ||
"cc_account_username": "ccuser040", | ||
"mila_account_username": milauser040", | ||
"mila_cluster_username": milauser040", | ||
"cc_account_update_key": None | ||
}, | ||
{ ... }, | ||
|
@@ -57,7 +57,7 @@ def gen_single_user(n): | |
"mila_email_username": "student%[email protected]" % n, | ||
"status": status, | ||
"clockwork_api_key": "000aaa%0.2d" % n, | ||
"mila_account_username": "milauser%0.2d" % n, | ||
"mila_cluster_username": "milauser%0.2d" % n, | ||
"cc_account_username": cc_account_username, | ||
"_extra": { | ||
"mila": { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.