software/ors-amarisoft: allow eNB to connect to external MME

software/ors-amarisoft/buildout.hash.cfg

@@ -16,27 +16,27 @@
 
 [template]
 filename = instance.cfg
-md5sum = b65347ea7c1936c2926ef11258cea602
+md5sum = 6ea4fa210a91c15278c847a809de5991
 
 [template-lte-enb-epc]
 _update_hash_filename_ = instance-enb-epc.jinja2.cfg
-md5sum = 0883225f978255ecd343416759c1c5a4
+md5sum = 25fae79db2b30be0f365ad967b278c3c
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = b97de2b1f60059e2a1b394597123672d
+md5sum = fe249168a3f50b0efe6aeae39afb03ae
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
-md5sum = 5f8a4d85b26a7181fc8b16e588b88e1e
+md5sum = 5ec4508b02f6e7fbdbe1f37c65b9d897
 
 [template-lte-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = 535a41b726c132dcf0135150e5470660
+md5sum = 6deb38b3de44f6e0a43b49fd13f0f072
 
 [template-lte-epc]
 _update_hash_filename_ = instance-epc.jinja2.cfg
-md5sum = 9d9f6ab2e5f352eb29130d97aff58cc0
+md5sum = 089f62e736cdc620eafc2c47b050fe13
 
 [ue_db.jinja2.cfg]
 filename = config/ue_db.jinja2.cfg
@@ -44,11 +44,11 @@ md5sum = d33163012d6c98efc59161974c649557
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = d841debc51d9f12555a47d1556a6a3c1
+md5sum = 97d9cdd07704cae36c5e4234c87025e8
 
 [gnb.jinja2.cfg]
 filename = config/gnb.jinja2.cfg
-md5sum = da64ea9c5003f40987a8bba3f18e8839
+md5sum = b0df7f3b679b25d5296dd67e074364b4
 
 [ltelogs.jinja2.sh]
 filename = ltelogs.jinja2.sh

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

@@ -56,15 +56,15 @@
     { 
       /* address of MME for S1AP connection. Must be modified if the MME
          runs on a different host. */
-      mme_addr: "127.0.1.100"
+      mme_addr: "{{ slapparameter_dict.get('mme_addr', '127.0.1.100') }}"
     },
   ],
   /* GTP bind address (=address of the ethernet interface connected to
      the MME). Must be modified if the MME runs on a different host. */
-  gtp_addr: "{{ slapparameter_dict.get('gtp_addr', '127.0.1.1') }}",
+  gtp_addr: "{{ gtp_addr }}",
 
   /* high 20 bits of SIB1.cellIdentifier */
-  enb_id: 0x1A2D0,
+  enb_id: {{ slapparameter_dict.get('enb_id', '0x1A2D0') }},
 
   /* list of cells */
   cell_list: [

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

@@ -37,15 +37,15 @@
   amf_list: [
     {
       /* address of AMF for NGAP connection. Must be modified if the AMF runs on a different host. */
-      amf_addr: "127.0.1.100",
+      amf_addr: "{{ slapparameter_dict.get('amf_addr', '127.0.1.100') }}",
     },
   ],
   /* GTP bind address (=address of the ethernet interface connected to
      the AMF). Must be modified if the AMF runs on a different host. */
-  gtp_addr: "{{ slapparameter_dict.get('gtp_addr', '127.0.1.1') }}",
+  gtp_addr: "{{ gtp_addr }}",
 
   gnb_id_bits: 28,
-  gnb_id: 0x12345,
+  gnb_id: {{ slapparameter_dict.get('gnb_id', '0x12345') }},
 
   nr_support: true,
 

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

@@ -12,7 +12,7 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [slap-configuration]
-recipe = slapos.cookbook:slapconfiguration.serialised
+recipe = slapos.cookbook:slapconfiguration
 computer = {{ slap_connection['computer-id'] }}
 partition = {{ slap_connection['partition-id'] }}
 url = {{ slap_connection['server-url'] }}
@@ -34,7 +34,7 @@ promise = ${:etc}/promise
 log = ${:var}/log
 
 [request-common-base]
-recipe = slapos.cookbook:request.serialised
+recipe = slapos.cookbook:request
 software-url = {{ slap_connection['software-release-url'] }}
 server-url = {{ slap_connection['server-url'] }}
 computer-id = {{ slap_connection['computer-id'] }}

software/ors-amarisoft/instance-enb-input-schema.jinja2.json

@@ -26,6 +26,18 @@
       "description": "number of DL resource blocks",
       "type": "number",
       "default": {{ default_lte_n_rb_dl }}
+    },
+    "mme_addr": {
+      "title": "MME Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "enb_id": {
+      "title": "eNB ID",
+      "description": "eNB ID",
+      "type": "string",
+      "default": "0x1A2D0"
     }
   }
 }

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

@@ -15,7 +15,7 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [slap-configuration]
-recipe = slapos.cookbook:slapconfiguration.serialised
+recipe = slapos.cookbook:slapconfiguration
 computer = {{ slap_connection['computer-id'] }}
 partition = {{ slap_connection['partition-id'] }}
 url = {{ slap_connection['server-url'] }}
@@ -66,6 +66,7 @@ rendered = ${directory:bin}/${:_buildout_section_name_}
 mode = 0700
 template =
   inline:#!/bin/sh
+  sudo /opt/amarisoft/rm-tmp-lte | true;
   {{ enb }}/lteenb ${directory:etc}/enb.cfg >> ${directory:log}/enb-output.cfg 2>> ${directory:log}/enb-output.cfg
 
 ### eNodeB (enb)
@@ -92,6 +93,7 @@ context =
   section directory directory
   section slap_configuration slap-configuration
   key slapparameter_dict slap-configuration:configuration
+  raw gtp_addr {{ local_ipv4 }}
   import  netaddr netaddr
 
 [lte-enb-config]
@@ -100,12 +102,17 @@ template = {{ enb_template }}
 rendered = ${directory:etc}/enb.cfg
 
 [publish-connection-information]
-recipe = slapos.cookbook:publish.serialised
-monitor-base-url = ${monitor-instance-parameter:monitor-base-url}
+<= monitor-publish
+recipe = slapos.cookbook:publish
+ipv4 = {{ local_ipv4 }}
 
 [monitor-instance-parameter]
+{% if slapparameter_dict.get("name", None) %}
 monitor-title = {{ slapparameter_dict['name'] | string }}
+{% endif %}
+{% if slapparameter_dict.get("monitor-password", None) %}
 password = {{ slapparameter_dict['monitor-password'] | string }}
+{% endif %}
 
 # Add custom promise to check if /dev/sdr0 is busy
 [sdr-busy-promise]

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

@@ -15,7 +15,7 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [slap-configuration]
-recipe = slapos.cookbook:slapconfiguration.serialised
+recipe = slapos.cookbook:slapconfiguration
 computer = {{ slap_connection['computer-id'] }}
 partition = {{ slap_connection['partition-id'] }}
 url = {{ slap_connection['server-url'] }}
@@ -131,14 +131,14 @@ context =
   import  netaddr netaddr
   key ifup_empty lte-mme-ifup-empty:wrapper-path
 
-[publish-connection-information]
-recipe = slapos.cookbook:publish.serialised
-monitor-base-url = ${monitor-instance-parameter:monitor-base-url}
-
 [monitor-instance-parameter]
 monitor-title = {{ slapparameter_dict['name'] }}
 password = {{ slapparameter_dict['monitor-password'] }}
 
+[publish-connection-information]
+<= monitor-publish
+recipe = slapos.cookbook:publish
+
 # Add custom promise to check if /dev/sdr0 is busy
 [tun-up-promise]
 recipe = slapos.cookbook:promise.plugin

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

@@ -12,7 +12,7 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [slap-configuration]
-recipe = slapos.cookbook:slapconfiguration.serialised
+recipe = slapos.cookbook:slapconfiguration
 computer = {{ slap_connection['computer-id'] }}
 partition = {{ slap_connection['partition-id'] }}
 url = {{ slap_connection['server-url'] }}
@@ -34,7 +34,7 @@ promise = ${:etc}/promise
 log = ${:var}/log
 
 [request-common-base]
-recipe = slapos.cookbook:request.serialised
+recipe = slapos.cookbook:request
 software-url = {{ slap_connection['software-release-url'] }}
 server-url = {{ slap_connection['server-url'] }}
 computer-id = {{ slap_connection['computer-id'] }}

software/ors-amarisoft/instance-gnb-input-schema.jinja2.json

@@ -32,6 +32,18 @@
       "description": "Downlink Bandwidth (in MHz)",
       "type": "number",
       "default": {{ default_nr_bandwidth }}
+    },
+    "amf_addr": {
+      "title": "AMF Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "gnb_id": {
+      "title": "gNB ID",
+      "description": "gNB ID",
+      "type": "string",
+      "default": "0x12345"
     }
   }
 }

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

@@ -15,7 +15,7 @@ develop-eggs-directory = {{ develop_eggs_directory }}
 offline = true
 
 [slap-configuration]
-recipe = slapos.cookbook:slapconfiguration.serialised
+recipe = slapos.cookbook:slapconfiguration
 computer = {{ slap_connection['computer-id'] }}
 partition = {{ slap_connection['partition-id'] }}
 url = {{ slap_connection['server-url'] }}
@@ -66,6 +66,7 @@ rendered = ${directory:bin}/${:_buildout_section_name_}
 mode = 0700
 template =
   inline:#!/bin/sh
+  sudo /opt/amarisoft/rm-tmp-lte | true;
   {{ enb }}/lteenb ${directory:etc}/gnb.cfg >> ${directory:log}/gnb-output.cfg 2>> ${directory:log}/gnb-output.cfg
 
 ### eNodeB (enb)
@@ -92,6 +93,7 @@ context =
   section directory directory
   section slap_configuration slap-configuration
   key slapparameter_dict slap-configuration:configuration
+  raw gtp_addr {{ local_ipv4 }}
   import  netaddr netaddr
 
 [lte-gnb-config]
@@ -100,12 +102,17 @@ template = {{ gnb_template }}
 rendered = ${directory:etc}/gnb.cfg
 
 [publish-connection-information]
-recipe = slapos.cookbook:publish.serialised
-monitor-base-url = ${monitor-instance-parameter:monitor-base-url}
+<= monitor-publish
+recipe = slapos.cookbook:publish
+ipv4 = {{ local_ipv4 }}
 
 [monitor-instance-parameter]
+{% if slapparameter_dict.get("name", None) %}
 monitor-title = {{ slapparameter_dict['name'] | string }}
+{% endif %}
+{% if slapparameter_dict.get("monitor-password", None) %}
 password = {{ slapparameter_dict['monitor-password'] | string }}
+{% endif %}
 
 # Add custom promise to check if /dev/sdr0 is busy
 [sdr-busy-promise]

software/ors-amarisoft/instance-tdd1900-enb-epc-input-schema.json

@@ -26,6 +26,18 @@
       "description": "number of DL resource blocks",
       "type": "number",
       "default": 100
+    },
+    "mme_addr": {
+      "title": "MME Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "enb_id": {
+      "title": "eNB ID",
+      "description": "eNB ID",
+      "type": "string",
+      "default": "0x1A2D0"
     }
   }
 }
\ No newline at end of file

software/ors-amarisoft/instance-tdd1900-enb-input-schema.json

@@ -26,6 +26,18 @@
       "description": "number of DL resource blocks",
       "type": "number",
       "default": 100
+    },
+    "mme_addr": {
+      "title": "MME Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "enb_id": {
+      "title": "eNB ID",
+      "description": "eNB ID",
+      "type": "string",
+      "default": "0x1A2D0"
     }
   }
 }
\ No newline at end of file

software/ors-amarisoft/instance-tdd1900-gnb-epc-input-schema.json

@@ -32,6 +32,18 @@
       "description": "Downlink Bandwidth (in MHz)",
       "type": "number",
       "default": 40
+    },
+    "amf_addr": {
+      "title": "AMF Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "gnb_id": {
+      "title": "gNB ID",
+      "description": "gNB ID",
+      "type": "string",
+      "default": "0x12345"
     }
   }
 }
\ No newline at end of file

software/ors-amarisoft/instance-tdd1900-gnb-input-schema.json

@@ -32,6 +32,18 @@
       "description": "Downlink Bandwidth (in MHz)",
       "type": "number",
       "default": 40
+    },
+    "amf_addr": {
+      "title": "AMF Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "gnb_id": {
+      "title": "gNB ID",
+      "description": "gNB ID",
+      "type": "string",
+      "default": "0x12345"
     }
   }
 }
\ No newline at end of file

software/ors-amarisoft/instance-tdd2600-enb-epc-input-schema.json

@@ -26,6 +26,18 @@
       "description": "number of DL resource blocks",
       "type": "number",
       "default": 100
+    },
+    "mme_addr": {
+      "title": "MME Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "enb_id": {
+      "title": "eNB ID",
+      "description": "eNB ID",
+      "type": "string",
+      "default": "0x1A2D0"
     }
   }
 }
\ No newline at end of file

software/ors-amarisoft/instance-tdd2600-enb-input-schema.json

@@ -26,6 +26,18 @@
       "description": "number of DL resource blocks",
       "type": "number",
       "default": 100
+    },
+    "mme_addr": {
+      "title": "MME Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "enb_id": {
+      "title": "eNB ID",
+      "description": "eNB ID",
+      "type": "string",
+      "default": "0x1A2D0"
     }
   }
 }
\ No newline at end of file

software/ors-amarisoft/instance-tdd2600-gnb-epc-input-schema.json

@@ -32,6 +32,18 @@
       "description": "Downlink Bandwidth (in MHz)",
       "type": "number",
       "default": 40
+    },
+    "amf_addr": {
+      "title": "AMF Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "gnb_id": {
+      "title": "gNB ID",
+      "description": "gNB ID",
+      "type": "string",
+      "default": "0x12345"
     }
   }
 }
\ No newline at end of file

software/ors-amarisoft/instance-tdd2600-gnb-input-schema.json

@@ -32,6 +32,18 @@
       "description": "Downlink Bandwidth (in MHz)",
       "type": "number",
       "default": 40
+    },
+    "amf_addr": {
+      "title": "AMF Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "gnb_id": {
+      "title": "gNB ID",
+      "description": "gNB ID",
+      "type": "string",
+      "default": "0x12345"
     }
   }
 }
\ No newline at end of file

software/ors-amarisoft/instance-tdd3500-enb-epc-input-schema.json

@@ -26,6 +26,18 @@
       "description": "number of DL resource blocks",
       "type": "number",
       "default": 100
+    },
+    "mme_addr": {
+      "title": "MME Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "enb_id": {
+      "title": "eNB ID",
+      "description": "eNB ID",
+      "type": "string",
+      "default": "0x1A2D0"
     }
   }
 }
\ No newline at end of file

software/ors-amarisoft/instance-tdd3500-enb-input-schema.json

@@ -26,6 +26,18 @@
       "description": "number of DL resource blocks",
       "type": "number",
       "default": 100
+    },
+    "mme_addr": {
+      "title": "MME Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "enb_id": {
+      "title": "eNB ID",
+      "description": "eNB ID",
+      "type": "string",
+      "default": "0x1A2D0"
     }
   }
 }
\ No newline at end of file

software/ors-amarisoft/instance-tdd3500-gnb-epc-input-schema.json

@@ -32,6 +32,18 @@
       "description": "Downlink Bandwidth (in MHz)",
       "type": "number",
       "default": 40
+    },
+    "amf_addr": {
+      "title": "AMF Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "gnb_id": {
+      "title": "gNB ID",
+      "description": "gNB ID",
+      "type": "string",
+      "default": "0x12345"
     }
   }
 }
\ No newline at end of file

software/ors-amarisoft/instance-tdd3500-gnb-input-schema.json

@@ -32,6 +32,18 @@
       "description": "Downlink Bandwidth (in MHz)",
       "type": "number",
       "default": 40
+    },
+    "amf_addr": {
+      "title": "AMF Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "gnb_id": {
+      "title": "gNB ID",
+      "description": "gNB ID",
+      "type": "string",
+      "default": "0x12345"
     }
   }
 }
\ No newline at end of file

software/ors-amarisoft/instance-tdd3700-enb-epc-input-schema.json

@@ -26,6 +26,18 @@
       "description": "number of DL resource blocks",
       "type": "number",
       "default": 100
+    },
+    "mme_addr": {
+      "title": "MME Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "enb_id": {
+      "title": "eNB ID",
+      "description": "eNB ID",
+      "type": "string",
+      "default": "0x1A2D0"
     }
   }
 }
\ No newline at end of file

software/ors-amarisoft/instance-tdd3700-enb-input-schema.json

@@ -26,6 +26,18 @@
       "description": "number of DL resource blocks",
       "type": "number",
       "default": 100
+    },
+    "mme_addr": {
+      "title": "MME Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "enb_id": {
+      "title": "eNB ID",
+      "description": "eNB ID",
+      "type": "string",
+      "default": "0x1A2D0"
     }
   }
 }
\ No newline at end of file

software/ors-amarisoft/instance-tdd3700-gnb-epc-input-schema.json

@@ -32,6 +32,18 @@
       "description": "Downlink Bandwidth (in MHz)",
       "type": "number",
       "default": 40
+    },
+    "amf_addr": {
+      "title": "AMF Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "gnb_id": {
+      "title": "gNB ID",
+      "description": "gNB ID",
+      "type": "string",
+      "default": "0x12345"
     }
   }
 }
\ No newline at end of file

software/ors-amarisoft/instance-tdd3700-gnb-input-schema.json

@@ -32,6 +32,18 @@
       "description": "Downlink Bandwidth (in MHz)",
       "type": "number",
       "default": 40
+    },
+    "amf_addr": {
+      "title": "AMF Address",
+      "description": "IPv4 of the core network",
+      "type": "string",
+      "default": "127.0.0.100"
+    },
+    "gnb_id": {
+      "title": "gNB ID",
+      "description": "gNB ID",
+      "type": "string",
+      "default": "0x12345"
     }
   }
 }
\ No newline at end of file

software/ors-amarisoft/instance.cfg

@@ -7,7 +7,7 @@ develop-eggs-directory = ${buildout:develop-eggs-directory}
 offline = true
 
 [slap-configuration]
-recipe = slapos.cookbook:slapconfiguration.serialised
+recipe = slapos.cookbook:slapconfiguration
 computer = $${slap-connection:computer-id}
 partition = $${slap-connection:partition-id}
 url = $${slap-connection:server-url}
@@ -36,6 +36,20 @@ gnb = dynamic-template-lte-gnb:rendered
 epc = dynamic-template-lte-epc:rendered
 RootSoftwareInstance = $${:enb-epc}
 
+[local-ipv4-address]
+recipe = slapos.recipe.build
+init = 
+  import socket
+  s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+  try:
+      s.connect(('1.1.1.1', 1))
+      ip = s.getsockname()[0]
+  except Exception:
+      ip = '127.0.0.1'
+  finally:
+      s.close()
+  options['local-ipv4'] = ip
+
 [dynamic-template-lte-enb-epc]
 < = jinja2-template-base
 template = ${template-lte-enb-epc:target}
@@ -43,6 +57,7 @@ filename = instance-lte-enb-epc.cfg
 extensions = jinja2.ext.do
 extra-context =
     raw monitor_template ${monitor2-template:rendered}
+    key local_ipv4 local-ipv4-address:local-ipv4
  
 [dynamic-template-lte-gnb-epc]
 < = jinja2-template-base
@@ -51,6 +66,7 @@ filename = instance-lte-gnb-epc.cfg
 extensions = jinja2.ext.do
 extra-context =
     raw monitor_template ${monitor2-template:rendered}
+    key local_ipv4 local-ipv4-address:local-ipv4
  
 [dynamic-template-lte-enb]
 < = jinja2-template-base
@@ -72,6 +88,7 @@ extra-context =
     raw default_lte_rx_gain ${enb:default-lte-rx-gain}
     raw min_frequency ${enb:min-frequency}
     raw max_frequency ${enb:max-frequency}
+    key local_ipv4 local-ipv4-address:local-ipv4
 
 [dynamic-template-lte-gnb]
 < = jinja2-template-base
@@ -93,6 +110,7 @@ extra-context =
     raw default_nr_rx_gain ${enb:default-nr-rx-gain}
     raw min_frequency ${enb:min-frequency}
     raw max_frequency ${enb:max-frequency}
+    key local_ipv4 local-ipv4-address:local-ipv4
 
 [dynamic-template-lte-epc]
 < = jinja2-template-base