osmith has submitted this change. (
https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41473?usp=email )
Change subject: pyhss_api_helper: add second default apn "*"
......................................................................
pyhss_api_helper: add second default apn "*"
Prepare to make HLR test TC_gsup_ul_subscriber_data pass with PyHSS,
which assumes that a second APN named "*" exists.
Change-Id: Ibac60f03d62dcb37889cd05a35ad106fc5eb1f5f
---
M _testenv/data/scripts/pyhss_api_helper.py
M hlr/pyhss/setup_db.sh
M hss/pyhss/setup_db.sh
3 files changed, 21 insertions(+), 5 deletions(-)
Approvals:
pespin: Looks good to me, but someone else must approve
Jenkins Builder: Verified
fixeria: Looks good to me, approved
diff --git a/_testenv/data/scripts/pyhss_api_helper.py
b/_testenv/data/scripts/pyhss_api_helper.py
index 09b220d..7517567 100755
--- a/_testenv/data/scripts/pyhss_api_helper.py
+++ b/_testenv/data/scripts/pyhss_api_helper.py
@@ -16,7 +16,7 @@
parser = argparse.ArgumentParser()
subparsers = parser.add_subparsers(title="action", dest="action",
required=True)
- subparser = subparsers.add_parser("add_default_apn")
+ subparser = subparsers.add_parser("add_default_apns")
subparser = subparsers.add_parser("add_subscr")
subparser.add_argument("--imsi", required=True)
@@ -32,8 +32,9 @@
args = parser.parse_args()
-def add_default_apn():
+def add_default_apns():
url = f"{api}/apn/"
+
print(f"PUT {url}")
payload = {
"apn_id": 1,
@@ -49,6 +50,21 @@
}
session.put(url, json=payload)
+ print(f"PUT {url}")
+ payload = {
+ "apn_id": 2,
+ "apn": "*",
+ "ip_version": 0,
+ "charging_characteristics": "0800",
+ "apn_ambr_dl": 0,
+ "apn_ambr_ul": 0,
+ "qci": 9,
+ "arp_priority": 4,
+ "arp_preemption_capability": 0,
+ "arp_preemption_vulnerability": 1,
+ }
+ session.put(url, json=payload)
+
def add_subscr():
# Previous tests may have left an entry in the AUC table
@@ -74,7 +90,7 @@
payload = {
"auc_id": args.auc_id,
"default_apn": "internet",
- "apn_list": "1",
+ "apn_list": "1,2",
"imsi": args.imsi,
"msisdn": args.msisdn,
}
diff --git a/hlr/pyhss/setup_db.sh b/hlr/pyhss/setup_db.sh
index 5fe0a71..3a51113 100755
--- a/hlr/pyhss/setup_db.sh
+++ b/hlr/pyhss/setup_db.sh
@@ -2,4 +2,4 @@
wait_for_port.py -p 8080
-pyhss_api_helper.py add_default_apn
+pyhss_api_helper.py add_default_apns
diff --git a/hss/pyhss/setup_db.sh b/hss/pyhss/setup_db.sh
index aa31d76..ecbaf39 100755
--- a/hss/pyhss/setup_db.sh
+++ b/hss/pyhss/setup_db.sh
@@ -2,7 +2,7 @@
wait_for_port.py -p 8080
pyhss_api_helper.py \
- add_default_apn
+ add_default_apns
# Create a test subscriber with IMSI=001010000000000
pyhss_api_helper.py \
--
To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/41473?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings?usp=email
Gerrit-MessageType: merged
Gerrit-Project: osmo-ttcn3-hacks
Gerrit-Branch: master
Gerrit-Change-Id: Ibac60f03d62dcb37889cd05a35ad106fc5eb1f5f
Gerrit-Change-Number: 41473
Gerrit-PatchSet: 2
Gerrit-Owner: osmith <[email protected]>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <[email protected]>
Gerrit-Reviewer: lynxis lazus <[email protected]>
Gerrit-Reviewer: osmith <[email protected]>
Gerrit-Reviewer: pespin <[email protected]>
