Add support to enable EGPRS

Change-Id: I682f0c1b4cb97b704d646f18f54e748baaefd677

example/defaults.conf

@@ -31,6 +31,7 @@ bsc_bts:
   stream_id: 255
   osmobsc_bts_type: sysmobts
   channel_allocator: ascending
+  gprs_mode: gprs
   num_trx: 1
   max_trx: 1
   trx_list:

example/scenarios/mod-bts0-egprs.conf

@@ -0,0 +1,3 @@
+modifiers:
+  bts:
+  - gprs_mode: egprs

src/osmo_gsm_tester/bts_osmotrx.py

@@ -77,6 +77,7 @@ class OsmoBtsTrx(bts_osmo.OsmoBtsMainUnit):
                             'osmo_trx': {
                                 'bts_ip': self.remote_addr(),
                                 'trx_ip': self.trx_remote_ip(),
+                                'egprs': 'enable' if self.conf_for_bsc()['gprs_mode'] == 'egprs' else 'disable',
                                 'channels': [{} for trx_i in range(self.num_trx())]
                             }
                         }

src/osmo_gsm_tester/resource.py

@@ -57,6 +57,7 @@ RESOURCES_SCHEMA = {
         'bts[].direct_pcu': schema.BOOL_STR,
         'bts[].ciphers[]': schema.CIPHER,
         'bts[].channel_allocator': schema.CHAN_ALLOCATOR,
+        'bts[].gprs_mode': schema.GPRS_MODE,
         'bts[].num_trx': schema.UINT,
         'bts[].max_trx': schema.UINT,
         'bts[].trx_list[].addr': schema.IPV4,

src/osmo_gsm_tester/schema.py

@@ -110,6 +110,11 @@ def channel_allocator(val):
         return
     raise ValueError('Unknown Channel Allocator Policy %r' % val)
 
+def gprs_mode(val):
+    if val in ('none', 'gprs', 'egprs'):
+        return
+    raise ValueError('Unknown GPRS mode %r' % val)
+
 def codec(val):
     if val in ('hr1', 'hr2', 'hr3', 'fr1', 'fr2', 'fr3'):
         return
@@ -136,6 +141,7 @@ CIPHER = 'cipher'
 MODEM_FEATURE = 'modem_feature'
 PHY_CHAN = 'chan'
 CHAN_ALLOCATOR = 'chan_allocator'
+GPRS_MODE = 'gprs_mode'
 CODEC = 'codec'
 OSMO_TRX_CLOCK_REF = 'osmo_trx_clock_ref'
 
@@ -156,6 +162,7 @@ SCHEMA_TYPES = {
         MODEM_FEATURE: modem_feature,
         PHY_CHAN: phy_channel_config,
         CHAN_ALLOCATOR: channel_allocator,
+        GPRS_MODE: gprs_mode,
         CODEC: codec,
         OSMO_TRX_CLOCK_REF: osmo_trx_clock_ref,
     }

src/osmo_gsm_tester/templates/osmo-bsc.cfg.tmpl

@@ -57,8 +57,8 @@ network
 % endif
   ip.access unit_id ${bts.ipa_unit_id} 0
   oml ip.access stream_id ${bts.stream_id} line 0
-% if bts.get('sgsn', False):
-  gprs mode gprs
+% if bts.get('sgsn', False) and bts['gprs_mode'] != 'none':
+  gprs mode ${bts.gprs_mode}
   gprs routing area ${bts.routing_area_code}
   gprs network-control-order nc1
   gprs cell bvci ${bts.bvci}

src/osmo_gsm_tester/templates/osmo-trx.cfg.tmpl

@@ -18,7 +18,7 @@ trx
  bind-ip ${osmo_trx.trx_ip}
  remote-ip ${osmo_trx.bts_ip}
  base-port 5700
- egprs disable
+ egprs ${osmo_trx.egprs}
 %if osmo_trx.get('multi_arfcn', False):
  multi-arfcn enable
 %else: