From 7fbabd9de9211b70925f52e38f7d41bc3e29701a Mon Sep 17 00:00:00 2001 From: Muminovic Mersa Date: Fri, 10 Jun 2022 11:50:32 +0200 Subject: [PATCH] Changed custom services for scallservice and added new for diagservice --- .../custom-service-java.yaml | 28 ++++++++-- .../custom-service-java/template-1-1.json | 51 ++++++++++++------- .../custom-service-java.yaml | 7 ++- .../custom-service-java/template-1-1.json | 2 +- .../custom-service-java/template-1-2.json | 4 +- 5 files changed, 63 insertions(+), 29 deletions(-) diff --git a/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml index 25f8a028..9b7ac25c 100644 --- a/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/custom-service-java.yaml +++ b/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" \ No newline at end of file +- 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" \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/template-1-1.json index b3003515..f0077b0c 100644 --- a/BMW-Dynatrace-config/CD_VDLM_diagservice/custom-service-java/template-1-1.json +++ b/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}}" + } + ] } - ] - } - ] + ] } \ No newline at end of file diff --git a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml index f19e7fbe..e4484106 100644 --- a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/custom-service-java.yaml +++ b/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" diff --git a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-1.json b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-1.json index 4ab1ee81..ebe95097 100644 --- a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-1.json +++ b/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}}" } diff --git a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-2.json b/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-2.json index b3b7224f..6a18b39d 100644 --- a/BMW-Dynatrace-config/CD_VDLM_scallservice/custom-service-java/template-1-2.json +++ b/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}}" }