Merge remote-tracking branch 'upstream/master' into zope4py2

software/ors-amarisoft/render-templates

@@ -112,16 +112,16 @@ with open('software.jinja2.cfg', 'r') as f:
 for rf_mode_context in rf_mode_context_list:
     with open('software-{}.cfg.json'.format(rf_mode_context['rf_mode']),
               'w+') as f:
-        f.write(software_json_template.render(**rf_mode_context, **global_context))
+        f.write(software_json_template.render(**rf_mode_context, **global_context) + '\n')
     with open('software-{}.cfg'.format(rf_mode_context['rf_mode']),
               'w+') as f:
-        f.write(software_template.render(**rf_mode_context, **global_context))
+        f.write(software_template.render(**rf_mode_context, **global_context) + '\n')
     for software_type in ['enb', 'enb-epc', 'gnb', 'gnb-epc']:
         with open('instance-{}-{}-input-schema.json'.format(
                     rf_mode_context['rf_mode'],
                     software_type),
                   'w+') as f:
             if software_type in ['enb', 'enb-epc']:
-                f.write(instance_enb_json_template.render(**rf_mode_context, **global_context, epc='epc' in software_type))
+                f.write(instance_enb_json_template.render(**rf_mode_context, **global_context, epc='epc' in software_type) + '\n')
             else:
-                f.write(instance_gnb_json_template.render(**rf_mode_context, **global_context, epc='epc' in software_type))
+                f.write(instance_gnb_json_template.render(**rf_mode_context, **global_context, epc='epc' in software_type) + '\n')

software/ors-amarisoft/software-tdd1900.cfg.json

@@ -44,8 +44,8 @@
       "index": 4
     },
     "gnb-epc-slave": {
-      "title": "Sim Card",
-      "description": "Sim Card Configuration",
+      "title": "gNB-EPC Sim Card",
+      "description": "gNB-EPC Sim Card Configuration",
       "software-type": "gnb-epc",
       "request": "instance-gnb-epc-slave-input-schema.json",
       "response": "instance-gnb-epc-slave-schema.json",
@@ -53,8 +53,8 @@
       "index": 5
     },
     "enb-epc-slave": {
-      "title": "Sim Card",
-      "description": "Sim Card Configuration",
+      "title": "eNB-EPC Sim Card",
+      "description": "eNB-EPC Sim Card Configuration",
       "software-type": "enb-epc",
       "request": "instance-enb-epc-slave-input-schema.json",
       "response": "instance-enb-epc-slave-schema.json",
@@ -62,8 +62,8 @@
       "index": 6
     },
     "epc-slave": {
-      "title": "Sim Card",
-      "description": "Sim Card Configuration",
+      "title": "EPC Sim Card",
+      "description": "EPC Sim Card Configuration",
       "software-type": "epc",
       "request": "instance-epc-slave-input-schema.json",
       "response": "instance-epc-slave-schema.json",

software/ors-amarisoft/software-tdd2600.cfg.json

@@ -44,8 +44,8 @@
       "index": 4
     },
     "gnb-epc-slave": {
-      "title": "Sim Card",
-      "description": "Sim Card Configuration",
+      "title": "gNB-EPC Sim Card",
+      "description": "gNB-EPC Sim Card Configuration",
       "software-type": "gnb-epc",
       "request": "instance-gnb-epc-slave-input-schema.json",
       "response": "instance-gnb-epc-slave-schema.json",
@@ -53,8 +53,8 @@
       "index": 5
     },
     "enb-epc-slave": {
-      "title": "Sim Card",
-      "description": "Sim Card Configuration",
+      "title": "eNB-EPC Sim Card",
+      "description": "eNB-EPC Sim Card Configuration",
       "software-type": "enb-epc",
       "request": "instance-enb-epc-slave-input-schema.json",
       "response": "instance-enb-epc-slave-schema.json",
@@ -62,8 +62,8 @@
       "index": 6
     },
     "epc-slave": {
-      "title": "Sim Card",
-      "description": "Sim Card Configuration",
+      "title": "EPC Sim Card",
+      "description": "EPC Sim Card Configuration",
       "software-type": "epc",
       "request": "instance-epc-slave-input-schema.json",
       "response": "instance-epc-slave-schema.json",

software/ors-amarisoft/software-tdd3500.cfg.json

@@ -44,8 +44,8 @@
       "index": 4
     },
     "gnb-epc-slave": {
-      "title": "Sim Card",
-      "description": "Sim Card Configuration",
+      "title": "gNB-EPC Sim Card",
+      "description": "gNB-EPC Sim Card Configuration",
       "software-type": "gnb-epc",
       "request": "instance-gnb-epc-slave-input-schema.json",
       "response": "instance-gnb-epc-slave-schema.json",
@@ -53,8 +53,8 @@
       "index": 5
     },
     "enb-epc-slave": {
-      "title": "Sim Card",
-      "description": "Sim Card Configuration",
+      "title": "eNB-EPC Sim Card",
+      "description": "eNB-EPC Sim Card Configuration",
       "software-type": "enb-epc",
       "request": "instance-enb-epc-slave-input-schema.json",
       "response": "instance-enb-epc-slave-schema.json",
@@ -62,8 +62,8 @@
       "index": 6
     },
     "epc-slave": {
-      "title": "Sim Card",
-      "description": "Sim Card Configuration",
+      "title": "EPC Sim Card",
+      "description": "EPC Sim Card Configuration",
       "software-type": "epc",
       "request": "instance-epc-slave-input-schema.json",
       "response": "instance-epc-slave-schema.json",

software/ors-amarisoft/software-tdd3700.cfg.json

@@ -44,8 +44,8 @@
       "index": 4
     },
     "gnb-epc-slave": {
-      "title": "Sim Card",
-      "description": "Sim Card Configuration",
+      "title": "gNB-EPC Sim Card",
+      "description": "gNB-EPC Sim Card Configuration",
       "software-type": "gnb-epc",
       "request": "instance-gnb-epc-slave-input-schema.json",
       "response": "instance-gnb-epc-slave-schema.json",
@@ -53,8 +53,8 @@
       "index": 5
     },
     "enb-epc-slave": {
-      "title": "Sim Card",
-      "description": "Sim Card Configuration",
+      "title": "eNB-EPC Sim Card",
+      "description": "eNB-EPC Sim Card Configuration",
       "software-type": "enb-epc",
       "request": "instance-enb-epc-slave-input-schema.json",
       "response": "instance-enb-epc-slave-schema.json",
@@ -62,8 +62,8 @@
       "index": 6
     },
     "epc-slave": {
-      "title": "Sim Card",
-      "description": "Sim Card Configuration",
+      "title": "EPC Sim Card",
+      "description": "EPC Sim Card Configuration",
       "software-type": "epc",
       "request": "instance-epc-slave-input-schema.json",
       "response": "instance-epc-slave-schema.json",

software/ors-amarisoft/software.cfg.jinja2.json

@@ -44,8 +44,8 @@
       "index": 4
     },
     "gnb-epc-slave": {
-      "title": "Sim Card",
-      "description": "Sim Card Configuration",
+      "title": "gNB-EPC Sim Card",
+      "description": "gNB-EPC Sim Card Configuration",
       "software-type": "gnb-epc",
       "request": "instance-gnb-epc-slave-input-schema.json",
       "response": "instance-gnb-epc-slave-schema.json",
@@ -53,8 +53,8 @@
       "index": 5
     },
     "enb-epc-slave": {
-      "title": "Sim Card",
-      "description": "Sim Card Configuration",
+      "title": "eNB-EPC Sim Card",
+      "description": "eNB-EPC Sim Card Configuration",
       "software-type": "enb-epc",
       "request": "instance-enb-epc-slave-input-schema.json",
       "response": "instance-enb-epc-slave-schema.json",
@@ -62,8 +62,8 @@
       "index": 6
     },
     "epc-slave": {
-      "title": "Sim Card",
-      "description": "Sim Card Configuration",
+      "title": "EPC Sim Card",
+      "description": "EPC Sim Card Configuration",
       "software-type": "epc",
       "request": "instance-epc-slave-input-schema.json",
       "response": "instance-epc-slave-schema.json",