library/DIAMETER: Fixes in ts_AVP_3GPP_ApnConfig

Id used was wrong. Order of AVPs was also wrong.

Change-Id: Iddef433d11d2886679edcf73939d620d077d1529
diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn
index 8bb53e0..1e29120 100644
--- a/library/DIAMETER_Templates.ttcn
+++ b/library/DIAMETER_Templates.ttcn
@@ -904,13 +904,13 @@
 template (value) GenericAVP ts_AVP_3GPP_ApnConfig(uint32_t ctx, AAA_3GPP_PDN_Type pdn_type,
 						  charstring apn) := {
 	avp := {
-		avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_APN_Configuration_Profile),
+		avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_AAA_3GPP_APN_Configuration),
 		avp_data := {
 			avp_AAA_3GPP_APN_Configuration := {
 				ts_AVP_3GPP_ContextId(ctx),
 				ts_AVP_3GPP_PdnType(pdn_type),
-				ts_AVP_3GPP_EpsSubscrQosProfile(1, 1),
-				ts_AVP_ServiceSelection(apn)
+				ts_AVP_ServiceSelection(apn),
+				ts_AVP_3GPP_EpsSubscrQosProfile(1, 1)
 			}
 		}
 	}