From 087ef7c7e791f09c0296deb5d778c39f73d77407 Mon Sep 17 00:00:00 2001
From: DanB <danb@cgrates.org>
Date: Mon, 3 Apr 2017 16:57:06 +0200
Subject: [PATCH] Diameter fixes to cope with application type=auth, diameter
 tests back on track

---
 agents/dmtagent_it_test.go                |  2 +-
 agents/dmtclient.go                       |  5 +++--
 data/diameter/dict/huawei/3gpp_vendor.xml | 11 +----------
 data/diameter/dict/huawei/base.xml        |  2 +-
 data/diameter/dict/huawei/huawei.xml      |  2 +-
 data/diameter/dict/huawei/nasreq.xml      |  2 +-
 data/diameter/dict/huawei/nokia.xml       |  2 +-
 data/diameter/dict/huawei/vodafone.xml    |  2 +-
 8 files changed, 10 insertions(+), 18 deletions(-)

diff --git a/agents/dmtagent_it_test.go b/agents/dmtagent_it_test.go
index 201ac4cb7..3d662fb8d 100644
--- a/agents/dmtagent_it_test.go
+++ b/agents/dmtagent_it_test.go
@@ -191,7 +191,7 @@ func TestDmtAgentTPFromFolder(t *testing.T) {
 	time.Sleep(time.Duration(1000) * time.Millisecond) // Give time for scheduler to execute topups
 }
 
-func TestConnectDiameterClient(t *testing.T) {
+func TestDmtAgentConnectDiameterClient(t *testing.T) {
 	dmtClient, err = NewDiameterClient(daCfg.DiameterAgentCfg().Listen, "UNIT_TEST", daCfg.DiameterAgentCfg().OriginRealm,
 		daCfg.DiameterAgentCfg().VendorId, daCfg.DiameterAgentCfg().ProductName, utils.DIAMETER_FIRMWARE_REVISION, daCfg.DiameterAgentCfg().DictionariesDir)
 	if err != nil {
diff --git a/agents/dmtclient.go b/agents/dmtclient.go
index 8abfb954b..528ca3487 100644
--- a/agents/dmtclient.go
+++ b/agents/dmtclient.go
@@ -49,8 +49,9 @@ func NewDiameterClient(addr, originHost, originRealm string, vendorId int, produ
 		RetransmitInterval: time.Second,
 		EnableWatchdog:     true,
 		WatchdogInterval:   5 * time.Second,
-		AcctApplicationID: []*diam.AVP{
-			diam.NewAVP(avp.AcctApplicationID, avp.Mbit, 0, datatype.Unsigned32(4)), // RFC 4006
+		AuthApplicationID: []*diam.AVP{
+			// Advertise support for credit control application
+			diam.NewAVP(avp.AuthApplicationID, avp.Mbit, 0, datatype.Unsigned32(4)), // RFC 4006
 		},
 	}
 	if len(dictsDir) != 0 {
diff --git a/data/diameter/dict/huawei/3gpp_vendor.xml b/data/diameter/dict/huawei/3gpp_vendor.xml
index 4d8968b60..aed4d457a 100644
--- a/data/diameter/dict/huawei/3gpp_vendor.xml
+++ b/data/diameter/dict/huawei/3gpp_vendor.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <diameter>
-  <application id="4" type="acct">
+  <application id="4" type="auth">
     <vendor id="10415" name="3GPP" />
     <avp name="3GPP-Charging-Characteristics" code="13" must="V" may="P" must-not="M" may-encrypt="Y" vendor-id="10415">
       <data type="UTF8String" />
@@ -1373,15 +1373,6 @@
       <data type="Enumerated">
         <item code="0" name="WLAN" />
         <item code="1" name="VIRTUAL" />
-        <item code="1000" name="UTRAN" />
-        <item code="1001" name="GERAN" />
-        <item code="1002" name="GAN" />
-        <item code="1003" name="HSPA_EVOLUTION" />
-        <item code="1004" name="EUTRAN" />
-        <item code="2000" name="CDMA2000_1X" />
-        <item code="2001" name="HRPD" />
-        <item code="2002" name="UMB" />
-        <item code="2003" name="EHRPD" />
       </data>
     </avp>
     <avp name="Read-Reply-Report-Requested" code="1222" must="V,M" may="P" must-not="-" may-encrypt="N" vendor-id="10415">
diff --git a/data/diameter/dict/huawei/base.xml b/data/diameter/dict/huawei/base.xml
index 5828f6625..935896ad8 100644
--- a/data/diameter/dict/huawei/base.xml
+++ b/data/diameter/dict/huawei/base.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <diameter>
-  <application id="4" type="acct">
+  <application id="4" type="auth">
     <!-- Diameter Credit Control Application -->
     <!-- http://tools.ietf.org/html/rfc4006 -->
     <command code="272" short="CC" name="Credit-Control">
diff --git a/data/diameter/dict/huawei/huawei.xml b/data/diameter/dict/huawei/huawei.xml
index c70ee3679..6866a0415 100644
--- a/data/diameter/dict/huawei/huawei.xml
+++ b/data/diameter/dict/huawei/huawei.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <diameter>
-  <application id="4" type="acct">
+  <application id="4" type="auth">
     <vendor id="2011" name="Huawei" />
     <avp name="IN-Information" code="20300" must="V" may="P,M" must-not="-" may-encrypt="N" vendor-id="2011">
       <data type="Grouped">
diff --git a/data/diameter/dict/huawei/nasreq.xml b/data/diameter/dict/huawei/nasreq.xml
index 1384d4a04..f4b5d601a 100644
--- a/data/diameter/dict/huawei/nasreq.xml
+++ b/data/diameter/dict/huawei/nasreq.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <diameter>
-  <application id="4" type="acct">
+  <application id="4" type="auth">
     <!-- Diameter Network Access Server Application -->
     <!-- http://tools.ietf.org/html/rfc7155 -->
     <command code="265" short="AA" name="AA">
diff --git a/data/diameter/dict/huawei/nokia.xml b/data/diameter/dict/huawei/nokia.xml
index 79bb31a77..7bc44ef86 100644
--- a/data/diameter/dict/huawei/nokia.xml
+++ b/data/diameter/dict/huawei/nokia.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <diameter>
-  <application id="4" type="acct">
+  <application id="4" type="auth">
     <vendor id="94" name="Nokia" />
     <avp name="Session-Start-Indicator" code="5105" must="V" may="P,M" must-not="-" may-encrypt="N" vendor-id="94">
       <data type="UTF8String" />
diff --git a/data/diameter/dict/huawei/vodafone.xml b/data/diameter/dict/huawei/vodafone.xml
index f8b92bc52..3ff8e76a1 100644
--- a/data/diameter/dict/huawei/vodafone.xml
+++ b/data/diameter/dict/huawei/vodafone.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <diameter>
-  <application id="4" type="acct">
+  <application id="4" type="auth">
     <vendor id="12645" name="Vodafone" />
     <avp name="Reporting-Reason" code="261" must="V" may="P,M" must-not="-" may-encrypt="N" vendor-id="12645">
       <data type="Enumerated">