Merge pull request #2304 from Trial97/master

Updated docker ansible script for master

agents/kamagent.go

@@ -91,6 +91,9 @@ func (self *KamailioAgent) Connect() (err error) {
 
 func (self *KamailioAgent) Shutdown() (err error) {
 	for conIndx, conn := range self.conns {
+		if conn == nil {
+			continue
+		}
 		if err = conn.Disconnect(); err != nil {
 			utils.Logger.Err(fmt.Sprintf("<%s> can't disconnect connection at index %v because: %s",
 				utils.KamailioAgent, conIndx, err))

apier/v1/sessions_process_event_it_test.go

@@ -439,7 +439,7 @@ func testSSv1ItGetCDRs(t *testing.T) {
 	}
 
 	var cdrs []*engine.CDR
-	args := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}}}
+	args := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{"raw"}}}
 	if err := sSApierRpc.Call(utils.CDRsV1GetCDRs, args, &cdrs); err != nil {
 		t.Error("Unexpected error: ", err.Error())
 	} else if len(cdrs) != 1 {
@@ -701,7 +701,7 @@ func testSSv1ItGetCDRsFromProcessEvent(t *testing.T) {
 	var cdrs []*engine.CDR
 	args := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{
 		OriginIDs: []string{"testSSv1ItProcessEventWithCDR"},
-		RunIDs:    []string{utils.MetaRaw}}}
+		RunIDs:    []string{"raw"}}}
 	if err := sSApierRpc.Call(utils.CDRsV1GetCDRs, args, &cdrs); err != nil {
 		t.Error("Unexpected error: ", err.Error())
 	} else if len(cdrs) != 1 {

apier/v1/sessionsv1_it_test.go

@@ -670,7 +670,7 @@ func testSSv1ItCDRsGetCdrs(t *testing.T) {
 	}
 
 	var cdrs []*engine.CDR
-	args := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}}}
+	args := &utils.RPCCDRsFilterWithArgDispatcher{RPCCDRsFilter: &utils.RPCCDRsFilter{RunIDs: []string{"raw"}}}
 	if err := sSApierRpc.Call(utils.CDRsV1GetCDRs, args, &cdrs); err != nil {
 		t.Error("Unexpected error: ", err.Error())
 	} else if len(cdrs) != 2 {

apier/v2/cdrs_it_test.go

@@ -181,7 +181,7 @@ func testV2CDRsGetCdrs(t *testing.T) {
 		t.Error("Unexpected number of CDRs returned: ", cdrCnt)
 	}
 	var cdrs []*engine.ExternalCDR
-	args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}}
+	args := utils.RPCCDRsFilter{RunIDs: []string{"raw"}}
 	if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil {
 		t.Error("Unexpected error: ", err.Error())
 	} else if len(cdrs) != 1 {
@@ -282,7 +282,7 @@ func testV2CDRsRateCDRs(t *testing.T) {
 	}
 
 	if err := cdrsRpc.Call(utils.CDRsV1RateCDRs, &engine.ArgRateCDRs{
-		RPCCDRsFilter: utils.RPCCDRsFilter{NotRunIDs: []string{utils.MetaRaw}},
+		RPCCDRsFilter: utils.RPCCDRsFilter{NotRunIDs: []string{"raw"}},
 		Flags:         []string{"*chargers:false"},
 	}, &reply); err != nil {
 		t.Error("Unexpected error: ", err.Error())
@@ -300,7 +300,7 @@ func testV2CDRsGetCdrs2(t *testing.T) {
 		t.Error("Unexpected number of CDRs returned: ", cdrCnt)
 	}
 	var cdrs []*engine.ExternalCDR
-	args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}}
+	args := utils.RPCCDRsFilter{RunIDs: []string{"raw"}}
 	if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil {
 		t.Error("Unexpected error: ", err.Error())
 	} else if len(cdrs) != 1 {
@@ -361,7 +361,7 @@ func testV2CDRsUsageNegative(t *testing.T) {
 	}
 
 	var cdrs []*engine.ExternalCDR
-	args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, OriginIDs: []string{"testV2CDRsUsageNegative"}}
+	args := utils.RPCCDRsFilter{RunIDs: []string{"raw"}, OriginIDs: []string{"testV2CDRsUsageNegative"}}
 	if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil {
 		t.Error("Unexpected error: ", err.Error())
 	} else if len(cdrs) != 1 {
@@ -580,7 +580,7 @@ func testV2CDRsGetCdrsNoRattingPlan(t *testing.T) {
 		t.Error("Unexpected number of CDRs returned: ", cdrCnt)
 	}
 	var cdrs []*engine.ExternalCDR
-	args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, Accounts: []string{"testV2CDRsProcessCDR4"}}
+	args := utils.RPCCDRsFilter{RunIDs: []string{"raw"}, Accounts: []string{"testV2CDRsProcessCDR4"}}
 	if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil {
 		t.Error("Unexpected error: ", err.Error())
 	} else if len(cdrs) != 1 {
@@ -654,7 +654,7 @@ func testV2CDRsRateCDRsWithRatingPlan(t *testing.T) {
 	}
 
 	if err := cdrsRpc.Call(utils.CDRsV1RateCDRs, &engine.ArgRateCDRs{
-		RPCCDRsFilter: utils.RPCCDRsFilter{NotRunIDs: []string{utils.MetaRaw}, Accounts: []string{"testV2CDRsProcessCDR4"}},
+		RPCCDRsFilter: utils.RPCCDRsFilter{NotRunIDs: []string{"raw"}, Accounts: []string{"testV2CDRsProcessCDR4"}},
 		Flags:         []string{"*chargers:true"},
 	}, &reply); err != nil {
 		t.Error("Unexpected error: ", err.Error())
@@ -672,7 +672,7 @@ func testV2CDRsGetCdrsWithRattingPlan(t *testing.T) {
 		t.Error("Unexpected number of CDRs returned: ", cdrCnt)
 	}
 	var cdrs []*engine.ExternalCDR
-	args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, Accounts: []string{"testV2CDRsProcessCDR4"}}
+	args := utils.RPCCDRsFilter{RunIDs: []string{"raw"}, Accounts: []string{"testV2CDRsProcessCDR4"}}
 	if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil {
 		t.Error("Unexpected error: ", err.Error())
 	} else if len(cdrs) != 1 {
@@ -812,7 +812,7 @@ func testv2CDRsGetCDRsDest(t *testing.T) {
 			Event: map[string]interface{}{
 				utils.CGRID:       "9b3cd5e698af94f8916220866c831a982ed16318",
 				utils.ToR:         utils.VOICE,
-				utils.RunID:       utils.MetaRaw,
+				utils.RunID:       "raw",
 				utils.OriginID:    "25160047719:0",
 				utils.OriginHost:  "192.168.1.1",
 				utils.Source:      "*sessions",

data/ansible/docker/main.yaml

@@ -1,6 +1,6 @@
 ---
 - name: Check and set python version on APT server
-  hosts: docker
+  hosts: dkr
   remote_user: '{{ user }}'
   gather_facts: false
   tasks:
@@ -11,7 +11,7 @@
         fi
       become: true
 
-- hosts: docker
+- hosts: dkr
   vars:
     ###############################################################
     ##################### Golang Vars #############################
@@ -34,7 +34,7 @@
     # CGRateS vars
     cgrates_dir: "{{ golang_gopath }}/src/github.com/cgrates/cgrates"
     cgrates_branch: "master"
-    cgrates_distribution: "master"
+    cgrates_distribution: "nightly"
     docker_tag: "latest"
 
     dependencies:
@@ -145,11 +145,11 @@
       args:
         chdir: '{{ cgrates_dir }}/data/docker/scratch'
 
-    - name: copy default config
+    - name: copy certificate authority
       copy:
         remote_src: yes
-        src: "{{ cgrates_dir }}/data/conf/cgrates/cgrates.json"
-        dest: "{{ cgrates_dir }}/data/docker/scratch/cgrates.json"
+        src: "/etc/ssl/certs/ca-certificates.crt"
+        dest: "{{ cgrates_dir }}/data/docker/scratch/ca-certificates.crt"
 
     - name: get git tag
       shell: "git tag -l --points-at HEAD"
@@ -217,6 +217,17 @@
         docker image push 127.0.0.1:5000/{{ cgrates_distribution }}/cgr-tester:latest;
       when: cgrates_branch == "master"
 
+    - name: clean binar files
+      file:
+        path: "{{ cgrates_dir }}/data/docker/scratch/{{ item }}"
+        state: absent
+      with_items:
+        - cgr-engine
+        - cgr-console
+        - cgr-loader
+        - cgr-migrator
+        - cgr-tester
+
     - name:  docker_tag is
       debug:
         msg: "{{ docker_tag }}"

data/docker/scratch/cgr-console.doker

@@ -1,3 +1,4 @@
 FROM scratch
 ADD ./cgr-console /usr/bin/
+COPY ./ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 ENTRYPOINT ["/usr/bin/cgr-console"]

data/docker/scratch/cgr-engine.doker

@@ -1,3 +1,4 @@
 FROM scratch
 ADD ./cgr-engine /usr/bin/
+COPY ./ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 ENTRYPOINT ["/usr/bin/cgr-engine", "-logger=*stdout"] 

data/docker/scratch/cgr-loader.doker

@@ -1,4 +1,5 @@
 FROM scratch
 ADD ./cgr-loader /usr/bin/
+COPY ./ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 ENTRYPOINT ["/usr/bin/cgr-loader"]
 CMD ["-config_path=/etc/cgrates/"]

data/docker/scratch/cgr-migrator.doker

@@ -1,4 +1,5 @@
 FROM scratch
 ADD ./cgr-migrator /usr/bin/
+COPY ./ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 ENTRYPOINT ["/usr/bin/cgr-migrator"]
 CMD ["-config_path=/etc/cgrates/"]

data/docker/scratch/cgr-tester.doker

@@ -1,3 +1,4 @@
 FROM scratch
 ADD ./cgr-tester /usr/bin/
+COPY ./ca-certificates.crt /etc/ssl/certs/ca-certificates.crt
 ENTRYPOINT ["/usr/bin/cgr-tester"]

data/tariffplans/testit/Chargers.csv

@@ -1,4 +1,4 @@
 #Tenant,ID,FilterIDs,ActivationInterval,RunID,AttributeIDs,Weight
-cgrates.org,Raw,,,*raw,*constant:*req.RequestType:*none,20
+cgrates.org,Raw,,,raw,*constant:*req.RequestType:*none,20
 cgrates.org,CustomerCharges,,,CustomerCharges,*none,20
 cgrates.org,SupplierCharges,,,SupplierCharges,ATTR_SUPPLIER1,10

engine/z_actions_it_test.go

@@ -536,7 +536,7 @@ func testActionsitThresholdCgrRpcAction(t *testing.T) {
 	var reply string
 
 	attrsAA := &utils.AttrSetActions{ActionsId: "ACT_TH_CGRRPC", Actions: []*utils.TPAction{
-		&utils.TPAction{Identifier: utils.CGR_RPC, ExtraParameters: `{"Address": "127.0.0.1:2012",
+		{Identifier: utils.CGR_RPC, ExtraParameters: `{"Address": "127.0.0.1:2012",
 "Transport": "*json",
 "Method": "RALsV1.Ping",
 "Attempts":1,
@@ -604,7 +604,7 @@ func testActionsitThresholdPostEvent(t *testing.T) {
 
 	//if we check syslog we will see that it tries to post
 	attrsAA := &utils.AttrSetActions{ActionsId: "ACT_TH_POSTEVENT", Actions: []*utils.TPAction{
-		&utils.TPAction{Identifier: utils.MetaPostEvent, ExtraParameters: "http://127.0.0.1:12080/invalid_json"},
+		{Identifier: utils.MetaPostEvent, ExtraParameters: "http://127.0.0.1:12080/invalid_json"},
 	}}
 	if err := actsLclRpc.Call(utils.APIerSv2SetActions, attrsAA, &reply); err != nil && err.Error() != utils.ErrExists.Error() {
 		t.Error("Got error on APIerSv2.SetActions: ", err.Error())

general_tests/cdrs_it_test.go

@@ -197,7 +197,7 @@ func testV2CDRsGetCdrs(t *testing.T) {
 		t.Error("Unexpected number of CDRs returned: ", cdrCnt)
 	}
 	var cdrs []*engine.ExternalCDR
-	args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}}
+	args := utils.RPCCDRsFilter{RunIDs: []string{"raw"}}
 	if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil {
 		t.Error("Unexpected error: ", err.Error())
 	} else if len(cdrs) != 1 {
@@ -268,7 +268,7 @@ func testV2CDRsGetCdrs2(t *testing.T) {
 		t.Error("Unexpected number of CDRs returned: ", cdrCnt)
 	}
 	var cdrs []*engine.ExternalCDR
-	args := utils.RPCCDRsFilter{RunIDs: []string{utils.MetaRaw}, OriginIDs: []string{"testV2CDRsProcessCDR2"}}
+	args := utils.RPCCDRsFilter{RunIDs: []string{"raw"}, OriginIDs: []string{"testV2CDRsProcessCDR2"}}
 	if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil {
 		t.Error("Unexpected error: ", err.Error())
 	} else if len(cdrs) != 1 {
@@ -404,7 +404,7 @@ func testV2CDRsGetCdrs4(t *testing.T) {
 	}
 	var cdrs []*engine.ExternalCDR
 	args := utils.RPCCDRsFilter{
-		RunIDs:    []string{utils.MetaRaw},
+		RunIDs:    []string{"raw"},
 		OriginIDs: []string{"testV2CDRsProcessCDR4"},
 	}
 	if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil {
@@ -449,7 +449,7 @@ func testV2CDRsGetCdrs5(t *testing.T) {
 	}
 	var cdrs []*engine.ExternalCDR
 	args := utils.RPCCDRsFilter{
-		RunIDs:    []string{utils.MetaRaw},
+		RunIDs:    []string{"raw"},
 		OriginIDs: []string{"testV2CDRsProcessCDR5"},
 	}
 	if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err == nil || err.Error() != utils.ErrNotFound.Error() {
@@ -720,7 +720,7 @@ func testV2CDRsGetCdrs7(t *testing.T) {
 	}
 	var cdrs []*engine.ExternalCDR
 	args := utils.RPCCDRsFilter{
-		RunIDs:    []string{utils.MetaRaw},
+		RunIDs:    []string{"raw"},
 		OriginIDs: []string{"testV2CDRsProcessCDR7"},
 	}
 	if err := cdrsRpc.Call(utils.APIerSv2GetCDRs, &args, &cdrs); err != nil {

general_tests/cdrs_processevent_it_test.go

@@ -272,10 +272,10 @@ func testV1CDRsProcessEventChrgS(t *testing.T) {
 		t.Errorf("Expecting: test2_processEvent, received: %+v, %+v, %+v ", cdrs[0].OriginID, cdrs[1].OriginID, cdrs[2].OriginID)
 	}
 	sort.Slice(cdrs, func(i, j int) bool { return cdrs[i].RunID < cdrs[j].RunID })
-	if cdrs[0].RunID != utils.MetaRaw { // charger with RunID *raw
-		t.Errorf("Expecting: %+v, received: %+v", utils.MetaRaw, cdrs[0].RunID)
-	} else if cdrs[1].RunID != "CustomerCharges" {
-		t.Errorf("Expecting: %+v, received: %+v", "CustomerCharges", cdrs[1].RunID)
+	if cdrs[1].RunID != "raw" { // charger with RunID *raw
+		t.Errorf("Expecting: %+v, received: %+v", "raw", cdrs[1].RunID)
+	} else if cdrs[0].RunID != "CustomerCharges" {
+		t.Errorf("Expecting: %+v, received: %+v", "CustomerCharges", cdrs[0].RunID)
 	} else if cdrs[2].RunID != "SupplierCharges" {
 		t.Errorf("Expecting: %+v, received: %+v", "SupplierCharges", cdrs[2].RunID)
 	}

sessions/sessions.go

@@ -3170,7 +3170,7 @@ func (sS *SessionS) BiRPCv1ProcessEvent(clnt rpcclient.ClientConnector,
 			return
 		}
 		for _, chrgr := range chrgrs {
-			events[chrgr.ChargerSProfile] = &utils.CGREventWithOpts{
+			events[utils.IfaceAsString(chrgr.CGREvent.Event[utils.RunID])] = &utils.CGREventWithOpts{
 				CGREvent:      chrgr.CGREvent,
 				Opts:          chrgr.Opts,
 				ArgDispatcher: args.ArgDispatcher,