services/workflow/workflow/server.py

@@ -251,7 +251,9 @@ class WorkflowRequestRestService:
         file = lookup_file(request=self.request)
 
         # 2. create ingestion workflow request
-        ingest_type = "ingest_cal" if "calibration" in self.request.matchdict["name"] else "ingest"
+        ingest_type = (
+            "ingest_cal" if "calibration" in self.request.matchdict["name"] else "ingest_image"
+        )
         ingest_request = self.request.info.create_workflow_request(
             workflow=ingest_type,
             argument={"parent_wf_request_id": self.request.matchdict["request_id"]},

shared/workspaces/test/test_archive_service.py

@@ -74,7 +74,7 @@ class TestArchiveService:
         params = {
             "parameters": {
                 "product_locator": spl,
-                "user_email": "workspaces-analysts@listmgr.nrao.edu",
+                "user_email": "workspaces-analysts-test@listmgr.nrao.edu",
                 "metadata": fake_metadata,
             }
         }

shared/workspaces/workspaces/notification/services/notification_service.py

@@ -15,10 +15,8 @@ logger = logging.getLogger(__name__)
 
 class NotificationServiceRESTClient(NotificationServiceIF):
     def __init__(self):
-        self.url = (
-            CapoConfig().settings("edu.nrao.archive.workspaces.NotificationSettings").serviceUrl
-        )
-        self.linkUrl = CapoConfig().settings("edu.nrao.archive.workspaces.UISettings").serviceUrl
+        self.url = CapoConfig().settings("edu.nrao.workspaces.NotificationSettings").serviceUrl
+        self.linkUrl = CapoConfig().settings("edu.nrao.workspaces.UISettings").serviceUrl
 
     def notify_submitted(self, request: CapabilityRequestIF):
         # bail out early if we have no user email
@@ -76,7 +74,7 @@ class NotificationServiceRESTClient(NotificationServiceIF):
         """
         logger.info("SENDING QA-READY NOTIFICATION!!!")
         analyst_email = (
-            CapoConfig().settings("edu.nrao.archive.workspaces.NotificationSettings").analystEmail
+            CapoConfig().settings("edu.nrao.workspaces.NotificationSettings").analystEmail
         )
         requests.post(
             f"{self.url}/notify/ready-for-QA_email/send",

shared/workspaces/workspaces/products/services/archive_service.py

@@ -70,11 +70,9 @@ class ArchiveService(ArchiveServiceIF):
             - obs_end_time: End time of observation
         :return: HTTP Response for attempt to create std_calibration request
         """
-        capability_url = (
-            CapoConfig().settings("edu.nrao.archive.workspaces.CapabilitySettings").serviceUrl
-        )
+        capability_url = CapoConfig().settings("edu.nrao.workspaces.CapabilitySettings").serviceUrl
         analyst_email = (
-            CapoConfig().settings("edu.nrao.archive.workspaces.NotificationSettings").analystEmail
+            CapoConfig().settings("edu.nrao.workspaces.NotificationSettings").analystEmail
         )
         parameters = {
             "parameters": {

shared/workspaces/workspaces/workflow/services/workflow_service.py

@@ -31,7 +31,7 @@ class WorkflowServiceRESTClient(WorkflowServiceIF):
     """This is the workflow service REST client."""
 
     def __init__(self):
-        self.url = CapoConfig().settings("edu.nrao.archive.workspaces.WorkflowSettings").serviceUrl
+        self.url = CapoConfig().settings("edu.nrao.workspaces.WorkflowSettings").serviceUrl
 
     def execute(self, request: WorkflowRequestIF):
         """
@@ -141,9 +141,7 @@ class WorkflowService(WorkflowServiceIF):
         self.message_router = Router("workflow")
         self.message_router.register(self)
         self.info = info
-        self.processing_settings = CapoConfig().settings(
-            "edu.nrao.archive.workspaces.ProcessingSettings"
-        )
+        self.processing_settings = CapoConfig().settings("edu.nrao.workspaces.ProcessingSettings")
 
     def attach_file_to_request(self, request: WorkflowRequestIF, filename: str, content: bytes):
         """