WIP: publish

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = 504a5f4d0b09e038c2e4df4cd50930a8
+md5sum = 24a04378744c27ecec51cf718bdff50b
 
 [template-lte-enb-epc]
 _update_hash_filename_ = instance-enb-epc.jinja2.cfg
@@ -24,7 +24,7 @@ md5sum = 0883225f978255ecd343416759c1c5a4
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 6fa927552c7f441f3165d409cabd626f
+md5sum = d5f4beabfbe052cdeb1bce72925090ae
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
@@ -32,7 +32,7 @@ md5sum = 5f8a4d85b26a7181fc8b16e588b88e1e
 
 [template-lte-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = d53bee687504302b08dcd7f8d0dcf630
+md5sum = 535a41b726c132dcf0135150e5470660
 
 [template-lte-epc]
 _update_hash_filename_ = instance-epc.jinja2.cfg
@@ -44,7 +44,7 @@ md5sum = d33163012d6c98efc59161974c649557
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = d841debc51d9f12555a47d1556a6a3c1
+md5sum = d4150f695058ae5103b5f2758bf34dbc
 
 [gnb.jinja2.cfg]
 filename = config/gnb.jinja2.cfg

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: [
@@ -275,4 +275,11 @@
     /* DRB configuration */
     drb_config: "{{ directory['software'] }}/enb/config/drb.cfg",
   },
+{% if slapparameter_dict.get('x2_peers', None) %}
+  x2_peers: [
+{%- for p in slapparameter_dict['x2_peers'].split(',') %}
+  "{{ p }}", 
+{%- endfor -%}
+  ]
+{% endif %}
 }

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

@@ -26,6 +26,27 @@
       "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"
+    },
+    "x2_peers": {
+      "title": "X2 peers",
+      "description": "X2 peers IP addresses, separated by a comma",
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "default": []
     }
   }
 }

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

@@ -92,6 +92,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,9 +101,14 @@ template = {{ enb_template }}
 rendered = ${directory:etc}/enb.cfg
 
 [publish-connection-information]
-recipe = slapos.cookbook:publish.serialised
+{% if slapparameter_dict.get("name", None) == None %}
+<= monitor-publish
+{% endif %}
+recipe = slapos.cookbook:publish
 monitor-base-url = ${monitor-instance-parameter:monitor-base-url}
-ipv4 = {{ ip }}
+{% if slapparameter_dict.get("name", None) == None %}
+ipv4 = {{ local_ipv4 }}
+{% endif %}
 
 {% if slapparameter_dict.get("name", None) %}
 [monitor-instance-parameter]

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

@@ -102,7 +102,6 @@ rendered = ${directory:etc}/gnb.cfg
 [publish-connection-information]
 recipe = slapos.cookbook:publish.serialised
 monitor-base-url = ${monitor-instance-parameter:monitor-base-url}
-ipv4 = {{ ip }}
 
 [monitor-instance-parameter]
 monitor-title = {{ slapparameter_dict['name'] | string }}

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

@@ -26,6 +26,27 @@
       "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"
+    },
+    "x2_peers": {
+      "title": "X2 peers",
+      "description": "X2 peers IP addresses, separated by a comma",
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "default": []
     }
   }
 }
\ No newline at end of file

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

@@ -26,6 +26,27 @@
       "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"
+    },
+    "x2_peers": {
+      "title": "X2 peers",
+      "description": "X2 peers IP addresses, separated by a comma",
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "default": []
     }
   }
 }
\ No newline at end of file

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

@@ -26,6 +26,27 @@
       "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"
+    },
+    "x2_peers": {
+      "title": "X2 peers",
+      "description": "X2 peers IP addresses, separated by a comma",
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "default": []
     }
   }
 }
\ No newline at end of file

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

@@ -26,6 +26,27 @@
       "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"
+    },
+    "x2_peers": {
+      "title": "X2 peers",
+      "description": "X2 peers IP addresses, separated by a comma",
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "default": []
     }
   }
 }
\ No newline at end of file

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

@@ -26,6 +26,27 @@
       "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"
+    },
+    "x2_peers": {
+      "title": "X2 peers",
+      "description": "X2 peers IP addresses, separated by a comma",
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "default": []
     }
   }
 }
\ No newline at end of file

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

@@ -26,6 +26,27 @@
       "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"
+    },
+    "x2_peers": {
+      "title": "X2 peers",
+      "description": "X2 peers IP addresses, separated by a comma",
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "default": []
     }
   }
 }
\ No newline at end of file

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

@@ -26,6 +26,27 @@
       "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"
+    },
+    "x2_peers": {
+      "title": "X2 peers",
+      "description": "X2 peers IP addresses, separated by a comma",
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "default": []
     }
   }
 }
\ No newline at end of file

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

@@ -26,6 +26,27 @@
       "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"
+    },
+    "x2_peers": {
+      "title": "X2 peers",
+      "description": "X2 peers IP addresses, separated by a comma",
+      "type": "array",
+      "items": {
+        "type": "string"
+      },
+      "default": []
     }
   }
 }
\ No newline at end of file

software/ors-amarisoft/instance.cfg

@@ -36,7 +36,7 @@ gnb = dynamic-template-lte-gnb:rendered
 epc = dynamic-template-lte-epc:rendered
 RootSoftwareInstance = $${:enb-epc}
 
-[ipv4-address]
+[local-ipv4-address]
 recipe = slapos.recipe.build
 init = 
   import socket
@@ -48,7 +48,7 @@ init =
       ip = '127.0.0.1'
   finally:
       s.close()
-  options['ip'] = ip
+  options['local-ipv4'] = ip
 
 [dynamic-template-lte-enb-epc]
 < = jinja2-template-base
@@ -57,7 +57,7 @@ filename = instance-lte-enb-epc.cfg
 extensions = jinja2.ext.do
 extra-context =
     raw monitor_template ${monitor2-template:rendered}
-    key ip ipv4-address:ip
+    key local_ipv4 local-ipv4-address:local-ipv4
  
 [dynamic-template-lte-gnb-epc]
 < = jinja2-template-base
@@ -66,7 +66,7 @@ filename = instance-lte-gnb-epc.cfg
 extensions = jinja2.ext.do
 extra-context =
     raw monitor_template ${monitor2-template:rendered}
-    key ip ipv4-address:ip
+    key local_ipv4 local-ipv4-address:local-ipv4
  
 [dynamic-template-lte-enb]
 < = jinja2-template-base
@@ -88,7 +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 ip ipv4-address:ip
+    key local_ipv4 local-ipv4-address:local-ipv4
 
 [dynamic-template-lte-gnb]
 < = jinja2-template-base
@@ -110,7 +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 ip ipv4-address:ip
+    key local_ipv4 local-ipv4-address:local-ipv4
 
 [dynamic-template-lte-epc]
 < = jinja2-template-base