Update Release Candidate

software/ors-amarisoft/buildout.hash.cfg

@@ -36,11 +36,11 @@ md5sum = fc59d15a7f7f942951f9e38d7a1cca2c
 
 [template-lte-epc]
 _update_hash_filename_ = instance-epc.jinja2.cfg
-md5sum = a4bb020da807666668193cffcb7884d6
+md5sum = 0585b4f8fd42538595e6abb61d07fd93
 
 [ue_db.jinja2.cfg]
 filename = config/ue_db.jinja2.cfg
-md5sum = b781aafa07e3105731a3845eabf7a372
+md5sum = d33163012d6c98efc59161974c649557
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg

software/ors-amarisoft/config/ue_db.jinja2.cfg

-ue_db: [{
-    sim_algo: "xor", /* USIM authentication algorithm: xor, milenage or tuak */
-    imsi: "001010123456789", /* Anritsu Test USIM */
-//    imsi: "001012345678901", /* Agilent or R&S Test USIM */
-    amf: 0x9001, /* Authentication Management Field */
-    sqn: "000000000000", /* Sequence Number */
-    K: "00112233445566778899aabbccddeeff", /* Anritsu Test USIM */
-//    K: "4147494C454E5420544543484E4F0000", /* Agilent Test USIM */
-//    K: "000102030405060708090A0B0C0D0E0F", /* R&S Test USIM */
-
-    impi: "001010123456789@ims.mnc001.mcc001.3gppnetwork.org",
-    impu: ["001010123456789", "tel:0600000000", "tel:600"],
-    domain: "ims.mnc001.mcc001.3gppnetwork.org",
-    multi_sim: true, /* Experimental */
-
-    /* For standard SIP client */
-    /*pwd:  "amarisoft",
-    authent_type: "MD5",*/
-}, {
-    sim_algo: "milenage",
-    imsi: "001010000000001",
-    opc: "000102030405060708090A0B0C0D0E0F",
-    amf: 0x9001,
-    sqn: "000000000000",
-    K: "00112233445566778899AABBCCDDEEFF",
-    impu: ["sip:impu01", "tel:0600000001"],
-    impi: "impi01@amarisoft.com",
-}, {
-    sim_algo: "milenage",
-    imsi: "001010000000002",
-    opc: "000102030405060708090A0B0C0D0E0F",
-    amf: 0x9001,
-    sqn: "000000000000",
-    K: "00112233445566778899AABBCCDDEEFF",
-    impu: ["sip:impu02", "tel:0600000002"],
-    impi: "impi02@amarisoft.com",
-}, {
-    sim_algo: "milenage",
-    imsi: "001010000000003",
-    opc: "000102030405060708090A0B0C0D0E0F",
-    amf: 0x9001,
-    sqn: "000000000000",
-    K: "00112233445566778899AABBCCDDEEFF",
-    impu: ["sip:impu03", "tel:0600000003"],
-    impi: "impi03@amarisoft.com",
-}, {
-    sim_algo: "milenage",
-    imsi: "001010000000004",
-    opc: "000102030405060708090A0B0C0D0E0F",
-    amf: 0x9001,
-    sqn: "000000000000",
-    K: "00112233445566778899AABBCCDDEEFF",
-    impu: "impu04",
-    impi: "impi04@amarisoft.com",
-}, {
-    sim_algo: "milenage",
-    imsi: "001010000000005",
-    opc: "000102030405060708090A0B0C0D0E0F",
-    amf: 0x9001,
-    sqn: "000000000000",
-    K: "00112233445566778899AABBCCDDEEFF",
-    impu: "impu05",
-    impi: "impi05@amarisoft.com",
-}, {
-    sim_algo: "milenage",
-    imsi: "001010000000006",
-    opc: "000102030405060708090A0B0C0D0E0F",
-    amf: 0x9001,
-    sqn: "000000000000",
-    K: "00112233445566778899AABBCCDDEEFF",
-    impu: "impu06",
-    impi: "impi06@amarisoft.com",
-}, {
-    sim_algo: "milenage",
-    imsi: "001010000000007",
-    opc: "000102030405060708090A0B0C0D0E0F",
-    amf: 0x9001,
-    sqn: "000000000000",
-    K: "00112233445566778899AABBCCDDEEFF",
-    impu: "impu07",
-    impi: "impi07@amarisoft.com",
-}, {
-    sim_algo: "milenage",
-    imsi: "001010000000008",
-    opc: "000102030405060708090A0B0C0D0E0F",
-    amf: 0x9001,
-    sqn: "000000000000",
-    K: "00112233445566778899AABBCCDDEEFF",
-    impu: "impu08",
-    impi: "impi08@amarisoft.com",
-}, {
-    sim_algo: "milenage",
-    imsi: "001010000000009",
-    opc: "000102030405060708090A0B0C0D0E0F",
-    amf: 0x9001,
-    sqn: "000000000000",
-    K: "00112233445566778899AABBCCDDEEFF",
-    impu: "impu09",
-    impi: "impi09@amarisoft.com",
-}, {
-{% for slave_instance in slave_instance_list -%}
-{% if slave_instance.get('imsi', '') != '' %}
+{%- set filtered_slave_instance_list = [] %}
+{%- for slave_instance in slave_instance_list %}
+{%-   if slave_instance.get('imsi', '') != '' %}
+{%-     do filtered_slave_instance_list.append(slave_instance) %}
+{%-   endif %}
+{%- endfor -%}
+ue_db: [
+{%- for i, slave_instance in enumerate(filtered_slave_instance_list) %}
+{%- if i == 0 -%}
+{
+{%- else -%}
+, {
+{%- endif %}
     sim_algo: "{{ slave_instance.get('sim_algo', 'milenage') }}",
     imsi: "{{ slave_instance.get('imsi', '') }}",
     opc: "{{ slave_instance.get('opc', '') }}",
@@ -108,15 +19,7 @@ ue_db: [{
     K: "{{ slave_instance.get('k', '') }}",
     impu: "{{ slave_instance.get('impu', '') }}",
     impi: "{{ slave_instance.get('impi', '') }}",
-}, {
-{% endif %}
-{% endfor -%}
-    sim_algo: "milenage",
-    imsi: "001010000000010",
-    opc: "000102030405060708090A0B0C0D0E0F",
-    amf: 0x9001,
-    sqn: "000000000000",
-    K: "00112233445566778899AABBCCDDEEFF",
-    impu: "impu10",
-    impi: "impi10@amarisoft.com",
-}]
+}
+{%- endfor -%}
+]
+

software/ors-amarisoft/instance-epc.jinja2.cfg

@@ -4,8 +4,6 @@ parts =
   ltelogs
   lte-mme-config
   lte-mme-service
-  lte-ims-config
-  lte-ims-service
 # Temporarily extend monitor-base until promises are added
   monitor-base
   publish-connection-information
@@ -64,7 +62,7 @@ context =
 [lte-ims-service]
 recipe = slapos.cookbook:wrapper
 init = ${ltelogs:rendered} ${directory:log}/ims.log; sleep 1
-command-line = {{ mme }}/lteims ${directory:etc}/ims.cfg
+command-line = rm -f ${directory:var}/lte_ue.db; {{ mme }}/lteims ${directory:etc}/ims.cfg
 wrapper-path = ${directory:service}/lte-ims
 mode = 0775
 pidfile = ${directory:run}/ims.pid