From 7ad177f3968d33479ed228089ead2b098b2bdedc Mon Sep 17 00:00:00 2001
From: Pau Espin Pedrol <pespin@sysmocom.de>
Date: Tue, 13 Mar 2018 20:05:27 +0100
Subject: [PATCH] example: Maintain different resources.conf for RnD and prod

We still want to maintain this file in the same osmo-gsm-tester repo
because we frequently neef to update the config when adding new
features.

Until now only 1 file was maintained (which was used for RnD setup), and
then when runnin in prod the jenkins script used sed to change the file
to accomodate slightly changes. This way is too hacky, so let's just
maintain too separate files, keeping the original resources.conf key
name used by osmo-gsm-tester free, so that jenkins job can symlink one
of the 2 files to it.

Take the chance to remove OctoBTS and Sysmocell5k from the RnD resources
file, as we don't have those them.

Change-Id: Ifec851c7ac6fca6b294e57dfe86b92f214ae8f42
---
 .gitignore                                    |  1 +
 example/resources.conf.prod                   | 96 +++++++++++++++++++
 .../{resources.conf => resources.conf.rnd}    | 17 ----
 3 files changed, 97 insertions(+), 17 deletions(-)
 create mode 100644 example/resources.conf.prod
 rename example/{resources.conf => resources.conf.rnd} (84%)

diff --git a/.gitignore b/.gitignore
index 1ab84d91..8d3479b7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ test_work
 state
 *.pyc
 selftest/trial_test/
+example/resources.conf
diff --git a/example/resources.conf.prod b/example/resources.conf.prod
new file mode 100644
index 00000000..1e8da539
--- /dev/null
+++ b/example/resources.conf.prod
@@ -0,0 +1,96 @@
+# all hardware and interfaces available to this osmo-gsm-tester
+
+ip_address:
+- addr: 10.42.42.2
+- addr: 10.42.42.3
+- addr: 10.42.42.4
+- addr: 10.42.42.5
+- addr: 10.42.42.6
+- addr: 10.42.42.7
+- addr: 10.42.42.8
+- addr: 10.42.42.9
+
+bts:
+- label: sysmoBTS 1002
+  type: osmo-bts-sysmo
+  ipa_unit_id: 1
+  addr: 10.42.42.114
+  band: GSM-1800
+  direct_pcu: true
+  ciphers: [a5_0, a5_1, a5_3]
+
+- label: Ettus B200
+  type: osmo-bts-trx
+  ipa_unit_id: 6
+  addr: 10.42.42.50
+  band: GSM-1800
+  launch_trx: true
+  ciphers: [a5_0, a5_1]
+
+- label: sysmoCell 5000
+  type: osmo-bts-trx
+  ipa_unit_id: 7
+  addr: 10.42.42.51
+  band: GSM-1800
+  trx_remote_ip: 10.42.42.112
+  ciphers: [a5_0, a5_1]
+
+- label: OCTBTS 3500
+  type: osmo-bts-octphy
+  ipa_unit_id: 8
+  addr: 10.42.42.52
+  band: GSM-1800
+  trx_list:
+  - hw_addr: 00:0c:90:2e:80:1e
+    net_device: enp2s0
+
+arfcn:
+  - arfcn: 512
+    band: GSM-1800
+  - arfcn: 514
+    band: GSM-1800
+  - arfcn: 516
+    band: GSM-1800
+  - arfcn: 518
+    band: GSM-1800
+  - arfcn: 520
+    band: GSM-1800
+  - arfcn: 540
+    band: GSM-1900
+  - arfcn: 542
+    band: GSM-1900
+  - arfcn: 544
+    band: GSM-1900
+  - arfcn: 546
+    band: GSM-1900
+  - arfcn: 548
+    band: GSM-1900
+
+modem:
+- label: sierra_1st
+  path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.7/1-1.7.2'
+  ki: 'EBAB63D06C3F546A16C977CB40E57C68'
+  auth_algo: 'comp128v1'
+  ciphers: [a5_0, a5_1]
+  features: ['sms', 'voice', 'ussd', 'gprs', 'sim']
+
+- label: sierra_2nd
+  path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.7/1-1.7.3'
+  ki: 'EBD2B5F6CF3374106D0A66C11F922001'
+  auth_algo: 'comp128v1'
+  ciphers: [a5_0, a5_1]
+  features: ['sms', 'voice', 'ussd', 'gprs', 'sim']
+
+- label: ec20
+  path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.7/1-1.7.6'
+  ki: '07F35D0A9476646169669401215580E0'
+  auth_algo: 'comp128v1'
+  ciphers: [a5_0, a5_1]
+  features: ['sms', 'ussd', 'gprs', 'sim']
+
+- label: gobi2k
+  path: '/sys/devices/pci0000:00/0000:00:12.2/usb1/1-1/1-1.7/1-1.7.5'
+  ki: '5752B3F43277C35D2D1D957007DF74E2'
+  auth_algo: 'comp128v1'
+  ciphers: [a5_0, a5_1]
+  features: ['gprs', 'sim']
diff --git a/example/resources.conf b/example/resources.conf.rnd
similarity index 84%
rename from example/resources.conf
rename to example/resources.conf.rnd
index cb730f51..4697bdc6 100644
--- a/example/resources.conf
+++ b/example/resources.conf.rnd
@@ -27,23 +27,6 @@ bts:
   launch_trx: true
   ciphers: [a5_0, a5_1]
 
-- label: sysmoCell 5000
-  type: osmo-bts-trx
-  ipa_unit_id: 7
-  addr: 10.42.42.51
-  band: GSM-1800
-  trx_remote_ip: 10.42.42.112
-  ciphers: [a5_0, a5_1]
-
-- label: OCTBTS 3500
-  type: osmo-bts-octphy
-  ipa_unit_id: 8
-  addr: 10.42.42.52
-  band: GSM-1800
-  trx_list:
-  - hw_addr: 00:0c:90:2e:80:1e
-    net_device: enp2s0
-
 arfcn:
   - arfcn: 512
     band: GSM-1800