[MERGED] osmo-bts[master]: virtual: Correctly set+report BTS variant in OML attributes

[Harald Welte]

Harald Welte has submitted this change and it was merged.

Change subject: virtual: Correctly set+report BTS variant in OML attributes
......................................................................


virtual: Correctly set+report BTS variant in OML attributes

Change-Id: I76dc47427ec26834859fb737bd319dc379ae8697
---
M include/osmo-bts/gsm_data_shared.h
M src/common/gsm_data_shared.c
M src/osmo-bts-virtual/main.c
3 files changed, 3 insertions(+), 0 deletions(-)

Approvals:
  Harald Welte: Looks good to me, approved
  Jenkins Builder: Verified



diff --git a/include/osmo-bts/gsm_data_shared.h b/include/osmo-bts/gsm_data_shared.h
index b19bc90..aebdb65 100644
--- a/include/osmo-bts/gsm_data_shared.h
+++ b/include/osmo-bts/gsm_data_shared.h
@@ -422,6 +422,7 @@
 	BTS_OSMO_OCTPHY,
 	BTS_OSMO_SYSMO,
 	BTS_OSMO_TRX,
+	BTS_OSMO_VIRTUAL,
 	_NUM_BTS_VARIANT
 };
 
diff --git a/src/common/gsm_data_shared.c b/src/common/gsm_data_shared.c
index a7a1725..d11b186 100644
--- a/src/common/gsm_data_shared.c
+++ b/src/common/gsm_data_shared.c
@@ -74,6 +74,7 @@
 	{ BTS_OSMO_OCTPHY,	"osmo-bts-octphy" },
 	{ BTS_OSMO_SYSMO,	"osmo-bts-sysmo" },
 	{ BTS_OSMO_TRX,		"omso-bts-trx" },
+	{ BTS_OSMO_VIRTUAL,	"omso-bts-virtual" },
 	{ 0, NULL }
 };
 
diff --git a/src/osmo-bts-virtual/main.c b/src/osmo-bts-virtual/main.c
index 62376a7..81fb958 100644
--- a/src/osmo-bts-virtual/main.c
+++ b/src/osmo-bts-virtual/main.c
@@ -56,6 +56,7 @@
 
 int bts_model_init(struct gsm_bts *bts)
 {
+	bts->variant = BTS_OSMO_VIRTUAL;
 	bts->support.ciphers = CIPHER_A5(1) | CIPHER_A5(2) | CIPHER_A5(3);
 
 	gsm_bts_set_feature(bts, BTS_FEAT_OML_ALERTS);

-- 
To view, visit https://gerrit.osmocom.org/7343
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I76dc47427ec26834859fb737bd319dc379ae8697
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Owner: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder