Merge remote-tracking branch 'origin/ci-refactor-core-handling' into integration_2025_w14_p1 (!3322)
Refactor core network handling in CI, harmonize code Prior to change set, there is a highly heterogeneous situation for core network management in CI code: some log collection is done from groovy files (when it could be done in python, which is easier for local development), there are multiple commands to start a CN from XML files, the code for starting a CN is always different (no one unified way to start "any" CN), Ping/Iperf require some support in ci_infra.yaml, ... To help with the above, refactor the handling of core networks in the CI code as follows: - define all CNs in ci_infra.yaml (basically how to deploy, undeploy, collect logs, and on which node) - make one Python class that reads from ci_infra.yaml and that allows to start/stop previously defined CNs (and add unit tests...) - make one XML command for start/stop of CNs, leveraging above class - leverage the CNs defined in ci_infra.yaml consistently in Ping()/Iperf() - delete old code Furthermore, the following supporting changes/bugfixes are done: - repair Iperf2_Unidir() and add unit test - fix a number of invalid escape sequence errors (there are some remaining, which I will do soon) - various bug fixes - remove unused XML steps
This commit is contained in:
@@ -0,0 +1,93 @@
|
||||
CREATE KEYSPACE IF NOT EXISTS vhss WITH replication = {'class': 'NetworkTopologyStrategy', 'DC1': '1'};
|
||||
|
||||
CREATE TABLE IF NOT EXISTS vhss.users_imsi (
|
||||
imsi text PRIMARY KEY,
|
||||
access_restriction int,
|
||||
idmmeidentity int,
|
||||
imei text,
|
||||
imei_sv text,
|
||||
key text,
|
||||
lipa_permissions text,
|
||||
mme_cap int,
|
||||
mmehost text,
|
||||
mmeidentity_idmmeidentity int,
|
||||
mmerealm text,
|
||||
ms_ps_status text,
|
||||
msisdn bigint,
|
||||
niddvalidity text,
|
||||
nir_dest_host text,
|
||||
nir_dest_realm text,
|
||||
opc text,
|
||||
pgw_id int,
|
||||
rand text,
|
||||
rfsp_index varint,
|
||||
sqn bigint,
|
||||
subscription_data text,
|
||||
ue_reachability varint,
|
||||
urrp_mme varint,
|
||||
user_identifier text,
|
||||
visited_plmnid text);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS vhss.msisdn_imsi (
|
||||
msisdn bigint PRIMARY KEY,
|
||||
imsi text
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS vhss.global_ids (
|
||||
table_name text PRIMARY KEY,
|
||||
id counter);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS vhss.mmeidentity_host (
|
||||
mmehost text PRIMARY KEY,
|
||||
idmmeidentity int,
|
||||
mmerealm text,
|
||||
ue_reachability varint,
|
||||
mmeisdn text);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS vhss.mmeidentity (
|
||||
idmmeidentity int PRIMARY KEY,
|
||||
mmehost text,
|
||||
mmerealm text,
|
||||
ue_reachability varint,
|
||||
mmeisdn text);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS vhss.events (
|
||||
scef_id text,
|
||||
scef_ref_id bigint,
|
||||
extid text,
|
||||
monitoring_event_configuration text,
|
||||
monitoring_type int,
|
||||
msisdn bigint,
|
||||
user_identifier text,
|
||||
primary key (scef_id, scef_ref_id)
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS vhss.events_msisdn (
|
||||
msisdn bigint,
|
||||
scef_id text,
|
||||
scef_ref_id bigint,
|
||||
primary key (msisdn, scef_id, scef_ref_id)
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS vhss.events_extid (
|
||||
extid text,
|
||||
scef_id text,
|
||||
scef_ref_id bigint,
|
||||
primary key (extid, scef_id, scef_ref_id)
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS vhss.extid (
|
||||
extid text primary key
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS vhss.extid_imsi (
|
||||
extid text,
|
||||
imsi text,
|
||||
primary key (extid, imsi)
|
||||
);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS vhss.extid_imsi_xref (
|
||||
imsi text,
|
||||
extid text,
|
||||
primary key (imsi, extid)
|
||||
);
|
||||
Reference in New Issue
Block a user