p17860254
/
monkey
forked from p15670423/monkey
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

BB quickfixes: fixed island client authentication bug ("JWT" -> "bearer" in auth header), improved readme a bit.

This commit is contained in:
VakarisZ 2020-07-30 12:41:25 +03:00
parent dc592c43fe
commit d9ed06d765
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
envs/monkey_zoo/blackbox/README.md
View File

@ -2,7 +2,8 @@
### Prerequisites ### Prerequisites
1. Download google sdk: https://cloud.google.com/sdk/docs/ 1. Download google sdk: https://cloud.google.com/sdk/docs/
2. Download service account key for MonkeyZoo project (if you deployed MonkeyZoo via terraform scripts then you already have it). 2. Download service account key for MonkeyZoo project (if you deployed MonkeyZoo via terraform scripts then you already have it).
GCP console -> IAM -> service accounts(you can use the same key used to authenticate terraform scripts) GCP console -> IAM -> service accounts(you can use the same key used to authenticate terraform scripts).
Place the key in `envs/monkey_zoo/gcp_keys/gcp_key.json`.
3. Deploy the relevant branch + complied executables to the Island machine on GCP. 3. Deploy the relevant branch + complied executables to the Island machine on GCP.
### Running the tests ### Running the tests
@ -21,8 +22,8 @@ Example run command:
`monkey\envs\monkey_zoo\blackbox>python -m pytest -s --island=35.207.152.72:5000 test_blackbox.py` `monkey\envs\monkey_zoo\blackbox>python -m pytest -s --island=35.207.152.72:5000 test_blackbox.py`
#### Running in PyCharm #### Running in PyCharm
Configure a PyTest configuration with the additional arguments `-s --island=35.207.152.72` on the Configure a PyTest configuration with the additional arguments `-s --island=35.207.152.72`, and to run from
`monkey\envs\monkey_zoo\blackbox`. directory `monkey\envs\monkey_zoo\blackbox`.
### Running telemetry performance test ### Running telemetry performance test

2
envs/monkey_zoo/blackbox/island_client/monkey_island_requests.py
View File

@ -104,4 +104,4 @@ class MonkeyIslandRequests(object):
@_Decorators.refresh_jwt_token @_Decorators.refresh_jwt_token
def get_jwt_header(self): def get_jwt_header(self):
return {"Authorization": "JWT " + self.token} return {"Authorization": "Bearer " + self.token}