wds: move common Profile-related TLVs to common-refs

2 files changed, 221 insertions, 404 deletions

diff --git a/data/qmi-common.json b/data/qmi-common.json
index 064b4a5..3c2c87b 100644
--- a/data/qmi-common.json
+++ b/data/qmi-common.json
@@ -21,5 +21,164 @@
       "type"       : "prerequisite",
       "field"      : "Result.Error Status",
       "operation"  : "!=",
-      "value"      : "QMI_STATUS_SUCCESS" }
+      "value"      : "QMI_STATUS_SUCCESS" },
+
+    // *********************************************************************************
+    // WDS common TLVs
+
+    { "common-ref" : "WDS Profile Name",
+      "name"       : "Profile Name",
+      "id"         : "0x10",
+      "mandatory"  : "no",
+      "type"       : "TLV",
+      "format"     : "string" },
+
+    { "common-ref" : "WDS PDP Type",
+      "name"       : "PDP Type",
+      "id"         : "0x11",
+      "mandatory"  : "no",
+      "type"       : "TLV",
+      "format"     : "guint8",
+      "public-format" : "QmiWdsPdpType" },
+
+    { "common-ref" : "WDS APN Name",
+      "name"       : "APN Name",
+      "id"         : "0x14",
+      "mandatory"  : "no",
+      "type"       : "TLV",
+      "format"     : "string" },
+
+    { "common-ref" : "WDS Primary IPv4 DNS Address",
+      "name"       : "Primary IPv4 DNS Address",
+      "id"         : "0x15",
+      "mandatory"  : "no",
+      "type"       : "TLV",
+      "endian"     : "little",
+      "format"     : "guint32" },
+
+    { "common-ref" : "WDS Secondary IPv4 DNS Address",
+      "name"       : "Secondary IPv4 DNS Address",
+      "id"         : "0x16",
+      "mandatory"  : "no",
+      "type"       : "TLV",
+      "endian"     : "little",
+      "format"     : "guint32" },
+
+    { "common-ref" : "WDS GPRS Requested QoS",
+      "name"       : "GPRS Requested QoS",
+      "id"         : "0x19",
+      "mandatory"  : "no",
+      "type"       : "TLV",
+      "format"     : "sequence",
+      "contents"   : [ { "name"   : "Precedence Class",
+                        "format" : "guint32" },
+                      { "name"   : "Delay Class",
+                        "format" : "guint32" },
+                      { "name"   : "Reliability Class",
+                        "format" : "guint32" },
+                      { "name"   : "Peak Throughput Class",
+                        "format" : "guint32" },
+                      { "name"   : "Mean Throughput Class",
+                        "format" : "guint32" } ] },
+
+    { "common-ref" : "WDS GPRS Minimum QoS",
+      "name"       : "GPRS Minimum QoS",
+      "id"         : "0x1A",
+      "mandatory"  : "no",
+      "type"       : "TLV",
+      "format"     : "sequence",
+      "contents"   : [ { "name"   : "Precedence Class",
+                        "format" : "guint32" },
+                      { "name"   : "Delay Class",
+                        "format" : "guint32" },
+                      { "name"   : "Reliability Class",
+                        "format" : "guint32" },
+                      { "name"   : "Peak Throughput Class",
+                        "format" : "guint32" },
+                      { "name"   : "Mean Throughput Class",
+                        "format" : "guint32" } ] },
+
+    { "common-ref" : "WDS Username",
+      "name"       : "Username",
+      "id"         : "0x1B",
+      "mandatory"  : "no",
+      "type"       : "TLV",
+      "format"     : "string" },
+
+    { "common-ref" : "WDS Password",
+      "name"       : "Password",
+      "id"         : "0x1C",
+      "mandatory"  : "no",
+      "type"       : "TLV",
+      "format"     : "string" },
+
+    { "common-ref" : "WDS Authentication",
+      "name"       : "Authentication",
+      "id"         : "0x1D",
+      "mandatory"  : "no",
+      "type"       : "TLV",
+      "format"     : "guint8",
+      "public-format" : "QmiWdsAuthentication" },
+
+    { "common-ref" : "WDS IPv4 Address Preference",
+      "name"       : "IPv4 Address Preference",
+      "id"         : "0x1E",
+      "mandatory"  : "no",
+      "type"       : "TLV",
+      "endian"     : "little",
+      "format"     : "guint32" },
+
+    { "common-ref"    : "WDS PCSCF Address Using PCO",
+      "name"          : "PCSCF Address Using PCO",
+      "id"            : "0x1F",
+      "mandatory"     : "no",
+      "type"          : "TLV",
+      "format"        : "guint8",
+      "public-format" : "gboolean" },
+
+    { "common-ref"    : "WDS PCSCF Address Using DHCP",
+      "name"          : "PCSCF Address Using DHCP",
+      "id"            : "0x21",
+      "mandatory"     : "no",
+      "type"          : "TLV",
+      "format"        : "guint8",
+      "public-format" : "gboolean" },
+
+    { "common-ref"    : "WDS IMCN Flag",
+      "name"          : "IMCN Flag",
+      "id"            : "0x22",
+      "mandatory"     : "no",
+      "type"          : "TLV",
+      "format"        : "guint8",
+      "public-format" : "gboolean" },
+
+    { "common-ref" : "WDS IPv6 Address Preference",
+      "name"       : "IPv6 Address Preference",
+      "id"         : "0x28",
+      "mandatory"  : "no",
+      "type"       : "TLV",
+      "format"     : "sequence",
+      "contents"   : [ { "name"         : "Address",
+                        "format"        : "array",
+                        "fixed-size"    : "8",
+                        "array-element" : { "format": "guint16", "endian": "network" } } ] },
+
+    { "common-ref"    : "WDS IPv6 Primary DNS Address Preference",
+      "name"          : "IPv6 Primary DNS Address Preference",
+      "id"            : "0x2B",
+      "mandatory"     : "no",
+      "type"          : "TLV",
+      "format"        : "array",
+      "fixed-size"    : "8",
+      "array-element" : { "format": "guint16", "endian": "network" } },
+
+    { "common-ref"    : "WDS IPv6 Secondary DNS Address Preference",
+      "name"          : "IPv6 Secondary DNS Address Preference",
+      "id"            : "0x2C",
+      "mandatory"     : "no",
+      "type"          : "TLV",
+      "format"        : "array",
+      "fixed-size"    : "8",
+      "array-element" : { "format": "guint16", "endian": "network" } }
+
 ]
diff --git a/data/qmi-service-wds.json b/data/qmi-service-wds.json
index 6e20823..f93edf7 100644
--- a/data/qmi-service-wds.json
+++ b/data/qmi-service-wds.json
@@ -674,139 +674,35 @@
                       "type"          : "TLV",
                       "format"        : "guint8",
                       "public-format" : "QmiWdsProfileType" },
-                    { "name"      : "Profile Name",
-                      "id"        : "0x10",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "string" },
-                    { "name"      : "PDP Type",
-                      "id"        : "0x11",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "guint8",
-                      "public-format" : "QmiWdsPdpType" },
+                    { "common-ref"    : "WDS Profile Name" },
+                    { "common-ref"    : "WDS PDP Type" },
                     // 0x12 PDP Header Compression Type
                     // 0x13 PDP Data Compression Type
-                    { "name"      : "APN Name",
-                      "id"        : "0x14",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "string" },
-                    { "name"      : "Primary IPv4 DNS Address",
-                      "id"        : "0x15",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "endian"    : "little",
-                      "format"    : "guint32" },
-                    { "name"      : "Secondary IPv4 DNS Address",
-                      "id"        : "0x16",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "endian"    : "little",
-                      "format"    : "guint32" },
+                    { "common-ref"    : "WDS APN Name" },
+                    { "common-ref"    : "WDS Primary IPv4 DNS Address" },
+                    { "common-ref"    : "WDS Secondary IPv4 DNS Address" },
                     // 0x17 UMTS Requested QoS
                     // 0x18 UMTS Minimum QoS
-                    { "name"      : "GPRS Requested QoS",
-                      "id"        : "0x19",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "sequence",
-                      "contents"  : [ { "name"   : "Precedence Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Delay Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Reliability Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Peak Throughput Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Mean Throughput Class",
-                                        "format" : "guint32" } ] },
-                    { "name"      : "GPRS Minimum QoS",
-                      "id"        : "0x1A",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "sequence",
-                      "contents"  : [ { "name"   : "Precedence Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Delay Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Reliability Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Peak Throughput Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Mean Throughput Class",
-                                        "format" : "guint32" } ] },
-                    { "name"      : "Username",
-                      "id"        : "0x1B",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "string" },
-                    { "name"      : "Password",
-                      "id"        : "0x1C",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "string" },
-                    { "name"      : "Authentication",
-                      "id"        : "0x1D",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "guint8",
-                      "public-format" : "QmiWdsAuthentication" },
-                    { "name"      : "IPv4 Address Preference",
-                      "id"        : "0x1E",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "endian"    : "little",
-                      "format"    : "guint32" },
-                    { "name"          : "PCSCF Address Using PCO",
-                      "id"            : "0x1F",
-                      "mandatory"     : "no",
-                      "type"          : "TLV",
-                      "format"        : "guint8",
-                      "public-format" : "gboolean" },
+                    { "common-ref"    : "WDS GPRS Requested QoS" },
+                    { "common-ref"    : "WDS GPRS Minimum QoS" },
+                    { "common-ref"    : "WDS Username" },
+                    { "common-ref"    : "WDS Password" },
+                    { "common-ref"    : "WDS Authentication" },
+                    { "common-ref"    : "WDS IPv4 Address Preference" },
+                    { "common-ref"    : "WDS PCSCF Address Using PCO" },
                     // 0x20, PDP access control flag
-                    { "name"          : "PCSCF Address Using DHCP",
-                      "id"            : "0x21",
-                      "mandatory"     : "no",
-                      "type"          : "TLV",
-                      "format"        : "guint8",
-                      "public-format" : "gboolean" },
-                    { "name"          : "IMCN Flag",
-                      "id"            : "0x22",
-                      "mandatory"     : "no",
-                      "type"          : "TLV",
-                      "format"        : "guint8",
-                      "public-format" : "gboolean" },
+                    { "common-ref"    : "WDS PCSCF Address Using DHCP" },
+                    { "common-ref"    : "WDS IMCN Flag" },
                     // 0x23, TFT ID1 Parameters
                     // 0x24, TFT ID2 Parameters
                     // 0x25, PDP context number
                     // 0x26, PDP context secondary flag
                     // 0x27, PDP context primary id
-                    { "name"      : "IPv6 Address Preference",
-                      "id"        : "0x28",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "sequence",
-                      "contents"  : [ { "name"          : "Address",
-                                        "format"        : "array",
-                                        "fixed-size"    : "8",
-                                        "array-element" : { "format": "guint16", "endian": "network" } } ] },
+                    { "common-ref"    : "WDS IPv6 Address Preference" },
                     // 0x29, UMTS requested QoS with Signaling Indication Flag
                     // 0x2A, UMTS minimum QoS with Signaling Indication Flag
-                    { "name"      : "IPv6 Primary DNS Address Preference",
-                      "id"        : "0x2B",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "array",
-                      "fixed-size": "8",
-                      "array-element" : { "format": "guint16", "endian": "network" } },
-                    { "name"      : "IPv6 Secondary DNS Address Preference",
-                      "id"        : "0x2C",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "array",
-                      "fixed-size": "8",
-                      "array-element" : { "format": "guint16", "endian": "network" } } ],
+                    { "common-ref"    : "WDS IPv6 Primary DNS Address Preference" },
+                    { "common-ref"    : "WDS IPv6 Secondary DNS Address Preference" } ],
                     // 0x2D, DHCP/NAS Preference
                     // 0x2E, 3GPP LTE QoS Parameters
                     // 0x2F, APN disabled flag
@@ -922,153 +818,50 @@
                                        "public-format" : "QmiWdsProfileType" },
                                      { "name"          : "Profile Index",
                                        "format"        : "guint8" } ] } ],
-     "output"  : [  { "common-ref" : "Operation Result" },
-                    { "name"      : "Profile Name",
-                      "id"        : "0x10",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "string",
+     "output"  : [  { "common-ref"    : "Operation Result" },
+                    { "common-ref"    : "WDS Profile Name",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "PDP Type",
-                      "id"        : "0x11",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "guint8",
-                      "public-format" : "QmiWdsPdpType",
+                    { "common-ref"    : "WDS PDP Type",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "APN Name",
-                      "id"        : "0x14",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "string",
+                    { "common-ref"    : "WDS APN Name",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "Primary IPv4 DNS Address",
-                      "id"        : "0x15",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "endian"    : "little",
-                      "format"    : "guint32",
+                    { "common-ref"    : "WDS Primary IPv4 DNS Address",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "Secondary IPv4 DNS Address",
-                      "id"        : "0x16",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "endian"    : "little",
-                      "format"    : "guint32",
+                    { "common-ref"    : "WDS Secondary IPv4 DNS Address",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
                     // 0x17 UMTS Requested QoS
                     // 0x18 UMTS Minimum QoS
-                    { "name"      : "GPRS Requested QoS",
-                      "id"        : "0x19",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "sequence",
-                      "contents"  : [ { "name"   : "Precedence Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Delay Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Reliability Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Peak Throughput Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Mean Throughput Class",
-                                        "format" : "guint32" } ],
+                    { "common-ref"    : "WDS GPRS Requested QoS",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "GPRS Minimum QoS",
-                      "id"        : "0x1A",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "sequence",
-                      "contents"  : [ { "name"   : "Precedence Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Delay Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Reliability Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Peak Throughput Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Mean Throughput Class",
-                                        "format" : "guint32" } ],
+                    { "common-ref"    : "WDS GPRS Minimum QoS",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "Username",
-                      "id"        : "0x1B",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "string",
+                    { "common-ref"    : "WDS Username",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "Password",
-                      "id"        : "0x1C",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "string",
+                    { "common-ref"    : "WDS Password",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "Authentication",
-                      "id"        : "0x1D",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "guint8",
-                      "public-format" : "QmiWdsAuthentication",
+                    { "common-ref"    : "WDS Authentication",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "IPv4 Address Preference",
-                      "id"        : "0x1E",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "endian"    : "little",
-                      "format"    : "guint32",
+                    { "common-ref"    : "WDS IPv4 Address Preference",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"          : "PCSCF Address Using PCO",
-                      "id"            : "0x1F",
-                      "mandatory"     : "no",
-                      "type"          : "TLV",
-                      "format"        : "guint8",
-                      "public-format" : "gboolean",
+                    { "common-ref"    : "WDS PCSCF Address Using PCO",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
                     // 0x20, PDP access control flag
-                    { "name"          : "PCSCF Address Using DHCP",
-                      "id"            : "0x21",
-                      "mandatory"     : "no",
-                      "type"          : "TLV",
-                      "format"        : "guint8",
-                      "public-format" : "gboolean",
+                    { "common-ref"    : "WDS PCSCF Address Using DHCP",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"          : "IMCN Flag",
-                      "id"            : "0x22",
-                      "mandatory"     : "no",
-                      "type"          : "TLV",
-                      "format"        : "guint8",
-                      "public-format" : "gboolean",
+                    { "common-ref"    : "WDS IMCN Flag",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
                     // 0x23, TFT ID1 Parameters
                     // 0x24, TFT ID2 Parameters
                     // 0x25, PDP context number
                     // 0x26, PDP context secondary flag
                     // 0x27, PDP context primary id
-                    { "name"      : "IPv6 Address Preference",
-                      "id"        : "0x28",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "sequence",
-                      "contents"  : [ { "name"          : "Address",
-                                        "format"        : "array",
-                                        "fixed-size"    : "8",
-                                        "array-element" : { "format": "guint16", "endian": "network" } } ] },
+                    { "common-ref"    : "WDS IPv6 Address Preference",
+                      "prerequisites" : [ { "common-ref" : "Success" } ] },
                     // 0x29, UMTS requested QoS with Signaling Indication Flag
                     // 0x2A, UMTS minimum QoS with Signaling Indication Flag
-                    { "name"      : "IPv6 Primary DNS Address Preference",
-                      "id"        : "0x2B",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "array",
-                      "fixed-size": "8",
-                      "array-element" : { "format": "guint16", "endian": "network" },
+                    { "common-ref"    : "WDS IPv6 Primary DNS Address Preference",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "IPv6 Secondary DNS Address Preference",
-                      "id"        : "0x2C",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "array",
-                      "fixed-size": "8",
-                      "array-element" : { "format": "guint16", "endian": "network" },
+                    { "common-ref"    : "WDS IPv6 Secondary DNS Address Preference",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
                     // 0x2D, DHCP/NAS Preference
                     // 0x2E, 3GPP LTE QoS Parameters
@@ -1129,152 +922,49 @@
                      "format"    :  "guint8",
                      "public-format" : "QmiWdsProfileType" } ],
      "output"  : [  { "common-ref" : "Operation Result" },
-                    { "name"      : "Profile Name",
-                      "id"        : "0x10",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "string",
+                    { "common-ref"    : "WDS Profile Name",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "PDP Type",
-                      "id"        : "0x11",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "guint8",
-                      "public-format" : "QmiWdsPdpType",
+                    { "common-ref"    : "WDS PDP Type",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "APN Name",
-                      "id"        : "0x14",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "string",
+                    { "common-ref"    : "WDS APN Name",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "Primary IPv4 DNS Address",
-                      "id"        : "0x15",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "endian"    : "little",
-                      "format"    : "guint32",
+                    { "common-ref"    : "WDS Primary IPv4 DNS Address",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "Secondary IPv4 DNS Address",
-                      "id"        : "0x16",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "endian"    : "little",
-                      "format"    : "guint32",
+                    { "common-ref"    : "WDS Secondary IPv4 DNS Address",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
                     // 0x17 UMTS Requested QoS
                     // 0x18 UMTS Minimum QoS
-                    { "name"      : "GPRS Requested QoS",
-                      "id"        : "0x19",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "sequence",
-                      "contents"  : [ { "name"   : "Precedence Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Delay Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Reliability Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Peak Throughput Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Mean Throughput Class",
-                                        "format" : "guint32" } ],
+                    { "common-ref"    : "WDS GPRS Requested QoS",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "GPRS Minimum QoS",
-                      "id"        : "0x1A",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "sequence",
-                      "contents"  : [ { "name"   : "Precedence Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Delay Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Reliability Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Peak Throughput Class",
-                                        "format" : "guint32" },
-                                      { "name"   : "Mean Throughput Class",
-                                        "format" : "guint32" } ],
+                    { "common-ref"    : "WDS GPRS Minimum QoS",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "Username",
-                      "id"        : "0x1B",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "string",
+                    { "common-ref"    : "WDS Username",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "Password",
-                      "id"        : "0x1C",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "string",
+                    { "common-ref"    : "WDS Password",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "Authentication",
-                      "id"        : "0x1D",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "guint8",
-                      "public-format" : "QmiWdsAuthentication",
+                    { "common-ref"    : "WDS Authentication",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "IPv4 Address Preference",
-                      "id"        : "0x1E",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "endian"    : "little",
-                      "format"    : "guint32",
+                    { "common-ref"    : "WDS IPv4 Address Preference",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"          : "PCSCF Address Using PCO",
-                      "id"            : "0x1F",
-                      "mandatory"     : "no",
-                      "type"          : "TLV",
-                      "format"        : "guint8",
-                      "public-format" : "gboolean",
+                    { "common-ref"    : "WDS PCSCF Address Using PCO",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
                     // 0x20, PDP access control flag
-                    { "name"          : "PCSCF Address Using DHCP",
-                      "id"            : "0x21",
-                      "mandatory"     : "no",
-                      "type"          : "TLV",
-                      "format"        : "guint8",
-                      "public-format" : "gboolean",
+                    { "common-ref"    : "WDS PCSCF Address Using DHCP",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"          : "IMCN Flag",
-                      "id"            : "0x22",
-                      "mandatory"     : "no",
-                      "type"          : "TLV",
-                      "format"        : "guint8",
-                      "public-format" : "gboolean",
+                    { "common-ref"    : "WDS IMCN Flag",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
                     // 0x23, TFT ID1 Parameters
                     // 0x24, TFT ID2 Parameters
                     // 0x25, PDP context number
                     // 0x26, PDP context secondary flag
                     // 0x27, PDP context primary id
-                    { "name"      : "IPv6 Address Preference",
-                      "id"        : "0x28",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "sequence",
-                      "contents"  : [ { "name"          : "Address",
-                                        "format"        : "array",
-                                        "fixed-size"    : "8",
-                                        "array-element" : { "format": "guint16", "endian": "network" } } ] },
+                    { "common-ref"    : "WDS IPv6 Address Preference",
+                      "prerequisites" : [ { "common-ref" : "Success" } ] },
                     // 0x29, UMTS requested QoS with Signaling Indication Flag
                     // 0x2A, UMTS minimum QoS with Signaling Indication Flag
-                    { "name"      : "IPv6 Primary DNS Address Preference",
-                      "id"        : "0x2B",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "array",
-                      "fixed-size": "8",
-                      "array-element" : { "format": "guint16", "endian": "network" },
+                    { "common-ref"    : "WDS IPv6 Primary DNS Address Preference",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "IPv6 Secondary DNS Address Preference",
-                      "id"        : "0x2C",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "array",
-                      "fixed-size": "8",
-                      "array-element" : { "format": "guint16", "endian": "network" },
+                    { "common-ref"    : "WDS IPv6 Secondary DNS Address Preference",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
                     // 0x2D, DHCP/NAS Preference
                     // 0x2E, 3GPP LTE QoS Parameters
@@ -1335,38 +1025,15 @@
                       "format"        : "guint32",
                       "public-format" : "QmiWdsGetCurrentSettingsRequestedSettings" } ],
      "output"  : [  { "common-ref" : "Operation Result" },
-                    { "name"      : "Profile Name",
-                      "id"        : "0x10",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "string",
+                    { "common-ref"    : "WDS Profile Name",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "PDP Type",
-                      "id"        : "0x11",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "guint8",
-                      "public-format" : "QmiWdsPdpType",
+                    { "common-ref"    : "WDS PDP Type",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "APN Name",
-                      "id"        : "0x14",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "string",
+                    { "common-ref"    : "WDS APN Name",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "Primary IPv4 DNS Address",
-                      "id"        : "0x15",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "endian"    : "little",
-                      "format"    : "guint32",
+                    { "common-ref"    : "WDS Primary IPv4 DNS Address",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "Secondary IPv4 DNS Address",
-                      "id"        : "0x16",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "endian"    : "little",
-                      "format"    : "guint32",
+                    { "common-ref"    : "WDS Secondary IPv4 DNS Address",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
                     { "name"      : "UMTS Granted QoS",
                       "id"        : "0x17",
@@ -1419,18 +1086,9 @@
                                       { "name"   : "Mean Throughput Class",
                                         "format" : "guint32" } ],
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "Username",
-                      "id"        : "0x1B",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "string",
+                    { "common-ref"    : "WDS Username",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
-                    { "name"      : "Authentication",
-                      "id"        : "0x1D",
-                      "mandatory" : "no",
-                      "type"      : "TLV",
-                      "format"    : "guint8",
-                      "public-format" : "QmiWdsAuthentication",
+                    { "common-ref"    : "WDS Authentication",
                       "prerequisites" : [ { "common-ref" : "Success" } ] },
                     { "name"      : "IPv4 Address",
                       "id"        : "0x1E",