Remove UCVNA as its never used (#183)

Seems like orthanc is promiscuous so we don't need to add `UCVNA`
SAFEHR-data · Dec 14, 2023 · 09ac04d · 09ac04d
1 parent 08ac69c
commit 09ac04d
Show file tree

Hide file tree

Showing 8 changed files with 0 additions and 80 deletions.
diff --git a/.env.sample b/.env.sample
@@ -51,10 +51,6 @@ ENABLE_DICOM_WEB=true
 STUDY_TIME_OFFSET=
 SALT_VALUE=PIXL
 
-# UCVNA DICOM node information  
-VNA_AE_TITLE=
-VNA_DICOM_PORT=
-VNA_IP_ADDR=
 
 # UCVNAQR DICOM node information  
 VNAQR_AE_TITLE=

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -168,9 +168,6 @@ services:
       ORTHANC_RAW_AE_TITLE: ${ORTHANC_RAW_AE_TITLE}
       ORTHANC_AUTOROUTE_RAW_TO_ANON: ${ORTHANC_AUTOROUTE_RAW_TO_ANON}
       ORTHANC_RAW_MAXIMUM_STORAGE_SIZE: ${ORTHANC_RAW_MAXIMUM_STORAGE_SIZE}
-      VNA_AE_TITLE : ${VNA_AE_TITLE}
-      VNA_DICOM_PORT: ${VNA_DICOM_PORT}
-      VNA_IP_ADDR: ${VNA_IP_ADDR}
       VNAQR_AE_TITLE : ${VNAQR_AE_TITLE}
       VNAQR_DICOM_PORT: ${VNAQR_DICOM_PORT}
       VNAQR_IP_ADDR: ${VNAQR_IP_ADDR}

diff --git a/orthanc/orthanc-raw/README.md b/orthanc/orthanc-raw/README.md
@@ -43,11 +43,6 @@ ORTHANC_RAW_AE_TITLE=
 # PIXL Orthanc anon instance   
 ORTHANC_ANON_AE_TITLE=
 
-# UCVNA DICOM node information  
-VNA_AE_TITLE=
-VNA_DICOM_PORT=
-VNA_IP_ADDR=
-
 # UCVNAQR DICOM node information  
 VNAQR_AE_TITLE=
 VNAQR_DICOM_PORT=

diff --git a/orthanc/orthanc-raw/config/dicom.json b/orthanc/orthanc-raw/config/dicom.json
@@ -2,22 +2,6 @@
   "DicomAet" : "${ORTHANC_RAW_AE_TITLE}",
 
   "DicomModalities" : {
-    "UCVNA" : {
-      "AET" : "${VNA_AE_TITLE}",
-      "Port" : "${VNA_DICOM_PORT}",
-      "Host" : "${VNA_IP_ADDR}",
-      "Manufacturer" : "Generic",
-      "AllowEcho" : true,
-      "AllowFind" : false,
-      "AllowFindWorklist" : false,
-      "AllowGet"  : false,
-      "AllowMove" : false,
-      "AllowStore" : true,
-      "AllowStorageCommitment" : false,
-      "AllowTranscoding" : true,
-      "UseDicomTls" : false,
-      "Timeout" : 60
-    },
     "UCVNAQR" : {
       "AET" : "${VNAQR_AE_TITLE}",
       "Port" : "${VNAQR_DICOM_PORT}",

diff --git a/pixl_pacs/tests/docker-compose.yml b/pixl_pacs/tests/docker-compose.yml
@@ -15,7 +15,6 @@ version: "3.8"
 
 volumes:
   orthanc-raw-data:
-  vna-data:
   vna-qr-data:
 
 
@@ -33,8 +32,6 @@ services:
         condition: service_healthy
       orthanc-raw:
         condition: service_started
-      vna:
-        condition: service_started
     healthcheck:
       interval: 10s
       timeout: 30s
@@ -56,22 +53,6 @@ services:
     ports:
       - "9001:8000"
 
-  vna:
-    image: osimis/orthanc:22.9.0-full-stable
-    environment:
-      ORTHANC_NAME: "VNA"
-      ORTHANC_USERNAME: "orthanc"
-      ORTHANC_PASSWORD: "orthanc"
-      ORTHANC_AE_TITLE: "VNA"
-      RAW_AE_TITLE: "PIXLRAW"
-      RAW_DICOM_PORT: "4242"
-      RAW_IP_ADDR: "orthanc-raw"  # aka. hostname
-    ports:
-      - "4242:4242"
-      - "8042:8042"
-    volumes:
-      - ${PWD}/../../test/vna_config/:/run/secrets:ro
-
   vna-qr:
     image: osimis/orthanc:22.9.0-full-stable
     environment:
@@ -97,9 +78,6 @@ services:
       ORTHANC_USERNAME: "orthanc"
       ORTHANC_PASSWORD: "orthanc"
       ORTHANC_AE_TITLE: "PIXLRAW"
-      VNA_AE_TITLE : "VNA"
-      VNA_DICOM_PORT: "4242"
-      VNA_IP_ADDR: "vna"  # aka. hostname
       VNAQR_AE_TITLE : "VNAQR"
       VNAQR_DICOM_PORT: "4242"
       VNAQR_IP_ADDR: "vna-qr"

diff --git a/pixl_pacs/tests/orthanc_raw_config/dicom.json b/pixl_pacs/tests/orthanc_raw_config/dicom.json
@@ -3,12 +3,6 @@
   "DicomAlwaysAllowEcho" : true,
   "DicomCheckModalityHost" : true,
   "DicomModalities" : {
-    "UCVNA" : {
-      "AET" : "${VNA_AE_TITLE}",
-      "Port" : "${VNA_DICOM_PORT}",
-      "Host" : "${VNA_IP_ADDR}",
-      "Manufacturer" : "Generic"
-    },
     "UCVNAQR" : {
       "AET" : "${VNAQR_AE_TITLE}",
       "Port" : "${VNAQR_DICOM_PORT}",

diff --git a/test/.env.test.sample b/test/.env.test.sample
@@ -48,11 +48,6 @@ ENABLE_DICOM_WEB=true
 ORTHANC_AUTOROUTE_ANON_TO_AZURE=false
 PIXL_DICOM_TRANSFER_TIMEOUT=240
 
-# UCVNA DICOM node information
-VNA_AE_TITLE=VNA
-VNA_DICOM_PORT=4242
-VNA_IP_ADDR=vna
-
 # UCVNAQR DICOM node information
 VNAQR_AE_TITLE=VNAQR
 VNAQR_DICOM_PORT=4242

diff --git a/test/docker-compose.yml b/test/docker-compose.yml
@@ -14,32 +14,13 @@
 version: "3.8"
 
 volumes:
-  vna-data:
   vna-qr-data:
 
 networks:
   pixl-net:
 
 services:
 
-  vna:
-    image: osimis/orthanc:22.9.0-full-stable
-    environment:
-      ORTHANC_NAME: "VNA"
-      ORTHANC_USERNAME: "orthanc"
-      ORTHANC_PASSWORD: "orthanc"
-      ORTHANC_AE_TITLE: ${VNA_AE_TITLE}
-      RAW_AE_TITLE: ${ORTHANC_RAW_AE_TITLE}
-      RAW_DICOM_PORT: "4242"
-      RAW_IP_ADDR: "orthanc-raw"  # aka. hostname
-    ports:
-      - "4242:4242"
-      - "8042:8042"
-    volumes:
-      - ${PWD}/vna_config/:/run/secrets:ro
-    networks:
-      pixl-net:
-
   vna-qr:
     image: osimis/orthanc:22.9.0-full-stable
     environment: