add virt-nitb: a fully virtual network with 2 MS

Change-Id: I31cf24006ea9ceb83622aedef22046c53db90142
diff --git a/virt-nitb/osmo-bsc.cfg b/virt-nitb/osmo-bsc.cfg
index 63b574a..a9528d9 100644
--- a/virt-nitb/osmo-bsc.cfg
+++ b/virt-nitb/osmo-bsc.cfg
@@ -1,19 +1,3 @@
-# DO NET EDIT THIS FILE DIRECTLY!
-# This is generated from templates, and manual edits will be overwritten.
-
-stats interval 5
-!
-stats reporter statsd
-  disable
-  remote-ip 127.0.0.1
-  remote-port 9125
-  level global
-  no prefix
-  enable
-!
-line vty
- no login
-!
 e1_input
  e1_line 0 driver ipa
  e1_line 0 port 0
@@ -34,24 +18,18 @@
 
  bts 0
   description my test BTS 0
-  type sysmobts
+  type osmo-bts
   band GSM-1800
-  ip.access unit_id 0 0
+  ip.access unit_id 1 0
   location_area_code 23
   cell_identity 0
   base_station_id_code 0
   codec-support fr amr
-  amr tch-f modes 3
-  amr tch-f start-mode 3
-  amr tch-h modes 3
-  amr tch-h start-mode 3
-  gprs mode gprs
-  gprs nsvc 0 remote ip 127.0.0.3
-  gprs nsvc 0 remote udp port 23000
-  gprs nsvc 0 local udp port 23000
-  gprs nsvc 0 nsvci 0
-  gprs nsei 0
-  gprs cell bvci 1000
+  amr tch-f modes 2 3 5 7
+  amr tch-f start-mode 2
+  amr tch-h modes 2 3 5
+  amr tch-h start-mode 2
+  gprs mode none
   trx 0
    arfcn 512
    description my test BTS 0
@@ -59,73 +37,31 @@
    nominal power 23
    max_power_red 22
    timeslot 0
-    phys_chan_config CCCH+SDCCH4
+    phys_chan_config ccch
    timeslot 1
-    phys_chan_config SDCCH8
+    phys_chan_config sdcch8
    timeslot 2
-    phys_chan_config TCH/H
+    phys_chan_config tch/f
    timeslot 3
-    phys_chan_config TCH/H
+    phys_chan_config tch/f
    timeslot 4
-    phys_chan_config TCH/H
+    phys_chan_config tch/f
    timeslot 5
-    phys_chan_config TCH/H
+    phys_chan_config tch/f
    timeslot 6
-    phys_chan_config TCH/H
+    phys_chan_config tch/f
    timeslot 7
-    phys_chan_config PDCH
- bts 1
-  description my test BTS 1
-  type sysmobts
-  band GSM-1800
-  ip.access unit_id 1 0
-  location_area_code 23
-  cell_identity 1
-  base_station_id_code 1
-  codec-support fr amr
-  amr tch-f modes 3
-  amr tch-f start-mode 3
-  amr tch-h modes 3
-  amr tch-h start-mode 3
-  gprs mode gprs
-  gprs nsvc 0 remote ip 127.0.0.3
-  gprs nsvc 0 remote udp port 7777
-  gprs nsvc 0 local udp port 23000
-  gprs nsvc 0 nsvci 1
-  gprs nsei 1
-  gprs cell bvci 1001
-  trx 0
-   arfcn 514
-   description my test BTS 1
-   rf_locked 0
-   nominal power 23
-   max_power_red 22
-   timeslot 0
-    phys_chan_config CCCH+SDCCH4
-   timeslot 1
-    phys_chan_config SDCCH8
-   timeslot 2
-    phys_chan_config TCH/H
-   timeslot 3
-    phys_chan_config TCH/H
-   timeslot 4
-    phys_chan_config TCH/H
-   timeslot 5
-    phys_chan_config TCH/H
-   timeslot 6
-    phys_chan_config TCH/H
-   timeslot 7
-    phys_chan_config PDCH
+    phys_chan_config tch/f
 
 msc 0
  mgw remote-ip 127.0.0.3
  mgw remote-port 2427
  mgw endpoint-domain bsc
  allow-emergency deny
- codec-list hr3
- amr-config 12_2k forbidden
+ codec-list fr3 hr3 fr2 fr1 hr1
+ amr-config 12_2k allowed
  amr-config 10_2k forbidden
- amr-config 7_95k forbidden
+ amr-config 7_95k allowed
  amr-config 7_40k forbidden
  amr-config 6_70k allowed
  amr-config 5_90k allowed
@@ -141,7 +77,6 @@
  logging print file basename last
  logging print extended-timestamp 1
  logging level set-all debug
-
  logging level hodec info
  logging level ho info
  logging level nm info
@@ -152,6 +87,7 @@
  logging level lsccp notice
  logging level lsua notice
  logging level lm3ua notice
+
 log file current_log/osmo-bsc.log
  logging filter all 1
  logging color 1
@@ -161,7 +97,6 @@
  logging print file basename last
  logging print extended-timestamp 1
  logging level set-all debug
-
  logging level hodec info
  logging level ho info
  logging level nm info
@@ -172,6 +107,7 @@
  logging level lsccp notice
  logging level lsua notice
  logging level lm3ua notice
+
 log gsmtap 127.0.0.9
  logging filter all 1
  logging color 1
@@ -181,7 +117,6 @@
  logging print file basename last
  logging print extended-timestamp 1
  logging level set-all debug
-
  logging level hodec info
  logging level ho info
  logging level nm info