Mostly integration test work:

[ric-plt/a1.git] / integration_tests / testreceiver / templates / deployment.yaml

diff --git a/integration_tests/testreceiver/templates/deployment.yaml b/integration_tests/testreceiver/templates/deployment.yaml
index b6e5c4e..af17968 100644 (file)
--- a/integration_tests/testreceiver/templates/deployment.yaml
+++ b/integration_tests/testreceiver/templates/deployment.yaml
@@ -17,6 +17,35 @@ spec:
         app.kubernetes.io/instance: {{ .Release.Name }}
     spec:
       containers:
+        #query receiver
+        - name: queryreceiver
+          image: queryreceiver:latest
+          imagePullPolicy: Never
+          resources:
+            {{- toYaml .Values.resources | nindent 12 }}
+          volumeMounts:
+            - name: queryreceiverconf
+              mountPath: /opt/route/local.rt
+              subPath: local.rt
+          env:
+            # tells the test xapp to do a query
+            - name: DO_QUERY
+              value: "YES"
+            # this sets the source field in messages from a1 to point back to a1s service name, rather than it's random pod name
+            - name: RMR_SRC_ID
+              value: {{ .Values.queryrmrservice.name }}
+            - name: HANDLER_ID
+              value: "query_tester"
+            # the xapp framework requires this to work, even if SDL isn't used.
+            # it does an SDL healthcheck before it starts up properly
+            # moreover, the db config section doesn't appear to be honored; with that set, but not this, it doesn't find SDL
+            # so we need this here for the test receiver which uses the xapp framework to work
+            - name: DBAAS_SERVICE_HOST
+              value: "dbaas"
+            - name: DBAAS_SERVICE_PORT
+              value: "6379"
+
+        # test receiver
         - name: testreceiver
           image: testreceiver:latest
           imagePullPolicy: Never
@@ -26,8 +55,15 @@ spec:
             - name: testreceiverconf
               mountPath: /opt/route/local.rt
               subPath: local.rt
+          env:
+            - name: DBAAS_SERVICE_HOST
+              value: "dbaas"
+            - name: DBAAS_SERVICE_PORT
+              value: "6379"
+
+        # test receiver that delays until sending
         - name: delayreceiver
-          image: testreceiver:latest
+          image: delayreceiver:latest
           imagePullPolicy: Never
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
@@ -36,18 +72,14 @@ spec:
               mountPath: /opt/route/local.rt
               subPath: local.rt
           env:
-          - name: RMR_RCV_RETRY_INTERVAL
-            value: "500"
-          - name: RMR_RETRY_TIMES
-            value: "10"
-          - name: TEST_RCV_PORT
-            value: "{{ .Values.delayrmrservice.port }}"
-          - name: TEST_RCV_RETURN_MINT
-            value: "10001"
-          - name: TEST_RCV_SEC_DELAY
-            value: "5"
-          - name: TEST_RCV_RETURN_PAYLOAD
-            value: '{"ACK_FROM": "DELAYED_TEST", "status": "SUCCESS"}'
+            - name: TEST_RCV_SEC_DELAY
+              value: "5"
+            - name: HANDLER_ID
+              value: "delay_receiver"
+            - name: DBAAS_SERVICE_HOST
+              value: "dbaas"
+            - name: DBAAS_SERVICE_PORT
+              value: "6379"
 
       volumes:
         - name: "testreceiverconf"
@@ -56,3 +88,6 @@ spec:
         - name: "delayreceiverconf"
           configMap:
             name: "delayreceiverconf"
+        - name: "queryreceiverconf"
+          configMap:
+            name: "queryreceiverconf"