Changed custom services for scallservice and added new for diagservice

BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml

@@ -1,9 +1,27 @@
 config:
 - customService1: template-1-1.json
+- customService2: template-1-1.json
 
 customService1:
-- name: myJOYNRService 
-- className: com.bmw.cc.conn.this.is.just.an.exampleClasss
-- methodName: exampleJoynrMethod
-- returnType: void
-- skipDeployment: "true"
+- name: "ifs-007 (JOYNR) requestDiagResult/notifyDiagResult - IN/OUT"
+- className1: com.bmw.cc.ts.diagservice.joynr.consumer.boundary.DiagServiceV1Consumer
+- methodName1: requestDiagResult
+- methodArgs1: com.bmw.cc.ts.diagservice.joynr.consumer.entity.RequestPdmResultData,boolean,int
+- returnType1: void
+- className2: com.bmw.cc.ts.diagservice.joynr.consumer.boundary.DiagServiceBackendServiceInterface
+- methodName2: notifyDiagResult
+- methodArgs2: joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId,java.lang.String,joynr.de.bmw.infotainment.telematic.common.CommonTypes.ResultCode
+- returnType2: void
+- skipDeployment: "false"
+
+customService2:
+- name: "ifs-007 (JOYNR) requestPdmResult/notifyPdmResult - IN/OUT"
+- className1: com.bmw.cc.ts.diagservice.joynr.consumer.boundary.DiagServiceV1Consumer
+- methodName1: requestPdmResult
+- methodArgs1: com.bmw.cc.ts.diagservice.joynr.consumer.entity.RequestPdmResultData,boolean,int
+- returnType1: void
+- className2: com.bmw.cc.ts.diagservice.joynr.consumer.boundary.DiagServiceBackendServiceInterface
+- methodName2: notifyPdmResultStatus
+- methodArgs2:joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId,joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.AppInfo,joynr.de.bmw.infotainment.telematic.teleservice.TeleserviceTypes.TeleserviceInfo,java.lang.String,java.lang.String,java.lang.String,joynr.de.bmw.infotainment.telematic.common.CommonTypes.ResultCode
+- returnType2: void
+- skipDeployment: "false"

BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/template-1-1.json

@@ -1,23 +1,36 @@
 {
- "enabled": true,
- "name": "{{.name}}",
- "processGroups": [],
- "queueEntryPoint": false,
- "queueEntryPointType": null,
- "rules": [
-  {
-   "annotations": [],
-   "className": "{{.className}}",
-   "enabled": true,
-   "fileName": "",
-   "matcher": "EQUALS",
-   "methodRules": [
+  "enabled": true,
+  "name": "{{.name}}",
+  "processGroups": [],
+  "queueEntryPoint": false,
+  "queueEntryPointType": null,
+  "rules": [
     {
-     "argumentTypes": [],
-     "methodName": "{{.methodName}}",
-     "returnType": "{{.returnType}}"
+      "annotations": [],
+      "className": "{{.className1}}",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+        {
+          "argumentTypes": ["{{.methodArgs1}}"],
+          "methodName": "{{.methodName1}}",
+          "returnType": "{{.returnType1}}"
+        }]
+    },
+    {
+      "annotations": [],
+      "className": "{{.className2}}",
+      "enabled": true,
+      "fileName": "",
+      "matcher": "EQUALS",
+      "methodRules": [
+        {
+          "argumentTypes": ["{{.methodArgs2}}"],
+          "methodName": "{{.methodName2}}",
+          "returnType": "{{.returnType2}}"
+        }
+      ]
     }
-   ]
-  }
- ]
+  ]
 }

BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml

@@ -3,19 +3,22 @@ config:
 - customService2: template-1-1.json
 
 customService1:
-- name: "VDLM_scallservice - ifs-002 (JOYNR) requestMaintenanceStatus/confirmMaintenanceStatus - OUT"
+- name: "ifs-002 (JOYNR) requestMaintenanceStatus/confirmMaintenanceStatus - OUT"
 - className: com.bmw.cc.ts.scallservice.joynr.consumer.boundary.SCallServiceV1Consumer
 - methodName1: confirmMaintenanceStatus
+- methodArgs1: joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId,joynr.de.bmw.infotainment.telematic.common.CommonTypes.ResultCode
 - returnType1: void
 - methodName2: requestMaintenanceStatus
+- methodArgs2: joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId
 - returnType2: void
 - skipDeployment: "false"
 
 
 customService2:
-  - name: "VDLM_scallservice - ifs-002 (JOYNR) notifyMaintenanceStatus - IN"
+  - name: "ifs-002 (JOYNR) notifyMaintenanceStatus - IN"
   - className: com.bmw.cc.ts.scallservice.bm.maintenance.boundary.MaintenanceConfirmBF
   - methodName: notifyMaintenanceStatus
+  - methodArgs: com.bmw.cc.ts.joynr.consumer.entity.NotifyMaintenanceVehicleResponse
   - returnType: void
   - skipDeployment: "false"
 

BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-1.json

@@ -13,7 +13,7 @@
    "matcher": "EQUALS",
    "methodRules": [
     {
-     "argumentTypes": ["com.bmw.cc.ts.joynr.consumer.entity.NotifyMaintenanceVehicleResponse"],
+     "argumentTypes": ["{{.methodArgs}}"],
      "methodName": "{{.methodName}}",
      "returnType": "{{.returnType}}"
     }

BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-2.json

@@ -13,7 +13,7 @@
       "matcher": "EQUALS",
       "methodRules": [
         {
-          "argumentTypes": ["joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId","joynr.de.bmw.infotainment.telematic.common.CommonTypes.ResultCode"],
+          "argumentTypes": ["{{.methodArgs1}}"],
           "methodName": "{{.methodName1}}",
           "returnType": "{{.returnType1}}"
         }]
@@ -26,7 +26,7 @@
       "matcher": "EQUALS",
       "methodRules": [
         {
-          "argumentTypes": [ "joynr.de.bmw.infotainment.telematic.common.CommonTypes.RequestId" ],
+          "argumentTypes": ["{{.methodArgs2}}"],
           "methodName": "{{.methodName2}}",
           "returnType": "{{.returnType2}}"
         }