pespin has uploaded this change for review.
Remove duplicate 3GPP-AAA-Server-Name definition and break 3-way circular dependency
3GPP-AAA-Server-Name is from TS 29.273, so avoid re-defining the type in
TS29.173. As a result, a 3-way dependency is created, and hence it is
broken by moving GMLC-Address to the break_circle.dia used for that
purpose.
The 3-way circular dependency:
* TS29.173 uses 3GPP-AAA-Server-Name from TS29.273
* TS29.273 uses Trace-Data from TS29.272
* TS29.272 uses GMLC-Address from TS29.173
Change-Id: Idb1a7f7588b751c59788e4d99cd1d86f1fd2b573
---
M dia/diameter_3gpp_break_circles.dia
M dia/diameter_3gpp_ts29_173.dia
M dia/diameter_3gpp_ts29_272.dia
M dia/diameter_3gpp_ts29_273.dia
4 files changed, 8 insertions(+), 7 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/erlang/osmo-epdg refs/changes/16/41016/1
diff --git a/dia/diameter_3gpp_break_circles.dia b/dia/diameter_3gpp_break_circles.dia
index e5f49e0..a3bea6f 100644
--- a/dia/diameter_3gpp_break_circles.dia
+++ b/dia/diameter_3gpp_break_circles.dia
@@ -10,8 +10,12 @@
Emergency-Info 1687 Grouped V
;; 29.273 depends on 29.272 (APN-OI-Replacement), ...
APN-OI-Replacement 1427 UTF8String MV
- GMLC-Number 1474 OctetString MV
- SGSN-Number 1489 OctetString MV ;; from 29.272
+
+ ;; 3-node-circular: 29.272 depends on 29.173 (GMLC-Address); 29.173 depends on 29.273 (3GPP-AAA-Server-Name); 29.273 depends on 29.272 (Trace-Data)
+ GMLC-Address 2405 Address MV ;; from 29.173
+
+ GMLC-Number 1474 OctetString MV ;; from 29.272
+ SGSN-Number 1489 OctetString MV ;; from 29.272
@grouped
diff --git a/dia/diameter_3gpp_ts29_173.dia b/dia/diameter_3gpp_ts29_173.dia
index 6d8dc1c..680d3e2 100644
--- a/dia/diameter_3gpp_ts29_173.dia
+++ b/dia/diameter_3gpp_ts29_173.dia
@@ -33,19 +33,17 @@
@inherits diameter_gen_base_rfc6733
@inherits diameter_3gpp_base
@inherits diameter_3gpp_ts29_229
+@inherits diameter_3gpp_ts29_273 3GPP-AAA-Server-Name
@inherits diameter_3gpp_ts29_329
@inherits diameter_3gpp_break_circles
@avp_types
- 3GPP-AAA-Server-Name 318 DiameterIdentity MV ;; from 29.273
-
LMSI 2400 OctetString MV
Serving-Node 2401 Grouped MV
MME-Name 2402 DiameterIdentity MV
MSC-Number 2403 OctetString MV
LCS-Capabilities-Sets 2404 Unsigned32 MV
- GMLC-Address 2405 Address MV
Additional-Serving-Node 2406 Grouped MV
PPR-Address 2407 Address MV
MME-Realm 2408 DiameterIdentity V
diff --git a/dia/diameter_3gpp_ts29_272.dia b/dia/diameter_3gpp_ts29_272.dia
index 65a6f7a..f264ab3 100644
--- a/dia/diameter_3gpp_ts29_272.dia
+++ b/dia/diameter_3gpp_ts29_272.dia
@@ -35,7 +35,6 @@
@inherits diameter_3gpp_ts29_214
@inherits diameter_3gpp_ts29_229
@inherits diameter_3gpp_ts29_329
-@inherits diameter_3gpp_ts29_173
@inherits diameter_3gpp_ts32_299
@inherits diameter_3gpp_break_circles
diff --git a/dia/diameter_3gpp_ts29_273.dia b/dia/diameter_3gpp_ts29_273.dia
index 0e0b51c..b5f0211 100644
--- a/dia/diameter_3gpp_ts29_273.dia
+++ b/dia/diameter_3gpp_ts29_273.dia
@@ -35,7 +35,7 @@
@inherits diameter_3gpp_base
@inherits diameter_3gpp_break_circles
@inherits diameter_3gpp_ts29_212
-@inherits diameter_3gpp_ts29_272
+@inherits diameter_3gpp_ts29_272 AMBR APN-Configuration Context-Identifier Core-Network-Restrictions PDN-Type Trace-Data Trace-Reference UE-Usage-Type
@inherits diameter_3gpp_ts32_299
@inherits diameter_etsi_es283_034
@inherits diameter_rfc4006_cc
To view, visit change 41016. To unsubscribe, or for help writing mail filters, visit settings.