From e07c02ce6e546b846e395afe785edf9bfbc34bde Mon Sep 17 00:00:00 2001
From: DanB <danb@cgrates.org>
Date: Sat, 24 Sep 2016 18:56:28 +0200
Subject: [PATCH] Configuration checks for SMG in case of SMAsterisk is
 started, small modifications on tutorial_astevents_calls

---
 config/config.go                              |  8 ++++--
 .../tutorial_astevents_calls_test.go          | 25 +++----------------
 2 files changed, 9 insertions(+), 24 deletions(-)

diff --git a/config/config.go b/config/config.go
index 26bd29a52..4b0d4192f 100644
--- a/config/config.go
+++ b/config/config.go
@@ -441,9 +441,9 @@ func (self *CGRConfig) checkConfigSanity() error {
 			}
 		}
 	}
-	// SMOpenSIPS checks
+	// SMAsterisk checks
 	if self.smAsteriskCfg.Enabled {
-		if len(self.smAsteriskCfg.SMGConns) == 0 {
+		/*if len(self.smAsteriskCfg.SMGConns) == 0 {
 			return errors.New("<SMAsterisk> SMG definition is mandatory!")
 		}
 		for _, smAstSMGConn := range self.smAsteriskCfg.SMGConns {
@@ -451,6 +451,10 @@ func (self *CGRConfig) checkConfigSanity() error {
 				return errors.New("<SMAsterisk> SMG not enabled.")
 			}
 		}
+		*/
+		if !self.SmGenericConfig.Enabled {
+			return errors.New("<SMAsterisk> SMG not enabled.")
+		}
 	}
 	// DAgent checks
 	if self.diameterAgentCfg.Enabled {
diff --git a/general_tests/tutorial_astevents_calls_test.go b/general_tests/tutorial_astevents_calls_test.go
index 2d8401b7a..5460e02eb 100644
--- a/general_tests/tutorial_astevents_calls_test.go
+++ b/general_tests/tutorial_astevents_calls_test.go
@@ -73,7 +73,7 @@ func TestTutAstCallsResetStorDb(t *testing.T) {
 }
 
 // start Asterisk server
-func TestTutAstCallsStartOsips(t *testing.T) {
+func TestTutAstCallsStartAsterisk(t *testing.T) {
 	if !*testCalls {
 		return
 	}
@@ -94,6 +94,7 @@ func TestTutAstCallsStartEngine(t *testing.T) {
 	}
 }
 
+/*
 // Restart FS so we make sure reconnects are working
 func TestTutAstCallsRestartAsterisk(t *testing.T) {
 	if !*testCalls {
@@ -103,7 +104,7 @@ func TestTutAstCallsRestartAsterisk(t *testing.T) {
 		t.Fatal(err)
 	}
 }
-
+*/
 // Connect rpc client to rater
 func TestTutAstCallsRpcConn(t *testing.T) {
 	if !*testCalls {
@@ -258,7 +259,6 @@ func TestTutAstCallsCall1001To1003(t *testing.T) {
 	}
 }
 
-/*
 func TestTutAstCallsCall1002To1001(t *testing.T) {
 	if !*testCalls {
 		return
@@ -308,9 +308,7 @@ func TestTutAstCallsCall1007To1002(t *testing.T) {
 		t.Fatal(err)
 	}
 }
-*/
 
-/*
 // Make sure account was debited properly
 func TestTutAstCallsAccount1001(t *testing.T) {
 	if !*testCalls {
@@ -359,14 +357,6 @@ func TestTutAstCalls1001Cdrs(t *testing.T) {
 		//	t.Errorf("Unexpected Supplier for CDR: %+v", reply[0])
 		//}
 	}
-	/*
-		// Make sure call cost contains the matched information
-		if err := tutAstCallsRpc.Call("ApierV2.GetCallCostLog", utils.AttrGetCallCost{CgrId: cgrId}, &cCost); err != nil {
-			t.Error("Unexpected error: ", err.Error())
-		} else if utils.IsSliceMember([]string{cCost.Timespans[0].MatchedSubject, cCost.Timespans[0].MatchedPrefix, cCost.Timespans[0].MatchedDestId}, "") {
-			t.Errorf("Unexpected Matched* for CallCost: %+v", cCost.Timespans[0])
-		}
-
 	req = utils.RPCCDRsFilter{RunIDs: []string{utils.META_DEFAULT}, Accounts: []string{"1001"}, DestinationPrefixes: []string{"1003"}}
 	if err := tutAstCallsRpc.Call("ApierV2.GetCdrs", req, &reply); err != nil {
 		t.Error("Unexpected error: ", err.Error())
@@ -384,14 +374,6 @@ func TestTutAstCalls1001Cdrs(t *testing.T) {
 			t.Errorf("Unexpected Cost for CDR: %+v", reply[0])
 		}
 	}
-	/*
-		// Make sure call cost contains the matched information
-		if err := tutAstCallsRpc.Call("ApierV2.GetCallCostLog", utils.AttrGetCallCost{CgrId: cgrId}, &cCost); err != nil {
-			t.Error("Unexpected error: ", err.Error())
-		} else if utils.IsSliceMember([]string{cCost.Timespans[0].MatchedSubject, cCost.Timespans[0].MatchedPrefix, cCost.Timespans[0].MatchedDestId}, "") {
-			t.Errorf("Unexpected Matched* for CallCost: %+v", cCost.Timespans[0])
-		}
-
 	req = utils.RPCCDRsFilter{Accounts: []string{"1001"}, RunIDs: []string{"derived_run1"}}
 	if err := tutAstCallsRpc.Call("ApierV2.GetCdrs", req, &reply); err != nil {
 		t.Error("Unexpected error: ", err.Error())
@@ -562,7 +544,6 @@ func TestTutAstCallsAccountDisabled1001(t *testing.T) {
 		t.Error("Account should be disabled per fraud detection rules.")
 	}
 }
-*/
 
 func TestTutAstCallsStopPjsuaListener(t *testing.T) {
 	if !*testCalls {