Skip to content

Commit 1eab5bf

Browse files
authored
updating the dev guide so it works (#1004)
Signed-off-by: Neil South <[email protected]>
1 parent f7f05ca commit 1eab5bf

File tree

4 files changed

+48
-29
lines changed

4 files changed

+48
-29
lines changed

guidelines/mwm-developer-setup.md

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
- python 3 installed.
2222
- Helm 3 https://helm.sh/docs/intro/install/
2323
- rabbitmqadmin https://www.rabbitmq.com/management-cli.html
24-
- mc.exe https://github.com/minio/mc install and add its location to the storage_settings_executableLocation setting (appsettings.local.json) including the name itself ! ie `mc.exe` if its in the folder of the running executable (\bin\Debug\net8.0).
24+
- mc.exe https://github.com/minio/mc install and add its location to the storage_settings_executableLocation setting (appsettings.local.json) including the name itself ! ie `mc.exe` if its in the folder of the running executable (\bin\Debug\net8.0). (for TaskManager)
2525

2626
Note. if you already have docker container for Minio Rabbit etc running Stop these.
2727

@@ -44,6 +44,7 @@ To disable argo authentication run
4444
]}]'
4545

4646
Note. below Im using bash as its my preferred option, But if you to are using bash and your on windows (wsl2) you MUST make sure you windows .kube/config is also pointing to the same K8's cluster, this is because the code running in vs will look in there for the context to write k8's secrets too!
47+
you can do this by coping the relevent sections from ~/.kube/config to C:\Users\yourname\.kube\config
4748

4849
now in a bash window (can be cmd or powershell)
4950

@@ -73,6 +74,21 @@ from a bash terminal in the root folder of the project
7374
- `helm upgrade -i -n argo -f deploy/helm/rabbitmq-local.yaml rabbit deploy/helm`
7475

7576
### running in VisualStudio
77+
---
78+
### NEW
79+
------
80+
You must now also run Informaticsgateway (mig), this is a separate project and is required for the workflow to validate and run.
81+
82+
### create an AETitle in the mig
83+
below assumes you are running mig on port 5010.
84+
```
85+
curl -X POST 'http://localhost:5010/config/destination' -H 'Content-Type: application/json' -d '{"name": "MY_SCANNER", "hostIp": "127.0.0.1", "port": 10, "aeTitle": "MY_SCANNER"}'
86+
87+
```
88+
89+
90+
----
91+
7692
Now assuming your launchSettings in workflow manager has the line
7793
`"ASPNETCORE_ENVIRONMENT": "Local"`
7894
AND in taskManager has the line
@@ -181,7 +197,7 @@ You can use Mongo Compass, with connection string `mongodb://root:rootpassword@l
181197
### now we need an argo template to run.
182198
navigate to [https://localhost:2746/workflow-templates?namespace=argo](https://localhost:2746/workflow-templates?namespace=argo) proceed passed the warnings about been insecure. (Chrome, click advance and then proceed to destination)
183199
click on `CREATE NEW WORKFLOW TEMPLATE` button top left.
184-
set the name to `name: simple-workflow` so it matches the workflow we posted above.
200+
set the name to `name: simple-workflow` and its namespace to `namespace: argo` so it matches the workflow we posted above.
185201
then click the `Create` button.
186202
switch the tab back to [workflows](https://localhost:2746/workflows?limit=50) in the left menu
187203

@@ -190,7 +206,7 @@ switch the tab back to [workflows](https://localhost:2746/workflows?limit=50) in
190206

191207
In the command below replace xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx with the new workflowId from above ie. `9235f5e8-9ad2-44d2-8b41-2c1e4d2464c6`
192208

193-
```rabbitmqadmin -u admin -p admin -P 30672 -V monaideploy publish exchange=monaideploy routing_key=md.workflow.request properties="{\"app_id\": \"16988a78-87b5-4168-a5c3-2cfc2bab8e54\",\"type\": \"WorkflowRequestMessage\",\"message_id\": \"0277e763-316c-4104-aeda-3620e7a642c7\",\"correlation_id\":\"ab482a7c-4da7-4e76-8d36-d194dd35555e\",\"content_type\": \"application/json\"}" payload="{\"payload_id\":\"00000000-1000-0000-0000-000000000000\",\"workflows\":[\"xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx\"],\"file_count\":0,\"correlation_id\":\"e4b06f00-5ce3-4477-86cb-4f3bf20680c2\",\"bucket\":\"bucket1\",\"calling_aetitle\":\"MWM\",\"called_aetitle\":\"Basic_AE_3\",\"timestamp\":\"2022-07-13T11:34:34.8428704+01:00\"}"```
209+
```rabbitmqadmin -u admin -p admin -P 30672 -V monaideploy publish exchange=monaideploy routing_key=md.workflow.request properties="{\"app_id\": \"16988a78-87b5-4168-a5c3-2cfc2bab8e54\",\"type\": \"WorkflowRequestMessage\",\"message_id\": \"0277e763-316c-4104-aeda-3620e7a642c7\",\"correlation_id\":\"ab482a7c-4da7-4e76-8d36-d194dd35555e\",\"content_type\": \"application/json\"}" payload="{\"payload_id\":\"00000000-1000-0000-0000-000000000000\",\"workflows\":[\"xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx\"],\"trigger\":{\"source\":\"MY_SCANNER\",\"destination\":\"PROD_PACS\"},\"file_count\":0,\"correlation_id\":\"e4b06f00-5ce3-4477-86cb-4f3bf20680c2\",\"bucket\":\"bucket1\",\"calling_aetitle\":\"MWM\",\"called_aetitle\":\"Basic_AE_3\",\"timestamp\":\"2022-07-13T11:34:34.8428704+01:00\"}"```
194210

195211
paste the above (with the proper workflowId) into bash and press enter.
196212

src/TaskManager/TaskManager/appsettings.Local.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"WorkloadManagerDatabase": {
3-
"ConnectionString": "mongodb://root:rootpassword@localhost:27017",
3+
"ConnectionString": "mongodb://root:rootpassword@localhost:30017",
44
"DatabaseName": "WorkloadManager"
55
},
66
"WorkflowManager": {
@@ -43,7 +43,7 @@
4343
"endpoint": "localhost",
4444
"username": "admin",
4545
"password": "admin",
46-
"port": "5672",
46+
"port": "30072",
4747
"virtualHost": "monaideploy",
4848
"exchange": "monaideploy",
4949
"deadLetterExchange": "monaideploy-dead-letter",
@@ -55,7 +55,7 @@
5555
"endpoint": "localhost",
5656
"username": "admin",
5757
"password": "admin",
58-
"port": "5672",
58+
"port": "30072",
5959
"virtualHost": "monaideploy",
6060
"exchange": "monaideploy",
6161
"exportRequestQueue": "export_tasks"

src/WorkflowManager/WorkflowManager/appsettings.Local.json

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"WorkloadManagerDatabase": {
3-
"ConnectionString": "mongodb://root:rootpassword@localhost:27017",
3+
"ConnectionString": "mongodb://root:rootpassword@localhost:30017",
44
"DatabaseName": "WorkloadManager"
55
},
66
"MonaiDeployAuthentication": {
@@ -100,7 +100,7 @@
100100
"migExternalAppPlugins2": [
101101
"Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution.DicomDeidentifier, Monai.Deploy.InformaticsGateway.PlugIns.RemoteAppExecution, Version=0.0.0.0"
102102
],
103-
"migExternalAppPlugins": [""],
103+
"migExternalAppPlugins": [ "" ],
104104
"InformaticsGateway": {
105105
"apiHost": "http://localhost:5010",
106106
"username": "aide",
@@ -117,5 +117,10 @@
117117
"LogHttpResponseBody": true
118118
},
119119
"AllowedHosts": "*"
120+
},
121+
"InformaticsGateway": {
122+
"apiHost": "http://localhost:5010",
123+
"username": "",
124+
"password": ""
120125
}
121126
}

tests/UnitTests/WorkflowManager.Tests/packages.lock.json

100644100755
Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@
4848
},
4949
"xunit": {
5050
"type": "Direct",
51-
"requested": "[2.6.5, )",
52-
"resolved": "2.6.5",
53-
"contentHash": "iPSL63kw21BdSsdA79bvbVNvyn17DWI4D6VbgNxYtvzgViKrmbRLr8sWPxSlc4AvnofEuFfAi/rrLSzSRomwCg==",
51+
"requested": "[2.7.0, )",
52+
"resolved": "2.7.0",
53+
"contentHash": "KcCI5zxh8zbUfQTeErc4oT7YokViVND2V0p4vDJ2VD4lhF9V5qCYMMDNixme7FdwYy3SwPHF+2xC2Dq4Z9GSlA==",
5454
"dependencies": {
55-
"xunit.analyzers": "1.9.0",
56-
"xunit.assert": "2.6.5",
57-
"xunit.core": "[2.6.5]"
55+
"xunit.analyzers": "1.11.0",
56+
"xunit.assert": "2.7.0",
57+
"xunit.core": "[2.7.0]"
5858
}
5959
},
6060
"xunit.runner.visualstudio": {
@@ -1876,39 +1876,37 @@
18761876
},
18771877
"xunit.analyzers": {
18781878
"type": "Transitive",
1879-
"resolved": "1.9.0",
1880-
"contentHash": "02ucFDty6Y9BBT5c35YueFfbM3uEzeFdRvlNtAPhZVUkGUlhl3jsV2XesgTj986/PZXIjpVoc2D8ee6p1ha/Fw=="
1879+
"resolved": "1.11.0",
1880+
"contentHash": "SCv+Ihxv+fCqotGeM8sVwLhw8nzAJ2aFRN5lcoKn9QtGdbVJ79JqDc+4u8/Ddnp2udxtmv+xYFWkHNlb/sk01w=="
18811881
},
18821882
"xunit.assert": {
18831883
"type": "Transitive",
1884-
"resolved": "2.6.5",
1885-
"contentHash": "gb5uv7vjBFz7nhEa6aXK5sVJwsG/88xf8DN5wqK0ejCDsDybqICyNJIj+eoD43xbmdPZryNDPpeWDCfiKI/bnA=="
1884+
"resolved": "2.7.0",
1885+
"contentHash": "CCTs3bUhmIS4tDwK6Cn/IiabG3RhYzdf65eIkO7u9/grKoN9MrN780LzVED3E8v+vwmmj7b5TW3/GFuZHPAzWA=="
18861886
},
18871887
"xunit.core": {
18881888
"type": "Transitive",
1889-
"resolved": "2.6.5",
1890-
"contentHash": "hpdMnSNlx4ejaxpaIAFaqHt4q9ZCnzZLnURrSa5CzYXxHhIQbV8/0yXLjRdublhreonGXVMmsQ1KHlS9WbfpCw==",
1889+
"resolved": "2.7.0",
1890+
"contentHash": "98tzqYAbtc/p/2Ba455XTNbD12Qoo8kPehjC4oDT46CAsLli5JOCU9hFF2MV3HHWMw/Y3yFUV2Vcukplbs6kuA==",
18911891
"dependencies": {
1892-
"xunit.extensibility.core": "[2.6.5]",
1893-
"xunit.extensibility.execution": "[2.6.5]"
1892+
"xunit.extensibility.core": "[2.7.0]",
1893+
"xunit.extensibility.execution": "[2.7.0]"
18941894
}
18951895
},
18961896
"xunit.extensibility.core": {
18971897
"type": "Transitive",
1898-
"resolved": "2.6.5",
1899-
"contentHash": "dSGRkVxzH27XaL83+Z9kNPllqgsmsiPayXw+0weCGsrZQxfSCBNNkSb9nYUpkVoEBCUviXOmo1tfApqhgqTjog==",
1898+
"resolved": "2.7.0",
1899+
"contentHash": "JLnx4PI0vn1Xr1Ust6ydrp2t/ktm2dyGPAVoDJV5gQuvBMSbd2K7WGzODa2ttiz030CeQ8nbsXl05+cvf7QNyA==",
19001900
"dependencies": {
1901-
"NETStandard.Library": "1.6.1",
19021901
"xunit.abstractions": "2.0.3"
19031902
}
19041903
},
19051904
"xunit.extensibility.execution": {
19061905
"type": "Transitive",
1907-
"resolved": "2.6.5",
1908-
"contentHash": "jUMr88e0lSqDq8Vut0XVqx7plFg91QsKW/rX6gaVnJL6Z19LmNSDmyqd7cg6HQGfboAmyoFZyydA4Kcgouu1BA==",
1906+
"resolved": "2.7.0",
1907+
"contentHash": "bjY+crT1jOyxKagFjCMdEVzoenO2v66ru8+CK/0UaXvyG4U9Q3UTieJkbQXbi7/1yZIK1sGh01l5/jh2CwLJtQ==",
19091908
"dependencies": {
1910-
"NETStandard.Library": "1.6.1",
1911-
"xunit.extensibility.core": "[2.6.5]"
1909+
"xunit.extensibility.core": "[2.7.0]"
19121910
}
19131911
},
19141912
"ZstdSharp.Port": {

0 commit comments

Comments
 (0)