oml/rsl: Catch-up with TLVDescription changes

With OML/RSL all Information Elements are tagged. OsmoNetwork has
been changed to not always emit a tag for TV/TLV fields. Introduce
an extension to make sure we always say that a tag needs to be
emitted.

3 files changed, 101 insertions, 83 deletions

diff --git a/fakebts/IPAOMLMsg.st b/fakebts/IPAOMLMsg.st
index 29b220a..58b5840 100644
--- a/fakebts/IPAOMLMsg.st
+++ b/fakebts/IPAOMLMsg.st
@@ -119,11 +119,11 @@ IPAOMLDataField subclass: IPAOMLRSLConnect [
     IPAOMLRSLConnect class >> tlvDescription [
         <category: 'parsing'>
         ^ OrderedCollection new
-            add: (TLVDescription new
+            add: (TLVDescription newOMLDescription
                 tag: 16r85; beTV; valueSize: 1;
                 instVarName: #streamid; parseClass: OMLAttributeData;
                 yourself);
-            add: (TLVDescription new
+            add: (TLVDescription newOMLDescription
                 tag: 16r81; beTV; valueSize: 2;
                 instVarName: #port; parseClass: OMLAttributeData;
                 yourself);
diff --git a/fakebts/OMLMsg.st b/fakebts/OMLMsg.st
index 91f9402..6afc659 100644
--- a/fakebts/OMLMsg.st
+++ b/fakebts/OMLMsg.st
@@ -26,6 +26,15 @@ Iterable extend [
     ]
 ]
 
+Osmo.TLVDescription class extend [
+    newOMLDescription [
+        <category: '*-BTS-OML-Msg'>
+        ^self new
+            beForceTagged;
+            yourself
+    ]
+]
+
 Object subclass: FOMObjectInstance [
     | bts trx ts |
     <category: 'BTS-OML-Msg'>
@@ -277,7 +286,7 @@ Object subclass: OMLAttribute [
 
         asTLVDescription [
             <category: 'parsing'>
-            ^ Osmo.TLVDescription new
+            ^ Osmo.TLVDescription newOMLDescription
                 parseClass: self;
                 tag: self attributeType;
                 yourself
@@ -1103,7 +1112,7 @@ OMLDataField subclass: OMLSWActivateRequest [
     OMLSWActivateRequest class >> tlvDescription [
         <category: 'parsing'>
         ^ OrderedCollection new
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrHWConfiguration;
                     instVarName: #hw_config;
                     parseClass: OMLAttributeData;
@@ -1257,82 +1266,82 @@ OMLDataField subclass: OMLSetBTSAttributes [
     OMLSetBTSAttributes class >> tlvDescription [
         <category: 'parsing'>
         ^ OrderedCollection new
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrInterferenceLevelBoundaries;
                     beOptional; beTV; valueSize: 6;
                     instVarName: #inter_bounds; parseClass: OMLAttributeData;
                     yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrIntave;
                     beOptional; beTV; valueSize: 1;
                     instVarName: #intave; parseClass: OMLAttributeData;
                     yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrConnectionFailureCriterion;
                     beOptional;
                     instVarName: #con_fail; parseClass: OMLAttributeData;
                     yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrT200;
                     beOptional; beTV; valueSize: 7;
                     instVarName: #t200; parseClass: OMLAttributeData;
                     yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrMaxTimingAdvance;
                     beOptional; beTV; valueSize: 1;
                     instVarName: #max_timing; parseClass: OMLAttributeData;
                     yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrOverloadPeriod;
                     beOptional;
                     instVarName: #overload_period; parseClass: OMLAttributeData;
                     yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrCCCHLoadThreshold;
                     beOptional; beTV; valueSize: 1;
                     instVarName: #ccch_threshold; parseClass: OMLAttributeData;
                     yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrCCCHLoadIndicationPeriod;
                     beOptional; beTV; valueSize: 1;
                     instVarName: #ccch_ind; parseClass: OMLAttributeData;
                     yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrRACHBusyThreshold;
                     beOptional; beTV; valueSize: 1;
                     instVarName: #rach_busy; parseClass: OMLAttributeData;
                     yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrRACHLoadAveragingSlots;
                     beOptional; beTV; valueSize: 2;
                     instVarName: #rach_load; parseClass: OMLAttributeData;
                     yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrBTSAirTimer;
                     beOptional; beTV; valueSize: 1;
                     instVarName: #bts_air; parseClass: OMLAttributeData;
                     yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrNy1;
                     beOptional; beTV; valueSize: 1;
                     instVarName: #ny1; parseClass: OMLAttributeData;
                     yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrBCCHArfcn;
                     beOptional; beTV; valueSize: 2;
                     instVarName: #bcch_arfcn; parseClass: OMLAttributeData;
                     yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrBSIC;
                     beOptional; beTV; valueSize: 1;
                     instVarName: #bsic; parseClass: OMLAttributeData;
                     yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrStartingTime;
                     beOptional; beTV; valueSize: 2;
                     instVarName: #time; parseClass: OMLAttributeData;
                     yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: 16r99; beOptional; instVarName: #ipa_cgi;
                     parseClass: OMLAttributeData; yourself);
             yourself
@@ -1447,12 +1456,12 @@ OMLDataField subclass: OMLSetRadioCarrierAttributes [
     OMLSetRadioCarrierAttributes class >> tlvDescription [
         <category: 'parsing'>
         ^ OrderedCollection new
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                   tag: OMLAttribute attrMaxPowerReduction;
                   beOptional; beTV; valueSize: 1;
                   instVarName: #max_power; parseClass: OMLAttributeData;
                   yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                   tag: OMLAttribute attrARFCNList;
                   beOptional;
                   instVarName: #arfcn_list; parseClass: OMLAttributeData;
@@ -1530,25 +1539,25 @@ OMLDataField subclass: OMLSetChannelAttributes [
             add: (OMLChannelCombination asTLVDescription
                     beOptional;
                     instVarName: #chan_comb; yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrHSN; beOptional; beTV; valueSize: 1;
                     parseClass: OMLAttributeData;
                     instVarName: #hsn; yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrMAIO; beOptional; beTV; valueSize: 1;
                     parseClass: OMLAttributeData;
                     instVarName: #maio; yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrARFCNList;
                     beOptional;
                     instVarName: #arfcn_list; parseClass: OMLAttributeData;
                     yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrStartingTime;
                     beOptional; beTV; valueSize: 2;
                     instVarName: #time; parseClass: OMLAttributeData;
                     yourself);
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrTSC;
                     beOptional; beTV; valueSize: 1;
                     instVarName: #tsc; parseClass: OMLAttributeData;
@@ -1597,7 +1606,7 @@ OMLDataField subclass: OMLGetAttributes [
     OMLGetAttributes class >> tlvDescription [
         <category: 'parsing'>
         ^ OrderedCollection new
-            add: (Osmo.TLVDescription new
+            add: (Osmo.TLVDescription newOMLDescription
                     tag: OMLAttribute attrRequiredAttributes;
                     beTLV; minSize: 1;
                     parseClass: OMLAttributeData;
diff --git a/fakebts/RSLMsg.st b/fakebts/RSLMsg.st
index c2a765f..1807baf 100644
--- a/fakebts/RSLMsg.st
+++ b/fakebts/RSLMsg.st
@@ -26,6 +26,15 @@ Iterable extend [
     ]
 ]
 
+Osmo.TLVDescription class extend [
+    newRSLDescription [
+        <category: '*-BTS-RSL-Msg'>
+        ^self new
+            beForceTagged;
+            yourself
+    ]
+]
+
 Osmo.TLVParserBase subclass: RSLMessageBase [
     <category: 'BTS-RSL'>
     <comment: 'I am the base of all RSL messages. I follow GSM 08.58'>
@@ -276,7 +285,7 @@ Object subclass: RSLMessageDefinitions [
     RSLMessageDefinitions class [
         channelNumberIE [
             <category: 'common-ie'>
-            ^ Osmo.TLVDescription new
+            ^ Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrChannelNumber;
                   instVarName: #channel_number; parseClass: RSLChannelNumber;
                   beTV; valueSize: 1; yourself.
@@ -284,7 +293,7 @@ Object subclass: RSLMessageDefinitions [
 
         linkIdentifierIE [
             <category: 'common-ie'>
-            ^ Osmo.TLVDescription new
+            ^ Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrLinkIdentifier;
                   instVarName: #link_id; parseClass: RSLAttributeData;
                   beTV; valueSize: 1; yourself
@@ -292,7 +301,7 @@ Object subclass: RSLMessageDefinitions [
 
         l3InfoIE [
             <category: 'common-ie'>
-            ^Osmo.TLVDescription new
+            ^Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrL3Information;
                   instVarName: #l3_info; parseClass: RSLAttributeData;
                   beTLV; beLen16; yourself
@@ -300,7 +309,7 @@ Object subclass: RSLMessageDefinitions [
 
 	causeIE [
             <category: 'common-ie'>
-	    ^ Osmo.TLVDescription new
+	    ^ Osmo.TLVDescription newRSLDescription
                 tag: RSLInformationElement attrCause;
                 instVarName: #cause; parseClass: RSLAttributeData;
                 beTLV; minSize: 1; yourself
@@ -329,7 +338,7 @@ Object subclass: RSLMessageDefinitions [
         errorIndicationMessage [
             <category: 'radio-link'>
             ^ self radioLinkMessageBase
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrRLMCause;
                   instVarName: #rlm_cause; parseClass: RSLAttributeData;
                   beTLV; minSize: 0 maxSize: 2; yourself);
@@ -349,7 +358,7 @@ Object subclass: RSLMessageDefinitions [
         establishIndicationMessage [
             <category: 'radio-link'>
             ^ self radioLinkMessageBase
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrL3Information;
                   instVarName: #l3_info; parseClass: RSLAttributeData;
                   beTLV; beOptional; beLen16; yourself);
@@ -369,7 +378,7 @@ Object subclass: RSLMessageDefinitions [
         releaseRequestMessage [
             <category: 'radio-link'>
             ^ self radioLinkMessageBase
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrReleaseMode;
                   instVarName: #release_mode; parseClass: RSLAttributeData;
                   beTV; valueSize: 1; yourself);
@@ -379,7 +388,7 @@ Object subclass: RSLMessageDefinitions [
         unitDataRequestMessage [
             <category: 'radio-link'>
             ^ self radioLinkMessageBase
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrL3Information;
                   instVarName: #l3_info; parseClass: RSLAttributeData;
                   minSize: 1 maxSize: 23;
@@ -402,71 +411,71 @@ Object subclass: RSLMessageDefinitions [
         channelActivationMessage [
             <category: 'dedicated-channel'>
             ^ self dedicatedChannelMessageBase
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrActivationType;
                   instVarName: #activation_type; parseClass: RSLAttributeData;
                   beTV; valueSize: 1; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrChannelMode;
                   instVarName: #channel_mode; parseClass: RSLAttributeData;
                   beTLV; minSize: 6 maxSize: 7; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrChannelIdentification;
                   instVarName: #channel_ident; parseClass: RSLAttributeData;
                   beOptional; beTLV; valueSize: 6; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrEncryptionInformation;
                   instVarName: #encr_info; parseClass: RSLAttributeData;
                   beOptional; beTLV; minSize: 1; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrHandoverReference;
                   instVarName: #handover_ref; parseClass: RSLAttributeData;
                   beConditional; beTV; valueSize: 1; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrBSPower;
                   instVarName: #bs_power; parseClass: RSLAttributeData;
                   beOptional; beTV; valueSize: 1; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrMSPower;
                   instVarName: #ms_power; parseClass: RSLAttributeData;
                   beOptional; beTV; valueSize: 1; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrTimingAdvance;
                   instVarName: #timing_advance; parseClass: RSLAttributeData;
                   beConditional; beTV; valueSize: 1; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrBSPowerParameters;
                   instVarName: #bs_powerparams; parseClass: RSLAttributeData;
                   beOptional; beTLV; minSize: 0; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrMSPowerParameters;
                   instVarName: #ms_powerparams; parseClass: RSLAttributeData;
                   beOptional; beTLV; minSize: 0; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrPhysicalContext;
                   instVarName: #physical_context; parseClass: RSLAttributeData;
                   beOptional; beTLV; minSize: 0; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrSacchInformation;
                   instVarName: #sacch_information; parseClass: RSLAttributeData;
                   beOptional; beTLV; minSize: 1; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrUIC;
                   instVarName: #uic; parseClass: RSLAttributeData;
                   beOptional; beTLV; valueSize: 1; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrMainChannelReference;
                   instVarName: #main_chan_ref; parseClass: RSLAttributeData;
                   beOptional; beTV; valueSize: 1; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrMultiRateConfiguration;
                   instVarName: #mr_conf; parseClass: RSLAttributeData;
                   beOptional; beTLV; minSize: 2; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrMultiRateControl;
                   instVarName: #mr_control; parseClass: RSLAttributeData;
                   beOptional; beTV; valueSize: 2; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrSupportedCodecTypes;
                   instVarName: #supported_codecs; parseClass: RSLAttributeData;
                   beOptional; beTLV; minSize: 3; yourself);
@@ -476,7 +485,7 @@ Object subclass: RSLMessageDefinitions [
         channelActivationAckMessage [
             <category: 'dedicated-channel'>
             ^ self dedicatedChannelMessageBase
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrFrameNumber;
                   instVarName: #frame_number; parseClass: RSLAttributeData;
                   beTV; valueSize: 2; yourself);
@@ -503,7 +512,7 @@ Object subclass: RSLMessageDefinitions [
 	handoverDetectionMessage [
 	    <category: 'dedicated-channel'>
 	    ^ self dedicatedChannelMessageBase
-		add: (Osmo.TLVDescription new
+		add: (Osmo.TLVDescription newRSLDescription
 		    tag: RSLInformationElement attrAccessDelay;
 		    instVarName: #access_delay; parseClass: RSLAttributeData;
 		    beOptional; beTV; valueSize: 1; yourself);
@@ -513,27 +522,27 @@ Object subclass: RSLMessageDefinitions [
 	modeModifyMessage [
 	    <category: 'dedicated-channel'>
 	    ^ self dedicatedChannelMessageBase
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrChannelMode;
                   instVarName: #channel_mode; parseClass: RSLAttributeData;
                   beTLV; minSize: 6 maxSize: 7; yourself);
-		add: (Osmo.TLVDescription new
+		add: (Osmo.TLVDescription newRSLDescription
 		  tag: RSLInformationElement attrEncryptionInformation;
 		  instVarName: #encr_info; parseClass: RSLAttributeData;
 		  beOptional; beTLV; minSize: 1; yourself);
-		add: (Osmo.TLVDescription new
+		add: (Osmo.TLVDescription newRSLDescription
 		  tag: RSLInformationElement attrMainChannelReference;
 		  instVarName: #main_channel; parseClass: RSLAttributeData;
 		  beOptional; beTV; minSize: 1; yourself);
-		add: (Osmo.TLVDescription new
+		add: (Osmo.TLVDescription newRSLDescription
 		  tag: RSLInformationElement attrMultiRateConfiguration;
 		  instVarName: #mr; parseClass: RSLAttributeData;
 		  beOptional; beTLV; minSize: 1; yourself);
-		add: (Osmo.TLVDescription new
+		add: (Osmo.TLVDescription newRSLDescription
 		  tag: RSLInformationElement attrMultiRateControl;
 		  instVarName: #mr_control; parseClass: RSLAttributeData;
 		  beOptional; beTV; valueSize: 1; yourself);
-		add: (Osmo.TLVDescription new
+		add: (Osmo.TLVDescription newRSLDescription
 		  tag: RSLInformationElement attrSupportedCodecTypes;
 		  instVarName: #codec; parseClass: RSLAttributeData;
 		  beOptional; beTLV; minSize: 3; yourself);
@@ -548,7 +557,7 @@ Object subclass: RSLMessageDefinitions [
 	modeModifyNack [
 	    <category: 'dedicated-channel'>
 	    ^ self dedicatedChannelMessageBase
-              add: (Osmo.TLVDescription new
+              add: (Osmo.TLVDescription newRSLDescription
                 tag: RSLInformationElement attrCause;
                 instVarName: #cause; parseClass: RSLAttributeData;
                 beTLV; minSize: 1; yourself);
@@ -558,7 +567,7 @@ Object subclass: RSLMessageDefinitions [
         encryptionCommandMessage [
             <category: 'dedicated-channel'>
             ^ self dedicatedChannelMessageBase
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrEncryptionInformation;
                   instVarName: #encr_info; parseClass: RSLAttributeData;
                   beTLV; minSize: 1; yourself);
@@ -587,15 +596,15 @@ Object subclass: RSLMessageDefinitions [
         bcchInformationMessage [
             <category: 'channel-management'>
             ^ self commonChannelManagementBase
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrSystemInfoType;
                   instVarName: #si_type; parseClass: RSLAttributeData;
                   beTV; valueSize: 1; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrFullBcchInformation;
                   instVarName: #full_bcch; parseClass: RSLAttributeData;
                   beOptional; beTLV; valueSize: 23; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrStartingTime;
                   instVarName: #start_time; parseClass: RSLAttributeData;
                   beOptional; beTV; valueSize: 1; yourself);
@@ -605,19 +614,19 @@ Object subclass: RSLMessageDefinitions [
 	pagingCommandMessage [
 	    <category: 'channel-management'>
 	    ^ self commonChannelManagementBase
-		add: (Osmo.TLVDescription new
+		add: (Osmo.TLVDescription newRSLDescription
 		 tag: RSLInformationElement attrPagingGroup;
 		 instVarName: #paging_group; parseClass: RSLAttributeData;
 		 beTV; valueSize: 1; yourself);
-		add: (Osmo.TLVDescription new
+		add: (Osmo.TLVDescription newRSLDescription
 		 tag: RSLInformationElement attrMSIdentifty;
 		 instVarName: #ms_identity; parseClass: RSLAttributeData;
 		 beTLV; minSize: 1 maxSize: 9; yourself);
-		add: (Osmo.TLVDescription new
+		add: (Osmo.TLVDescription newRSLDescription
 		 tag: RSLInformationElement attrChannelNeeded;
 		 instVarName: #channel_needed; parseClass: RSLAttributeData;
 		 beOptional; beTV; valueSize: 1; yourself);
-		add: (Osmo.TLVDescription new
+		add: (Osmo.TLVDescription newRSLDescription
 		 tag: RSLInformationElement attreMLPPPriority;
 		 instVarName: #emlpp;
 		 beOptional; beTV; valueSize: 2; yourself);
@@ -627,7 +636,7 @@ Object subclass: RSLMessageDefinitions [
         immediateAssignCommandMessage [
             <category: 'channel-management'>
             ^ self commonChannelManagementBase
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrFullImmediateAssignInfo;
                   instVarName: #full_info; parseClass: RSLAttributeData;
                   beOptional; beTLV; valueSize: 23; yourself);
@@ -637,15 +646,15 @@ Object subclass: RSLMessageDefinitions [
         channelRequiredMessage [
             <category: 'channel-management'>
             ^ self commonChannelManagementBase
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrRequestReference;
                   instVarName: #request_reference; parseClass: RSLAttributeData;
                   beTV; valueSize: 3; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrAccessDelay;
                   instVarName: #access_delay; parseClass: RSLAttributeData;
                   beTV; valueSize: 1; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrPhysicalContext;
                   instVarName: #physical_context; parseClass: RSLAttributeData;
                   beTLV; minSize: 0; beOptional; yourself);
@@ -660,15 +669,15 @@ Object subclass: RSLMessageDefinitions [
         sacchFillingMessage [
             <category: 'trx-management'>
             ^ self trxManagementMessageBase
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrSystemInfoType;
                   instVarName: #si_type; parseClass: RSLAttributeData;
                   beTV; valueSize: 1; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrL3Information;
                   instVarName: #l3_info; parseClass: RSLAttributeData;
                   beOptional; beTLV; beLen16; valueSize: 20; yourself);
-                add: (Osmo.TLVDescription new
+                add: (Osmo.TLVDescription newRSLDescription
                   tag: RSLInformationElement attrStartingTime;
                   instVarName: #start_time; parseClass: RSLAttributeData;
                   beOptional; beTV; valueSize: 1; yourself);
@@ -1165,19 +1174,19 @@ RSLRadioLinkManagement subclass: RSLReleaseIndication [
 RSLMessageDefinitions subclass: RSLIPAMessageDefinitions [
     RSLIPAMessageDefinitions class [
         connectionIdentifierIE [
-	    ^ Osmo.TLVDescription new
+	    ^ Osmo.TLVDescription newRSLDescription
 		tag: 16rF8; instVarName: #conn_id; parseClass: RSLAttributeData;
 		beTV; valueSize: 2; yourself
 	]
 
 	localIPIE [
-	    ^ Osmo.TLVDescription new
+	    ^ Osmo.TLVDescription newRSLDescription
 		tag: 16rF5; instVarName: #local_ip; parseClass: RSLAttributeData;
 		beTV; valueSize: 4; yourself
 	]
 
 	localPortIE [
-	    ^ Osmo.TLVDescription new
+	    ^ Osmo.TLVDescription newRSLDescription
 		tag: 16rF3; instVarName: #local_port; parseClass: RSLAttributeData;
 		beTV; valueSize: 2; yourself
 	]
@@ -1193,19 +1202,19 @@ RSLMessageDefinitions subclass: RSLIPAMessageDefinitions [
 	]
 
 	speechModeIE [
-	    ^ Osmo.TLVDescription new
+	    ^ Osmo.TLVDescription newRSLDescription
 		tag: 16rF4; instVarName: #speech_mode; parseClass: RSLAttributeData;
 		beTV; valueSize: 1; yourself
 	]
 
 	rtpPayloadTypeIE [
-	    ^ Osmo.TLVDescription new
+	    ^ Osmo.TLVDescription newRSLDescription
 		tag: 16rF2; instVarName: #rtp_payload; parseClass: RSLAttributeData;
 		beTV; valueSize: 1; yourself
 	]
 
 	connectionStatisticsIE [
-	    ^ Osmo.TLVDescription new
+	    ^ Osmo.TLVDescription newRSLDescription
 		tag: 16rF6; instVarName: #stats; parseClass: RSLAttributeData;
 		beTLV; valueSize: 28; yourself
 	]