Dotnet perf (#111)

* Changed to perf scripts and data

Signed-off-by: Joe Batt <[email protected]>

* Changed to perf scripts and data

Signed-off-by: Joe Batt <[email protected]>

Signed-off-by: Joe Batt <[email protected]>

Author: JoeBatt1989

.gitignore

@@ -1,5 +1,3 @@
-*.dcm
-
 # Byte-compiled / optimized / DLL files
 __pycache__/
 *.py[cod]

performance-testing/README.md

@@ -169,11 +169,12 @@ cd performance-testing/k6
 ```
 
 ```bash
-k6 run -e CONFIG=config/benchmarkConfig.json -e URL={url} -e DICOM_MODALITY={modality} dicom/dicom_benchmark.js --insecure-skip-tls-verify
+k6 run -e CONFIG=config/benchmarkConfig.json -e URL={url} -e DICOM_MODALITY={modality} -e WF_AET={AET} dicom/dicom_benchmark.js --insecure-skip-tls-verify
 ```
 
 > **url** is to be replaced by dotnet-performance-app url
 > **modality** is to be replaced by either CT, RF, US or MR
+> **AET** is to be replaced by the Calling AET to be sent with the association. 1 triggers a workflow and 1 does not
 
 #### Investigating Metrics ####
 ##### MONAI Informatics Gateway #####
@@ -218,10 +219,11 @@ Average and Peak load times are displayed as below. These tests are most valuabl
 cd k6
 ```
 ```bash
-k6 run -e CONFIG=config/{config}.json URL={url} dicom/dicom_peak_avg.js --insecure-skip-tls-verify
+k6 run -e CONFIG=config/{config}.json -e URL={url} -e WF_AET={AET} -e NO_WF_AET{AET} dicom/dicom_peak_avg.js --insecure-skip-tls-verify
 ```
 > **url** is to be replaced by dotnet-performance-app url
 > **config** is to be replaced by either avgConfig.json or peakConfig.json
+> **AET** is to be replaced by the Calling AET to be sent with the association. 1 triggers a workflow and 1 does not
 
 #### Investigating Metrics ####
 ##### MONAI Informatics Gateway #####

performance-testing/dotnet-performance-app/Data/DICOM/CT/Study1/CT.1.2.840.113619.2.55.3.671756986.106.1316467036.362.1.dcm

@@ -1,8 +1,4 @@
 {
-    "remote_modalities":{
-        "workflow_AET": "PERFWF",
-        "no_workflow_AET": "PERFNOWF"
-    },
     "lowerThinkTime": 60,
     "upperThinkTime": 120,
     "ct": {

performance-testing/dotnet-performance-app/Data/DICOM/MR/Study1/MR000000.dcm

@@ -1,8 +1,4 @@
 {
-    "remote_modalities":{
-        "workflow_AET": "PERFWF",
-        "no_workflow_AET": "PERFNOWF"
-    },
     "benchmark": {
         "vus": 1,
         "iterations": 5,

performance-testing/dotnet-performance-app/Data/DICOM/RF/Study1/RF000000.dcm

@@ -1,8 +1,4 @@
 {
-    "orthanc":{
-        "workflow_modality": "monai",
-        "no_workflow_modality": "monai_none"
-    },
     "lowerThinkTime": 60,
     "upperThinkTime": 120,
     "ct": {

performance-testing/dotnet-performance-app/Data/DICOM/RF/Study2/RF000000.dcm

@@ -14,7 +14,7 @@ let config = getconfig();
 
 const url = __ENV.URL;
 const dicom_modality = __ENV.DICOM_MODALITY
-const workflow_AET = config.remote_modalities.workflow_AET;
+const workflow_AET = __ENV.WF_AET;
 
 export const options = {
   scenarios: {
@@ -29,9 +29,12 @@ export const options = {
 };
 
 export function benchmark_workflow() {
+  let res = http.get(`${url}/dicom?modality=${dicom_modality}&CalledAET=${workflow_AET}&CallingAET=${workflow_AET}`, { tags: { my_custom_tag: 'benchmark_workflow' } })
 
-  let res = http.get(`${url}/dicom?modality=${dicom_modality}&CalledAET=${workflow_AET}`, { tags: { my_custom_tag: 'benchmark_workflow' } })
-
+  if(res.status != 200){
+    console.log(`status = ${res.status} and body = ${res.body}`)
+  }
+  
   check(res, {
     'is status 200': (r) => r.status === 200
   })

performance-testing/dotnet-performance-app/Data/DICOM/RF/Study3/RF000000.dcm

@@ -14,8 +14,8 @@ function getconfig() {
 let config = getconfig();
 
 const url = __ENV.URL;
-const workflow_AET = config.remote_modalities.workflow_AET;
-const no_workflow_AET = config.remote_modalities.no_workflow_AET;
+const workflow_AET = __ENV.WF_AET;
+const no_workflow_AET = __ENV.NO_WF_AET;
 const lowerThinkTime = config.lowerThinkTime;
 const upperThinkTime = config.upperThinkTime;
 const ct_pacing = config.ct.pacing;
@@ -87,7 +87,7 @@ export const options = {
 export function ct_workflow() {
   var startTime = Date.now();
   sleep(randomIntBetween(lowerThinkTime, upperThinkTime)); // think time
-  let res = http.get(`${url}/dicom?modality=CT&CalledAET=${workflow_AET}`, { tags: { my_custom_tag: 'ct_workflow' } })
+  let res = http.get(`${url}/dicom?modality=CT&CalledAET=${workflow_AET}&CallingAET=${workflow_AET}`, { tags: { my_custom_tag: 'ct_workflow' } })
   check(res, {
     'is status 200': (r) => r.status === 200
   })
@@ -97,7 +97,7 @@ export function ct_workflow() {
 export function ct_no_workflow() {
   var startTime = Date.now();
   sleep(randomIntBetween(lowerThinkTime, upperThinkTime)); // think time
-  let res = http.get(`${url}/dicom?modality=CT&CalledAET=${no_workflow_AET}`, { tags: { my_custom_tag: 'ct_no_workflow' } })
+  let res = http.get(`${url}/dicom?modality=CT&CalledAET=${no_workflow_AET}&CallingAET=${no_workflow_AET}`, { tags: { my_custom_tag: 'ct_no_workflow' } })
   check(res, {
     'is status 200': (r) => r.status === 200
   })
@@ -107,7 +107,7 @@ export function ct_no_workflow() {
 export function mr_workflow() {
   var startTime = Date.now();
   sleep(randomIntBetween(lowerThinkTime, upperThinkTime)); // think time
-  let res = http.get(`${url}/dicom?modality=MR&CalledAET=${workflow_AET}`, { tags: { my_custom_tag: 'mr_workflow' } })
+  let res = http.get(`${url}/dicom?modality=MR&CalledAET=${workflow_AET}&CallingAET=${workflow_AET}`, { tags: { my_custom_tag: 'mr_workflow' } })
   check(res, {
     'is status 200': (r) => r.status === 200
   })
@@ -117,7 +117,7 @@ export function mr_workflow() {
 export function mr_no_workflow() {
   var startTime = Date.now();
   sleep(randomIntBetween(lowerThinkTime, upperThinkTime)); // think time
-  let res = http.get(`${url}/dicom?modality=MR&CalledAET=${no_workflow_AET}`, { tags: { my_custom_tag: 'mr_no_workflow' } })
+  let res = http.get(`${url}/dicom?modality=MR&CalledAET=${no_workflow_AET}&CallingAET=${no_workflow_AET}`, { tags: { my_custom_tag: 'mr_no_workflow' } })
   check(res, {
     'is status 200': (r) => r.status === 200
   })
@@ -127,7 +127,7 @@ export function mr_no_workflow() {
 export function us_workflow() {
   var startTime = Date.now();
   sleep(randomIntBetween(lowerThinkTime, upperThinkTime)); // think time
-  let res = http.get(`${url}/dicom?modality=US&CalledAET=${workflow_AET}`, { tags: { my_custom_tag: 'us_workflow' } })
+  let res = http.get(`${url}/dicom?modality=US&CalledAET=${workflow_AET}&CallingAET=${workflow_AET}`, { tags: { my_custom_tag: 'us_workflow' } })
   check(res, {
     'is status 200': (r) => r.status === 200
   })
@@ -137,7 +137,7 @@ export function us_workflow() {
 export function us_no_workflow() {
   var startTime = Date.now();
   sleep(randomIntBetween(lowerThinkTime, upperThinkTime)); // think time
-  let res = http.get(`${url}/dicom?modality=US&CalledAET=${no_workflow_AET}`, { tags: { my_custom_tag: 'us_no_workflow' } })
+  let res = http.get(`${url}/dicom?modality=US&CalledAET=${no_workflow_AET}&CallingAET=${no_workflow_AET}`, { tags: { my_custom_tag: 'us_no_workflow' } })
   check(res, {
     'is status 200': (r) => r.status === 200
   })
@@ -147,7 +147,7 @@ export function us_no_workflow() {
 export function rf_workflow() {
   var startTime = Date.now();
   sleep(randomIntBetween(lowerThinkTime, upperThinkTime)); // think time
-  let res = http.get(`${url}/dicom?modality=RF&CalledAET=${workflow_AET}`, { tags: { my_custom_tag: 'rf_workflow' } })
+  let res = http.get(`${url}/dicom?modality=RF&CalledAET=${workflow_AET}&CallingAET=${workflow_AET}`, { tags: { my_custom_tag: 'rf_workflow' } })
   check(res, {
     'is status 200': (r) => r.status === 200
   })
@@ -157,7 +157,7 @@ export function rf_workflow() {
 export function rf_no_workflow() {
   var startTime = Date.now();
   sleep(randomIntBetween(lowerThinkTime, upperThinkTime)); // think time
-  let res = http.get(`${url}/dicom?modality=RF&CalledAET=${no_workflow_AET}`, { tags: { my_custom_tag: 'rf_no_workflow' } })
+  let res = http.get(`${url}/dicom?modality=RF&CalledAET=${no_workflow_AET}&CallingAET=${no_workflow_AET}`, { tags: { my_custom_tag: 'rf_no_workflow' } })
   check(res, {
     'is status 200': (r) => r.status === 200
   })