<p>Vadim Yanitskiy has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13711">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">db_hlr.c: db_subscr_create(): nam_cs, nam_ps args<br><br>Allow creating new subscribers without giving them access to CS or PS.<br>This will be used by the create-subscriber-on-demand feature.<br><br>Related: OS#2542<br>Change-Id: I1a6dd85387723dab5487c53b33d2d9ec6d05d006<br>---<br>M src/db.c<br>M src/db.h<br>M src/db_hlr.c<br>M src/hlr_db_tool.c<br>M src/hlr_vty_subscr.c<br>M tests/db/db_test.c<br>M tests/db/db_test.err<br>7 files changed, 96 insertions(+), 37 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-hlr refs/changes/11/13711/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/db.c b/src/db.c</span><br><span>index 09e1776..770c3a4 100644</span><br><span>--- a/src/db.c</span><br><span>+++ b/src/db.c</span><br><span>@@ -66,7 +66,7 @@</span><br><span> [DB_STMT_UPD_PURGE_PS_BY_IMSI] = "UPDATE subscriber SET ms_purged_ps = $val WHERE imsi = $imsi",</span><br><span> [DB_STMT_UPD_NAM_CS_BY_IMSI] = "UPDATE subscriber SET nam_cs = $val WHERE imsi = $imsi",</span><br><span> [DB_STMT_UPD_NAM_PS_BY_IMSI] = "UPDATE subscriber SET nam_ps = $val WHERE imsi = $imsi",</span><br><span style="color: hsl(0, 100%, 40%);">- [DB_STMT_SUBSCR_CREATE] = "INSERT INTO subscriber (imsi) VALUES ($imsi)",</span><br><span style="color: hsl(120, 100%, 40%);">+ [DB_STMT_SUBSCR_CREATE] = "INSERT INTO subscriber (imsi, nam_cs, nam_ps) VALUES ($imsi, $nam_cs, $nam_ps)",</span><br><span> [DB_STMT_DEL_BY_ID] = "DELETE FROM subscriber WHERE id = $subscriber_id",</span><br><span> [DB_STMT_SET_MSISDN_BY_IMSI] = "UPDATE subscriber SET msisdn = $msisdn WHERE imsi = $imsi",</span><br><span> [DB_STMT_DELETE_MSISDN_BY_IMSI] = "UPDATE subscriber SET msisdn = NULL WHERE imsi = $imsi",</span><br><span>diff --git a/src/db.h b/src/db.h</span><br><span>index c438b8d..7187bb3 100644</span><br><span>--- a/src/db.h</span><br><span>+++ b/src/db.h</span><br><span>@@ -118,7 +118,7 @@</span><br><span> } u;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int db_subscr_create(struct db_context *dbc, const char *imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+int db_subscr_create(struct db_context *dbc, const char *imsi, int nam_cs, int nam_ps);</span><br><span> int db_subscr_delete_by_id(struct db_context *dbc, int64_t subscr_id);</span><br><span> </span><br><span> int db_subscr_update_msisdn_by_imsi(struct db_context *dbc, const char *imsi,</span><br><span>diff --git a/src/db_hlr.c b/src/db_hlr.c</span><br><span>index 3ba457c..e879ae8 100644</span><br><span>--- a/src/db_hlr.c</span><br><span>+++ b/src/db_hlr.c</span><br><span>@@ -44,9 +44,11 @@</span><br><span> /*! Add new subscriber record to the HLR database.</span><br><span> * \param[in,out] dbc database context.</span><br><span> * \param[in] imsi ASCII string of IMSI digits, is validated.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nam_cs CS Network access mode (1: enable, 0: disable)</span><br><span style="color: hsl(120, 100%, 40%);">+ * \param[in] nam_ps PS Network access mode (1: enable, 0: disable)</span><br><span> * \returns 0 on success, -EINVAL on invalid IMSI, -EIO on database error.</span><br><span> */</span><br><span style="color: hsl(0, 100%, 40%);">-int db_subscr_create(struct db_context *dbc, const char *imsi)</span><br><span style="color: hsl(120, 100%, 40%);">+int db_subscr_create(struct db_context *dbc, const char *imsi, int nam_cs, int nam_ps)</span><br><span> {</span><br><span> sqlite3_stmt *stmt;</span><br><span> int rc;</span><br><span>@@ -61,6 +63,10 @@</span><br><span> </span><br><span> if (!db_bind_text(stmt, "$imsi", imsi))</span><br><span> return -EIO;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!db_bind_int(stmt, "$nam_cs", nam_cs))</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EIO;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!db_bind_int(stmt, "$nam_ps", nam_ps))</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EIO;</span><br><span> </span><br><span> /* execute the statement */</span><br><span> rc = sqlite3_step(stmt);</span><br><span>diff --git a/src/hlr_db_tool.c b/src/hlr_db_tool.c</span><br><span>index 516b91e..93fd49b 100644</span><br><span>--- a/src/hlr_db_tool.c</span><br><span>+++ b/src/hlr_db_tool.c</span><br><span>@@ -302,7 +302,7 @@</span><br><span> </span><br><span> snprintf(imsi_str, sizeof(imsi_str), "%" PRId64, imsi);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = db_subscr_create(dbc, imsi_str);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = db_subscr_create(dbc, imsi_str, 1, 1);</span><br><span> if (rc < 0) {</span><br><span> LOGP(DDB, LOGL_ERROR, "OsmoNITB DB import to %s: failed to create IMSI %s: %d: %s\n",</span><br><span> dbc->fname,</span><br><span>diff --git a/src/hlr_vty_subscr.c b/src/hlr_vty_subscr.c</span><br><span>index 998d1be..89dcaff 100644</span><br><span>--- a/src/hlr_vty_subscr.c</span><br><span>+++ b/src/hlr_vty_subscr.c</span><br><span>@@ -220,7 +220,7 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- rc = db_subscr_create(g_hlr->dbc, imsi);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = db_subscr_create(g_hlr->dbc, imsi, 1, 1);</span><br><span> </span><br><span> if (rc) {</span><br><span> if (rc == -EEXIST)</span><br><span>diff --git a/tests/db/db_test.c b/tests/db/db_test.c</span><br><span>index 56905a9..0ec366b 100644</span><br><span>--- a/tests/db/db_test.c</span><br><span>+++ b/tests/db/db_test.c</span><br><span>@@ -221,37 +221,37 @@</span><br><span> </span><br><span> comment("Create with valid / invalid IMSI");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ASSERT_RC(db_subscr_create(dbc, imsi0), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, imsi0, 1, 1), 0);</span><br><span> ASSERT_SEL(imsi, imsi0, 0);</span><br><span> id0 = g_subscr.id;</span><br><span style="color: hsl(0, 100%, 40%);">- ASSERT_RC(db_subscr_create(dbc, imsi1), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, imsi1, 1, 1), 0);</span><br><span> ASSERT_SEL(imsi, imsi1, 0);</span><br><span> id1 = g_subscr.id;</span><br><span style="color: hsl(0, 100%, 40%);">- ASSERT_RC(db_subscr_create(dbc, imsi2), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, imsi2, 1, 1), 0);</span><br><span> ASSERT_SEL(imsi, imsi2, 0);</span><br><span> id2 = g_subscr.id;</span><br><span style="color: hsl(0, 100%, 40%);">- ASSERT_RC(db_subscr_create(dbc, imsi0), -EIO);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, imsi0, 1, 1), -EIO);</span><br><span> ASSERT_SEL(imsi, imsi0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- ASSERT_RC(db_subscr_create(dbc, imsi1), -EIO);</span><br><span style="color: hsl(0, 100%, 40%);">- ASSERT_RC(db_subscr_create(dbc, imsi1), -EIO);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, imsi1, 1, 1), -EIO);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, imsi1, 1, 1), -EIO);</span><br><span> ASSERT_SEL(imsi, imsi1, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- ASSERT_RC(db_subscr_create(dbc, imsi2), -EIO);</span><br><span style="color: hsl(0, 100%, 40%);">- ASSERT_RC(db_subscr_create(dbc, imsi2), -EIO);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, imsi2, 1, 1), -EIO);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, imsi2, 1, 1), -EIO);</span><br><span> ASSERT_SEL(imsi, imsi2, 0);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ASSERT_RC(db_subscr_create(dbc, "123456789 000003"), -EINVAL);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, "123456789 000003", 1, 1), -EINVAL);</span><br><span> ASSERT_SEL(imsi, "123456789000003", -ENOENT);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ASSERT_RC(db_subscr_create(dbc, "123456789000002123456"), -EINVAL);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, "123456789000002123456", 1, 1), -EINVAL);</span><br><span> ASSERT_SEL(imsi, "123456789000002123456", -ENOENT);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ASSERT_RC(db_subscr_create(dbc, "foobar123"), -EINVAL);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, "foobar123", 1, 1), -EINVAL);</span><br><span> ASSERT_SEL(imsi, "foobar123", -ENOENT);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ASSERT_RC(db_subscr_create(dbc, "123"), -EINVAL);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, "123", 1, 1), -EINVAL);</span><br><span> ASSERT_SEL(imsi, "123", -ENOENT);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ASSERT_RC(db_subscr_create(dbc, short_imsi), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, short_imsi, 1, 1), 0);</span><br><span> ASSERT_SEL(imsi, short_imsi, 0);</span><br><span> id_short = g_subscr.id;</span><br><span> </span><br><span>@@ -452,6 +452,22 @@</span><br><span> ASSERT_RC(db_subscr_delete_by_id(dbc, id_short), 0);</span><br><span> ASSERT_SEL(imsi, short_imsi, -ENOENT);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ comment("Create and delete subscribers with non-default nam_cs and nam_ps");</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, imsi0, 0, 0), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_SEL(imsi, imsi0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ id0 = g_subscr.id;</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, imsi1, 0, 1), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_SEL(imsi, imsi1, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ id1 = g_subscr.id;</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, imsi2, 1, 0), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_SEL(imsi, imsi2, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ id2 = g_subscr.id;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_delete_by_id(dbc, id0), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_delete_by_id(dbc, id1), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_delete_by_id(dbc, id2), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> comment_end();</span><br><span> }</span><br><span> </span><br><span>@@ -495,7 +511,7 @@</span><br><span> </span><br><span> comment("Create subscriber");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ASSERT_RC(db_subscr_create(dbc, imsi0), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, imsi0, 1, 1), 0);</span><br><span> ASSERT_SEL(imsi, imsi0, 0);</span><br><span> </span><br><span> id = g_subscr.id;</span><br><span>@@ -707,7 +723,7 @@</span><br><span> </span><br><span> comment("Re-add subscriber and verify auth data didn't come back");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ASSERT_RC(db_subscr_create(dbc, imsi0), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, imsi0, 1, 1), 0);</span><br><span> ASSERT_SEL(imsi, imsi0, 0);</span><br><span> </span><br><span> /* For this test to work, we want to get the same subscriber ID back,</span><br><span>@@ -739,7 +755,7 @@</span><br><span> </span><br><span> comment("Create subscriber");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- ASSERT_RC(db_subscr_create(dbc, imsi0), 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSERT_RC(db_subscr_create(dbc, imsi0, 1, 1), 0);</span><br><span> ASSERT_SEL(imsi, imsi0, 0);</span><br><span> </span><br><span> id = g_subscr.id;</span><br><span>diff --git a/tests/db/db_test.err b/tests/db/db_test.err</span><br><span>index 6ebdae2..bfab345 100644</span><br><span>--- a/tests/db/db_test.err</span><br><span>+++ b/tests/db/db_test.err</span><br><span>@@ -3,7 +3,7 @@</span><br><span> </span><br><span> --- Create with valid / invalid IMSI</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_subscr_create(dbc, imsi0) --> 0</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, imsi0, 1, 1) --> 0</span><br><span> </span><br><span> db_subscr_get_by_imsi(dbc, imsi0, &g_subscr) --> 0</span><br><span> struct hlr_subscriber {</span><br><span>@@ -11,7 +11,7 @@</span><br><span> .imsi = '123456789000000',</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_subscr_create(dbc, imsi1) --> 0</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, imsi1, 1, 1) --> 0</span><br><span> </span><br><span> db_subscr_get_by_imsi(dbc, imsi1, &g_subscr) --> 0</span><br><span> struct hlr_subscriber {</span><br><span>@@ -19,7 +19,7 @@</span><br><span> .imsi = '123456789000001',</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_subscr_create(dbc, imsi2) --> 0</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, imsi2, 1, 1) --> 0</span><br><span> </span><br><span> db_subscr_get_by_imsi(dbc, imsi2, &g_subscr) --> 0</span><br><span> struct hlr_subscriber {</span><br><span>@@ -27,7 +27,7 @@</span><br><span> .imsi = '123456789000002',</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_subscr_create(dbc, imsi0) --> -EIO</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, imsi0, 1, 1) --> -EIO</span><br><span> DAUC IMSI='123456789000000': Cannot create subscriber: SQL error: (2067) UNIQUE constraint failed: subscriber.imsi</span><br><span> </span><br><span> db_subscr_get_by_imsi(dbc, imsi0, &g_subscr) --> 0</span><br><span>@@ -36,10 +36,10 @@</span><br><span> .imsi = '123456789000000',</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_subscr_create(dbc, imsi1) --> -EIO</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, imsi1, 1, 1) --> -EIO</span><br><span> DAUC IMSI='123456789000001': Cannot create subscriber: SQL error: (2067) UNIQUE constraint failed: subscriber.imsi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_subscr_create(dbc, imsi1) --> -EIO</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, imsi1, 1, 1) --> -EIO</span><br><span> DAUC IMSI='123456789000001': Cannot create subscriber: SQL error: (2067) UNIQUE constraint failed: subscriber.imsi</span><br><span> </span><br><span> db_subscr_get_by_imsi(dbc, imsi1, &g_subscr) --> 0</span><br><span>@@ -48,10 +48,10 @@</span><br><span> .imsi = '123456789000001',</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_subscr_create(dbc, imsi2) --> -EIO</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, imsi2, 1, 1) --> -EIO</span><br><span> DAUC IMSI='123456789000002': Cannot create subscriber: SQL error: (2067) UNIQUE constraint failed: subscriber.imsi</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_subscr_create(dbc, imsi2) --> -EIO</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, imsi2, 1, 1) --> -EIO</span><br><span> DAUC IMSI='123456789000002': Cannot create subscriber: SQL error: (2067) UNIQUE constraint failed: subscriber.imsi</span><br><span> </span><br><span> db_subscr_get_by_imsi(dbc, imsi2, &g_subscr) --> 0</span><br><span>@@ -60,31 +60,31 @@</span><br><span> .imsi = '123456789000002',</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_subscr_create(dbc, "123456789 000003") --> -EINVAL</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, "123456789 000003", 1, 1) --> -EINVAL</span><br><span> DAUC Cannot create subscriber: invalid IMSI: '123456789 000003'</span><br><span> </span><br><span> db_subscr_get_by_imsi(dbc, "123456789000003", &g_subscr) --> -ENOENT</span><br><span> DAUC Cannot read subscriber from db: IMSI='123456789000003': No such subscriber</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_subscr_create(dbc, "123456789000002123456") --> -EINVAL</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, "123456789000002123456", 1, 1) --> -EINVAL</span><br><span> DAUC Cannot create subscriber: invalid IMSI: '123456789000002123456'</span><br><span> </span><br><span> db_subscr_get_by_imsi(dbc, "123456789000002123456", &g_subscr) --> -ENOENT</span><br><span> DAUC Cannot read subscriber from db: IMSI='123456789000002123456': No such subscriber</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_subscr_create(dbc, "foobar123") --> -EINVAL</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, "foobar123", 1, 1) --> -EINVAL</span><br><span> DAUC Cannot create subscriber: invalid IMSI: 'foobar123'</span><br><span> </span><br><span> db_subscr_get_by_imsi(dbc, "foobar123", &g_subscr) --> -ENOENT</span><br><span> DAUC Cannot read subscriber from db: IMSI='foobar123': No such subscriber</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_subscr_create(dbc, "123") --> -EINVAL</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, "123", 1, 1) --> -EINVAL</span><br><span> DAUC Cannot create subscriber: invalid IMSI: '123'</span><br><span> </span><br><span> db_subscr_get_by_imsi(dbc, "123", &g_subscr) --> -ENOENT</span><br><span> DAUC Cannot read subscriber from db: IMSI='123': No such subscriber</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_subscr_create(dbc, short_imsi) --> 0</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, short_imsi, 1, 1) --> 0</span><br><span> </span><br><span> db_subscr_get_by_imsi(dbc, short_imsi, &g_subscr) --> 0</span><br><span> struct hlr_subscriber {</span><br><span>@@ -752,6 +752,43 @@</span><br><span> db_subscr_get_by_imsi(dbc, short_imsi, &g_subscr) --> -ENOENT</span><br><span> DAUC Cannot read subscriber from db: IMSI='123456': No such subscriber</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+--- Create and delete subscribers with non-default nam_cs and nam_ps</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, imsi0, 0, 0) --> 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_get_by_imsi(dbc, imsi0, &g_subscr) --> 0</span><br><span style="color: hsl(120, 100%, 40%);">+struct hlr_subscriber {</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ .imsi = '123456789000000',</span><br><span style="color: hsl(120, 100%, 40%);">+ .nam_cs = false,</span><br><span style="color: hsl(120, 100%, 40%);">+ .nam_ps = false,</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, imsi1, 0, 1) --> 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_get_by_imsi(dbc, imsi1, &g_subscr) --> 0</span><br><span style="color: hsl(120, 100%, 40%);">+struct hlr_subscriber {</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = 2,</span><br><span style="color: hsl(120, 100%, 40%);">+ .imsi = '123456789000001',</span><br><span style="color: hsl(120, 100%, 40%);">+ .nam_cs = false,</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, imsi2, 1, 0) --> 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_get_by_imsi(dbc, imsi2, &g_subscr) --> 0</span><br><span style="color: hsl(120, 100%, 40%);">+struct hlr_subscriber {</span><br><span style="color: hsl(120, 100%, 40%);">+ .id = 3,</span><br><span style="color: hsl(120, 100%, 40%);">+ .imsi = '123456789000002',</span><br><span style="color: hsl(120, 100%, 40%);">+ .nam_ps = false,</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_delete_by_id(dbc, id0) --> 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_delete_by_id(dbc, id1) --> 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_delete_by_id(dbc, id2) --> 0</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> ===== test_subscr_create_update_sel_delete: SUCCESS</span><br><span> </span><br><span> </span><br><span>@@ -769,7 +806,7 @@</span><br><span> </span><br><span> --- Create subscriber</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_subscr_create(dbc, imsi0) --> 0</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, imsi0, 1, 1) --> 0</span><br><span> </span><br><span> db_subscr_get_by_imsi(dbc, imsi0, &g_subscr) --> 0</span><br><span> struct hlr_subscriber {</span><br><span>@@ -1259,7 +1296,7 @@</span><br><span> </span><br><span> --- Re-add subscriber and verify auth data didn't come back</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_subscr_create(dbc, imsi0) --> 0</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, imsi0, 1, 1) --> 0</span><br><span> </span><br><span> db_subscr_get_by_imsi(dbc, imsi0, &g_subscr) --> 0</span><br><span> struct hlr_subscriber {</span><br><span>@@ -1306,7 +1343,7 @@</span><br><span> </span><br><span> --- Create subscriber</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-db_subscr_create(dbc, imsi0) --> 0</span><br><span style="color: hsl(120, 100%, 40%);">+db_subscr_create(dbc, imsi0, 1, 1) --> 0</span><br><span> </span><br><span> db_subscr_get_by_imsi(dbc, imsi0, &g_subscr) --> 0</span><br><span> struct hlr_subscriber {</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13711">change 13711</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13711"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hlr </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I1a6dd85387723dab5487c53b33d2d9ec6d05d006 </div>
<div style="display:none"> Gerrit-Change-Number: 13711 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Vadim Yanitskiy <axilirator@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>