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

software/caddy-frontend/README.caddy_frontend.rst

@@ -29,7 +29,9 @@ These parameters are:
   * ``-frontend-quantity`` : The quantity of frontends to request (default to "1")
   * ``-frontend-i-state``: The state of frontend i
   * ``-frontend-i-software-release-url``: Software release to be used for frontends, default to the current software release
-  * ``-frontend-config-i-foo``: Frontend i will be requested with parameter foo
+  * ``-frontend-config-i-foo``: Frontend i will be requested with parameter foo, supported parameters are:
+    * ``ram-cache-size``
+    * ``disk-cache-size``
   * ``-sla-i-foo`` : where "i" is the number of the concerned frontend (between 1 and "-frontend-quantity") and "foo" a sla parameter.
 
 For example::
@@ -47,13 +49,6 @@ will request the third frontend on COMP-1234 and with SR https://lab.nexedi.com/
 
 **Important NOTE**: The way you ask for slave to a replicate frontend is the same as the one you would use for the software given in "-frontend-quantity". Do not forget to use "replicate" for software type. XXXXX So far it is not possible to do a simple request on a replicate frontend if you do not know the software_guid or other sla-parameter of the master instance. In fact we do not know yet the software type of the "requested" frontends. TO BE IMPLEMENTED
 
-XXX Should be moved to specific JSON File
-
-Extra-parameter per frontend with default::
-
-  ram-cache-size = 1G
-  disk-cache-size = 8G
-
 How to deploy a frontend server
 ===============================
 

software/caddy-frontend/instance-input-schema.json

@@ -97,6 +97,18 @@
       ],
       "title": "Authenticate to backend",
       "type": "string"
+    },
+    "ram-cache-size": {
+      "default": "1G",
+      "title": "Default size of RAM cache on each node (bytes)",
+      "description": "The value can be provided with suffix 'K', 'M', 'G'",
+      "type": "string"
+    },
+    "disk-cache-size": {
+      "default": "8G",
+      "title": "Default size of disk cache on each node (bytes)",
+      "description": "The value can be provided with suffix 'K', 'M', 'G'",
+      "type": "string"
     }
   },
   "title": "Input Parameters",

software/caddy-frontend/test/test.py

@@ -339,9 +339,8 @@ class TestDataMixin(object):
     runtime_data = '\n'.join(sorted(runtime_data))
     self.assertTestData(runtime_data)
 
-  # convince test to be run last; it's a hack, but log files shall be checked
-  # after all other tests had chance to execute
-  def zz_test_file_list_log(self):
+  def test00file_list_log(self):
+    # test00 name chosen to be run just after setup
     self._test_file_list(['var', 'log'], [
       # no control at all when cron would kick in, ignore it
       'cron.log',
@@ -358,7 +357,8 @@ class TestDataMixin(object):
       'trafficserver/traffic.out',
     ])
 
-  def test_file_list_run(self):
+  def test00file_list_run(self):
+    # test00 name chosen to be run just after setup
     self._test_file_list(['var', 'run'], [
       # can't be sure regarding its presence
       'caddy_configuration_last_state',
@@ -375,7 +375,8 @@ class TestDataMixin(object):
   def test_file_list_plugin(self):
     self._test_file_list(['etc', 'plugin'], ['.pyc'])
 
-  def test_supervisor_state(self):
+  def test00supervisor_state(self):
+    # test00 name chosen to be run just after setup
     # give a chance for etc/run scripts to finish
     time.sleep(1)
 
@@ -414,7 +415,7 @@ class TestDataMixin(object):
     pass
 
   def test00cluster_request_instance_parameter_dict(self):
-    # test00 name chosen to be run as first test
+    # test00 name chosen to be run just after setup
     cluster_request_parameter_list = []
     data_replacement_dict = {}
     computer = self.slap._slap.registerComputer('local')

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlave.zz_test_file_list_log.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/backend-haproxy.log
-T-2/var/log/expose-csr.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd/_dummy-cached_access_log
-T-2/var/log/httpd/_dummy-cached_backend_log
-T-2/var/log/httpd/_dummy-cached_error_log
-T-2/var/log/httpd/_enable-http2-default_access_log
-T-2/var/log/httpd/_enable-http2-default_error_log
-T-2/var/log/httpd/_enable-http2-false_access_log
-T-2/var/log/httpd/_enable-http2-false_error_log
-T-2/var/log/httpd/_enable-http2-true_access_log
-T-2/var/log/httpd/_enable-http2-true_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/slave-introspection-access.log
-T-2/var/log/slave-introspection-error.log
-T-2/var/log/trafficserver/manager.log

software/caddy-frontend/test/test_data/test.TestEnableHttp2ByDefaultFalseSlaveGlobalDisableHttp2.zz_test_file_list_log.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/backend-haproxy.log
-T-2/var/log/expose-csr.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd/_dummy-cached_access_log
-T-2/var/log/httpd/_dummy-cached_backend_log
-T-2/var/log/httpd/_dummy-cached_error_log
-T-2/var/log/httpd/_enable-http2-default_access_log
-T-2/var/log/httpd/_enable-http2-default_error_log
-T-2/var/log/httpd/_enable-http2-false_access_log
-T-2/var/log/httpd/_enable-http2-false_error_log
-T-2/var/log/httpd/_enable-http2-true_access_log
-T-2/var/log/httpd/_enable-http2-true_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/slave-introspection-access.log
-T-2/var/log/slave-introspection-error.log
-T-2/var/log/trafficserver/manager.log

software/caddy-frontend/test/test_data/test.TestSlave.zz_test_file_list_log.txt → software/caddy-frontend/test/test_data/test.TestSlave.test00file_list_log.txt

@@ -39,7 +39,6 @@ T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_access_log
 T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_backend_log
 T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_error_log
 T-2/var/log/httpd/_custom_domain_wildcard_access_log
-T-2/var/log/httpd/_custom_domain_wildcard_backend_log
 T-2/var/log/httpd/_custom_domain_wildcard_error_log
 T-2/var/log/httpd/_disabled-cookie-list-simple_access_log
 T-2/var/log/httpd/_disabled-cookie-list-simple_backend_log

software/caddy-frontend/test/test_data/test.TestSlaveGlobalDisableHttp2.zz_test_file_list_log.txt

-T-0/var/log/monitor-httpd-access.log
-T-0/var/log/monitor-httpd-error.log
-T-0/var/log/slapgrid-T-0-error.log
-T-1/var/log/expose-csr.log
-T-1/var/log/kedifa.log
-T-1/var/log/monitor-httpd-access.log
-T-1/var/log/monitor-httpd-error.log
-T-2/var/log/backend-haproxy.log
-T-2/var/log/expose-csr.log
-T-2/var/log/frontend-access.log
-T-2/var/log/frontend-error.log
-T-2/var/log/httpd/_Url_access_log
-T-2/var/log/httpd/_Url_backend_log
-T-2/var/log/httpd/_Url_error_log
-T-2/var/log/httpd/_auth-to-backend-backend-ignore_access_log
-T-2/var/log/httpd/_auth-to-backend-backend-ignore_backend_log
-T-2/var/log/httpd/_auth-to-backend-backend-ignore_error_log
-T-2/var/log/httpd/_auth-to-backend-not-configured_access_log
-T-2/var/log/httpd/_auth-to-backend-not-configured_backend_log
-T-2/var/log/httpd/_auth-to-backend-not-configured_error_log
-T-2/var/log/httpd/_auth-to-backend_access_log
-T-2/var/log/httpd/_auth-to-backend_backend_log
-T-2/var/log/httpd/_auth-to-backend_error_log
-T-2/var/log/httpd/_bad-backend_access_log
-T-2/var/log/httpd/_bad-backend_backend_log
-T-2/var/log/httpd/_bad-backend_error_log
-T-2/var/log/httpd/_ciphers_access_log
-T-2/var/log/httpd/_ciphers_error_log
-T-2/var/log/httpd/_custom_domain_access_log
-T-2/var/log/httpd/_custom_domain_backend_log
-T-2/var/log/httpd/_custom_domain_error_log
-T-2/var/log/httpd/_custom_domain_server_alias_access_log
-T-2/var/log/httpd/_custom_domain_server_alias_backend_log
-T-2/var/log/httpd/_custom_domain_server_alias_error_log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_access_log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_backend_log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_error_log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_access_log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_backend_log
-T-2/var/log/httpd/_custom_domain_ssl_crt_ssl_key_ssl_ca_crt_error_log
-T-2/var/log/httpd/_custom_domain_wildcard_access_log
-T-2/var/log/httpd/_custom_domain_wildcard_backend_log
-T-2/var/log/httpd/_custom_domain_wildcard_error_log
-T-2/var/log/httpd/_disabled-cookie-list-simple_access_log
-T-2/var/log/httpd/_disabled-cookie-list-simple_backend_log
-T-2/var/log/httpd/_disabled-cookie-list-simple_error_log
-T-2/var/log/httpd/_disabled-cookie-list_access_log
-T-2/var/log/httpd/_disabled-cookie-list_backend_log
-T-2/var/log/httpd/_disabled-cookie-list_error_log
-T-2/var/log/httpd/_empty_access_log
-T-2/var/log/httpd/_empty_error_log
-T-2/var/log/httpd/_enable-http2-default_access_log
-T-2/var/log/httpd/_enable-http2-default_backend_log
-T-2/var/log/httpd/_enable-http2-default_error_log
-T-2/var/log/httpd/_enable-http2-false_access_log
-T-2/var/log/httpd/_enable-http2-false_backend_log
-T-2/var/log/httpd/_enable-http2-false_error_log
-T-2/var/log/httpd/_enable_cache-disable-no-cache-request_access_log
-T-2/var/log/httpd/_enable_cache-disable-no-cache-request_backend_log
-T-2/var/log/httpd/_enable_cache-disable-no-cache-request_error_log
-T-2/var/log/httpd/_enable_cache-disable-via-header_access_log
-T-2/var/log/httpd/_enable_cache-disable-via-header_backend_log
-T-2/var/log/httpd/_enable_cache-disable-via-header_error_log
-T-2/var/log/httpd/_enable_cache-https-only-false_access_log
-T-2/var/log/httpd/_enable_cache-https-only-false_backend_log
-T-2/var/log/httpd/_enable_cache-https-only-false_error_log
-T-2/var/log/httpd/_enable_cache_access_log
-T-2/var/log/httpd/_enable_cache_backend_log
-T-2/var/log/httpd/_enable_cache_custom_domain_access_log
-T-2/var/log/httpd/_enable_cache_custom_domain_backend_log
-T-2/var/log/httpd/_enable_cache_custom_domain_error_log
-T-2/var/log/httpd/_enable_cache_error_log
-T-2/var/log/httpd/_enable_cache_server_alias_access_log
-T-2/var/log/httpd/_enable_cache_server_alias_backend_log
-T-2/var/log/httpd/_enable_cache_server_alias_error_log
-T-2/var/log/httpd/_https-only_access_log
-T-2/var/log/httpd/_https-only_backend_log
-T-2/var/log/httpd/_https-only_error_log
-T-2/var/log/httpd/_https-url-netloc-list_access_log
-T-2/var/log/httpd/_https-url-netloc-list_backend_log
-T-2/var/log/httpd/_https-url-netloc-list_error_log
-T-2/var/log/httpd/_monitor-ipv4-test_access_log
-T-2/var/log/httpd/_monitor-ipv4-test_error_log
-T-2/var/log/httpd/_monitor-ipv6-test_access_log
-T-2/var/log/httpd/_monitor-ipv6-test_error_log
-T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_access_log
-T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_backend_log
-T-2/var/log/httpd/_prefer-gzip-encoding-to-backend-https-only_error_log
-T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_access_log
-T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_backend_log
-T-2/var/log/httpd/_prefer-gzip-encoding-to-backend_error_log
-T-2/var/log/httpd/_server-alias-duplicated_access_log
-T-2/var/log/httpd/_server-alias-duplicated_backend_log
-T-2/var/log/httpd/_server-alias-duplicated_error_log
-T-2/var/log/httpd/_server-alias-empty_access_log
-T-2/var/log/httpd/_server-alias-empty_backend_log
-T-2/var/log/httpd/_server-alias-empty_error_log
-T-2/var/log/httpd/_server-alias-wildcard_access_log
-T-2/var/log/httpd/_server-alias-wildcard_backend_log
-T-2/var/log/httpd/_server-alias-wildcard_error_log
-T-2/var/log/httpd/_server-alias_access_log
-T-2/var/log/httpd/_server-alias_backend_log
-T-2/var/log/httpd/_server-alias_custom_domain-duplicated_access_log
-T-2/var/log/httpd/_server-alias_custom_domain-duplicated_backend_log
-T-2/var/log/httpd/_server-alias_custom_domain-duplicated_error_log
-T-2/var/log/httpd/_server-alias_error_log
-T-2/var/log/httpd/_ssl-proxy-verify-unverified_access_log
-T-2/var/log/httpd/_ssl-proxy-verify-unverified_backend_log
-T-2/var/log/httpd/_ssl-proxy-verify-unverified_error_log
-T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_access_log
-T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_backend_log
-T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt-unverified_error_log
-T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_access_log
-T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_backend_log
-T-2/var/log/httpd/_ssl-proxy-verify_ssl_proxy_ca_crt_error_log
-T-2/var/log/httpd/_ssl_ca_crt_does_not_match_access_log
-T-2/var/log/httpd/_ssl_ca_crt_does_not_match_backend_log
-T-2/var/log/httpd/_ssl_ca_crt_does_not_match_error_log
-T-2/var/log/httpd/_ssl_ca_crt_garbage_access_log
-T-2/var/log/httpd/_ssl_ca_crt_garbage_backend_log
-T-2/var/log/httpd/_ssl_ca_crt_garbage_error_log
-T-2/var/log/httpd/_ssl_ca_crt_only_access_log
-T-2/var/log/httpd/_ssl_ca_crt_only_backend_log
-T-2/var/log/httpd/_ssl_ca_crt_only_error_log
-T-2/var/log/httpd/_type-notebook_access_log
-T-2/var/log/httpd/_type-notebook_backend_log
-T-2/var/log/httpd/_type-notebook_error_log
-T-2/var/log/httpd/_type-redirect-custom_domain_access_log
-T-2/var/log/httpd/_type-redirect-custom_domain_error_log
-T-2/var/log/httpd/_type-redirect_access_log
-T-2/var/log/httpd/_type-redirect_error_log
-T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_access_log
-T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_backend_log
-T-2/var/log/httpd/_type-websocket-websocket-path-list-websocket-transparent-false_error_log
-T-2/var/log/httpd/_type-websocket-websocket-path-list_access_log
-T-2/var/log/httpd/_type-websocket-websocket-path-list_backend_log
-T-2/var/log/httpd/_type-websocket-websocket-path-list_error_log
-T-2/var/log/httpd/_type-websocket-websocket-transparent-false_access_log
-T-2/var/log/httpd/_type-websocket-websocket-transparent-false_backend_log
-T-2/var/log/httpd/_type-websocket-websocket-transparent-false_error_log
-T-2/var/log/httpd/_type-websocket_access_log
-T-2/var/log/httpd/_type-websocket_backend_log
-T-2/var/log/httpd/_type-websocket_error_log
-T-2/var/log/httpd/_type-zope-default-path_access_log
-T-2/var/log/httpd/_type-zope-default-path_backend_log
-T-2/var/log/httpd/_type-zope-default-path_error_log
-T-2/var/log/httpd/_type-zope-path_access_log
-T-2/var/log/httpd/_type-zope-path_backend_log
-T-2/var/log/httpd/_type-zope-path_error_log
-T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_access_log
-T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_backend_log
-T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend-https-only_error_log
-T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_access_log
-T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_backend_log
-T-2/var/log/httpd/_type-zope-prefer-gzip-encoding-to-backend_error_log
-T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_access_log
-T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_backend_log
-T-2/var/log/httpd/_type-zope-virtualhostroot-http-port_error_log
-T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_access_log
-T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_backend_log
-T-2/var/log/httpd/_type-zope-virtualhostroot-https-port_error_log
-T-2/var/log/httpd/_type-zope_access_log
-T-2/var/log/httpd/_type-zope_backend_log
-T-2/var/log/httpd/_type-zope_error_log
-T-2/var/log/httpd/_url-netloc-list_access_log
-T-2/var/log/httpd/_url-netloc-list_backend_log
-T-2/var/log/httpd/_url-netloc-list_error_log
-T-2/var/log/httpd/_url_https-url_access_log
-T-2/var/log/httpd/_url_https-url_backend_log
-T-2/var/log/httpd/_url_https-url_error_log
-T-2/var/log/monitor-httpd-access.log
-T-2/var/log/monitor-httpd-error.log
-T-2/var/log/slave-introspection-access.log
-T-2/var/log/slave-introspection-error.log
-T-2/var/log/trafficserver/manager.log

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_file_list_run.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/backend-haproxy-rsyslogd.pid
-T-2/var/run/backend-haproxy.pid
-T-2/var/run/backend_haproxy_configuration_last_state
-T-2/var/run/backend_haproxy_graceful_configuration_state_signature
-T-2/var/run/bhlog.sck
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid
-T-2/var/run/slave-introspection.pid
-T-2/var/run/slave_introspection_configuration_last_state
-T-2/var/run/slave_introspection_graceful_configuration_state_signature

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibility.test_supervisor_state.txt

-T-0:aibcc-user-caucase-updater-on-watch RUNNING
-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
-T-2:backend-haproxy-{hash-generic}-on-watch RUNNING
-T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
-T-2:backend-haproxy-safe-graceful EXITED
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:slave-instrospection-nginx-{hash-generic}-on-watch RUNNING
-T-2:slave-introspection-safe-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_file_list_run.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/backend-haproxy-rsyslogd.pid
-T-2/var/run/backend-haproxy.pid
-T-2/var/run/backend_haproxy_configuration_last_state
-T-2/var/run/backend_haproxy_graceful_configuration_state_signature
-T-2/var/run/bhlog.sck
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid
-T-2/var/run/slave-introspection.pid
-T-2/var/run/slave_introspection_configuration_last_state
-T-2/var/run/slave_introspection_graceful_configuration_state_signature

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityOverrideMaster.test_supervisor_state.txt

-T-0:aibcc-user-caucase-updater-on-watch RUNNING
-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
-T-2:backend-haproxy-{hash-generic}-on-watch RUNNING
-T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
-T-2:backend-haproxy-safe-graceful EXITED
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:slave-instrospection-nginx-{hash-generic}-on-watch RUNNING
-T-2:slave-introspection-safe-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_file_list_run.txt

-T-0/var/run/monitor-httpd.pid
-T-1/var/run/kedifa.pid
-T-1/var/run/monitor-httpd.pid
-T-2/var/run/backend-haproxy-rsyslogd.pid
-T-2/var/run/backend-haproxy.pid
-T-2/var/run/backend_haproxy_configuration_last_state
-T-2/var/run/backend_haproxy_graceful_configuration_state_signature
-T-2/var/run/bhlog.sck
-T-2/var/run/graceful_configuration_state_signature
-T-2/var/run/httpd.pid
-T-2/var/run/monitor-httpd.pid
-T-2/var/run/slave-introspection.pid
-T-2/var/run/slave_introspection_configuration_last_state
-T-2/var/run/slave_introspection_graceful_configuration_state_signature

software/caddy-frontend/test/test_data/test.TestSlaveSlapOSMasterCertificateCompatibilityUpdate.test_supervisor_state.txt

-T-0:aibcc-user-caucase-updater-on-watch RUNNING
-T-0:aikc-user-caucase-updater-on-watch RUNNING
-T-0:bootstrap-monitor EXITED
-T-0:caucased-backend-client-{hash-generic}-on-watch RUNNING
-T-0:certificate_authority-{hash-generic}-on-watch RUNNING
-T-0:crond-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-0:monitor-httpd-graceful EXITED
-T-0:rejected-slave-publish-{hash-rejected-slave-publish}-on-watch RUNNING
-T-1:bootstrap-monitor EXITED
-T-1:caucase-updater-on-watch RUNNING
-T-1:caucased-{hash-generic}-on-watch RUNNING
-T-1:certificate_authority-{hash-generic}-on-watch RUNNING
-T-1:crond-{hash-generic}-on-watch RUNNING
-T-1:expose-csr-{hash-generic}-on-watch RUNNING
-T-1:kedifa-{hash-generic}-on-watch RUNNING
-T-1:kedifa-reloader EXITED
-T-1:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-1:monitor-httpd-graceful EXITED
-T-2:6tunnel-11080-{hash-generic}-on-watch RUNNING
-T-2:6tunnel-11443-{hash-generic}-on-watch RUNNING
-T-2:backend-client-login-certificate-caucase-updater-on-watch RUNNING
-T-2:backend-haproxy-{hash-generic}-on-watch RUNNING
-T-2:backend-haproxy-rsyslogd-{hash-generic}-on-watch RUNNING
-T-2:backend-haproxy-safe-graceful EXITED
-T-2:bootstrap-monitor EXITED
-T-2:certificate_authority-{hash-generic}-on-watch RUNNING
-T-2:crond-{hash-generic}-on-watch RUNNING
-T-2:expose-csr-{hash-generic}-on-watch RUNNING
-T-2:frontend-caddy-safe-graceful EXITED
-T-2:frontend_caddy-{hash-caddy-T-2}-on-watch RUNNING
-T-2:kedifa-login-certificate-caucase-updater-on-watch RUNNING
-T-2:kedifa-updater-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-{hash-generic}-on-watch RUNNING
-T-2:monitor-httpd-graceful EXITED
-T-2:slave-instrospection-nginx-{hash-generic}-on-watch RUNNING
-T-2:slave-introspection-safe-graceful EXITED
-T-2:trafficserver-{hash-generic}-on-watch RUNNING
-T-2:trafficserver-reload EXITED

software/ors-amarisoft/buildout.hash.cfg

@@ -16,7 +16,7 @@
 
 [template]
 filename = instance.cfg
-md5sum = fe055b993754ca665b8249cbfb9bbc8b
+md5sum = 6e5c63c35b13f8920ea13e24c27d7b50
 
 [template-lte-enb-epc]
 _update_hash_filename_ = instance-enb-epc.jinja2.cfg
@@ -24,7 +24,7 @@ md5sum = c9994f2ef03edd7d6773307a6385c47c
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = 8f8c7295104757e0cccfab3811a4fb24
+md5sum = 04dbc8396cb112e86d5d1564df033b82
 
 [template-lte-gnb-epc]
 _update_hash_filename_ = instance-gnb-epc.jinja2.cfg
@@ -36,7 +36,7 @@ md5sum = b17674f523adce9b0dda942c1493674d
 
 [template-lte-gnb]
 _update_hash_filename_ = instance-gnb.jinja2.cfg
-md5sum = fdc012ad6f0d3d055450a4ff7efd15e4
+md5sum = 01f4de736594a0810a66f847753fadf1
 
 [template-lte-mme]
 _update_hash_filename_ = instance-mme.jinja2.cfg
@@ -44,11 +44,11 @@ md5sum = 728f4d3ae248710c23e4b73eea4d628e
 
 [template-lte-ue-lte]
 _update_hash_filename_ = instance-ue-lte.jinja2.cfg
-md5sum = 0808194507345550abc37118129fb757
+md5sum = 4517baee6700afbf78de3b2d7dd4ba22
 
 [template-lte-ue-nr]
 _update_hash_filename_ = instance-ue-nr.jinja2.cfg
-md5sum = ed4112748616803ec0eb3c30bde80856
+md5sum = 45e7ade19a579d6750d2733a0659dc1a
 
 [ue_db.jinja2.cfg]
 filename = config/ue_db.jinja2.cfg
@@ -64,7 +64,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a
 
 [gnb.jinja2.cfg]
 filename = config/gnb.jinja2.cfg
-md5sum = 0ad683812818a02ef5010d087ec7138b
+md5sum = 407c20d11c5417636b985fe4886bf135
 
 [ltelogs.jinja2.sh]
 filename = ltelogs.jinja2.sh
@@ -88,7 +88,7 @@ md5sum = b3078deab008d7e81ddd88ac02b8b698
 
 [sdr-busy-promise]
 _update_hash_filename_ = promise/check_sdr_busy.py
-md5sum = a9d7a06c43410e02070b9ddae7b46b38
+md5sum = 2e25144d1d952ed5bebb194360b60afb
 
 [interface-up-promise]
 _update_hash_filename_ = promise/check_interface_up.py

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

 #define FR2                  0  // Values: 0 (FR1), 1 (FR2)
 #define NR_TDD_CONFIG        2  // Values: FR1: 1, 2, 3, 4 (compatible with LTE TDD config 2) FR2: 10
 #define N_ANTENNA_DL         2  // Values: 1 (SISO), 2 (MIMO 2x2), 4 (MIMO 4x4)
+{% if slapparameter_dict.get('rrh', '') == "M2RU Sunwave" %}
+#define N_ANTENNA_UL         1  // Values: 1, 2, 4
+{% else %}
 #define N_ANTENNA_UL         2  // Values: 1, 2, 4
+{% endif %}
 #define NR_BANDWIDTH         {{ slapparameter_dict.get('nr_bandwidth', slap_configuration['configuration.default_nr_bandwidth']) }} // NR cell bandwidth
 #define NR_LONG_PUCCH_FORMAT 2  // Values: 2, 3, 4
 
@@ -9,6 +13,20 @@
   log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,ngap.level=debug,ngap.max_size=1,xnap.level=debug,xnap.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
   log_filename: "{{ directory['log'] }}/gnb.log",
 
+{% if slapparameter_dict.get('rrh', '') == "M2RU Sunwave" %}
+  rf_driver: {
+      name: "sdr",
+      args: "dev0=/dev/sdr0@0",
+      cpri_mapping: "bf1",
+      cpri_mult: 16,
+      cpri_rx_delay: 11.0,
+      cpri_tx_delay: 0,
+      ifname: "cpri0",
+      cpri_tx_dbm: 42.0,
+  },
+  tx_gain: 0,
+  rx_gain: 0,
+{% else %}
   rf_driver: {
         name: "sdr",
         
@@ -19,6 +37,7 @@
   },
   tx_gain: {{ slapparameter_dict.get('tx_gain', slap_configuration['configuration.default_nr_tx_gain']) }}, 
   rx_gain: {{ slapparameter_dict.get('rx_gain', slap_configuration['configuration.default_nr_rx_gain']) }}, 
+{% endif %}
 
   amf_list: [
 {% if slapparameter_dict.get('amf_list', '') %}
@@ -232,7 +251,11 @@
 #endif
       msg1_subcarrier_spacing: 30, 
       msg1_fdm: 1,
+{% if slapparameter_dict.get('rrh', '') == "M2RU Sunwave" %}
+      msg1_frequency_start: 0,
+{% else %}
       msg1_frequency_start: -1,
+{% endif %}
       zero_correlation_zone_config: 15,
       preamble_received_target_power: -110, 
       preamble_trans_max: 7,
@@ -245,12 +268,20 @@
     },
 
     pdcch: {
+{% if slapparameter_dict.get('rrh', '') == "M2RU Sunwave" %}
+      n_rb_coreset0: 48,
+      n_symb_coreset0: 1,
+{% endif %}
       search_space0_index: 0,
 
       dedicated_coreset: {
         rb_start: -1, 
         l_crb: -1, 
+{% if slapparameter_dict.get('rrh', '') == "M2RU Sunwave" %}
+        duration: 1,
+{% else %}
         duration: 0, 
+{% endif %}
         precoder_granularity: "sameAsREG_bundle",
       },
 
@@ -272,13 +303,13 @@
       dmrs_add_pos: 1,
       dmrs_type: 1,
       dmrs_max_len: 1,
-      
-      
+{% if slapparameter_dict.get('rrh', '') == "M2RU Sunwave" %}
+      k0: 0,
+      k1: [ 8, 7, 7, 6, 5, 4, 12, 11 ],
+{% endif %}
       mcs_table: "qam256",
       rar_mcs: 2,
       si_mcs: 6,
-      
-      
     },
 
     csi_rs: {
@@ -548,14 +579,14 @@
       mcs_table: "qam256", 
       mcs_table_tp: "qam256", 
       ldpc_max_its: 5,
-      
+{% if slapparameter_dict.get('rrh', '') == "M2RU Sunwave" %}
+      k2: 4,
+      msg3_k2: 7,
+{% endif %}
       p0_nominal_with_grant: -76,
       msg3_mcs: 4,
       msg3_delta_power: 0, 
       beta_offset_ack_index: 9,
-
-      
-      
     },
 
     

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

@@ -137,3 +137,4 @@ eggs = slapos.core
 file = {{ sdr_busy_promise }}
 output = ${directory:plugins}/check-sdr-busy.py
 config-testing = {{ slapparameter_dict.get("testing", False) }}
+config-sdr = {{ sdr }}

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

@@ -23,6 +23,16 @@
       "type": "boolean"
     },
 {%- endif %}
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "M2RU Sunwave"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

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

@@ -137,3 +137,4 @@ eggs = slapos.core
 file = {{ sdr_busy_promise }}
 output = ${directory:plugins}/check-sdr-busy.py
 config-testing = {{ slapparameter_dict.get("testing", False) }}
+config-sdr = {{ sdr }}

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

@@ -21,6 +21,16 @@
       "description": "Activate iperf3 UDP server",
       "type": "boolean"
     },
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "M2RU Sunwave"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

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

@@ -3,6 +3,16 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "M2RU Sunwave"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

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

@@ -21,6 +21,16 @@
       "description": "Activate iperf3 UDP server",
       "type": "boolean"
     },
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "M2RU Sunwave"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

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

@@ -3,6 +3,16 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "M2RU Sunwave"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

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

@@ -21,6 +21,16 @@
       "description": "Activate iperf3 UDP server",
       "type": "boolean"
     },
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "M2RU Sunwave"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

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

@@ -3,6 +3,16 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "M2RU Sunwave"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

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

@@ -21,6 +21,16 @@
       "description": "Activate iperf3 UDP server",
       "type": "boolean"
     },
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "M2RU Sunwave"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

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

@@ -3,6 +3,16 @@
   "$schema": "http://json-schema.org/draft-04/schema",
   "title": "Input Parameters",
   "properties": {
+    "rrh": {
+      "title": "RRH",
+      "description": "RRH",
+      "type": "string",
+      "default": "SDR",
+      "enum": [
+        "SDR",
+        "M2RU Sunwave"
+      ]
+    },
     "tx_gain": {
       "title": "Tx gain",
       "description": "Tx gain (in dB)",

software/ors-amarisoft/instance-ue-lte.jinja2.cfg

@@ -120,17 +120,11 @@ monitor-title = {{ slapparameter_dict['name'] | string }}
 password = {{ slapparameter_dict['monitor-password'] | string }}
 {% endif %}
 
-[sdr-busy-promise-template]
-recipe = slapos.recipe.template:jinja2
-url = {{ sdr_busy_promise }}
-output = ${directory:etc}/check-sdr-busy.py
-extensions = jinja2.ext.do
-context =
-  key slapparameter_dict slap-configuration:configuration
-
 # Add custom promise to check if /dev/sdr0 is busy
 [sdr-busy-promise]
 recipe = slapos.cookbook:promise.plugin
 eggs = slapos.core
-file = ${sdr-busy-promise-template:output}
+file = {{ sdr_busy_promise }}
 output = ${directory:plugins}/check-sdr-busy.py
+config-testing = {{ slapparameter_dict.get("testing", False) }}
+config-sdr = {{ sdr }}

software/ors-amarisoft/instance-ue-nr.jinja2.cfg

@@ -123,17 +123,11 @@ monitor-title = {{ slapparameter_dict['name'] | string }}
 password = {{ slapparameter_dict['monitor-password'] | string }}
 {% endif %}
 
-[sdr-busy-promise-template]
-recipe = slapos.recipe.template:jinja2
-url = {{ sdr_busy_promise }}
-output = ${directory:etc}/check-sdr-busy.py
-extensions = jinja2.ext.do
-context =
-  key slapparameter_dict slap-configuration:configuration
-
 # Add custom promise to check if /dev/sdr0 is busy
 [sdr-busy-promise]
 recipe = slapos.cookbook:promise.plugin
 eggs = slapos.core
-file = ${sdr-busy-promise-template:output}
+file = {{ sdr_busy_promise }}
 output = ${directory:plugins}/check-sdr-busy.py
+config-testing = {{ slapparameter_dict.get("testing", False) }}
+config-sdr = {{ sdr }}

software/ors-amarisoft/instance.cfg

@@ -36,6 +36,7 @@ init =
   path = "/opt/amarisoft/v" + lte_version
   options['lte-version'] = lte_version
   options['path'] = path
+  options['sdr'] = path + "/trx_sdr"
   options['enb'] = path + "/enb"
   options['mme'] = path + "/mme"
   options['ims'] = path + "/ims"
@@ -101,6 +102,7 @@ extensions = jinja2.ext.do
 extra-context =
     raw monitor_template ${monitor2-template:output}
     key enb amarisoft:enb
+    key sdr amarisoft:sdr
     raw enb_template   ${enb.jinja2.cfg:target}
     raw sib23   ${sib23.asn:target}
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
@@ -124,6 +126,7 @@ extensions = jinja2.ext.do
 extra-context =
     raw monitor_template ${monitor2-template:output}
     key enb amarisoft:enb
+    key sdr amarisoft:sdr
     raw gnb_template   ${gnb.jinja2.cfg:target}
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw sdr_busy_promise   ${sdr-busy-promise:target}
@@ -165,6 +168,7 @@ extra-context =
     raw monitor_template ${monitor2-template:output}
     raw interface_up_promise   ${interface-up-promise:target}
     key ue amarisoft:ue
+    key sdr amarisoft:sdr
     raw ue_lte_template   ${ue-lte.jinja2.cfg:target}
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw sdr_busy_promise   ${sdr-busy-promise:target}
@@ -188,6 +192,7 @@ extra-context =
     raw monitor_template ${monitor2-template:output}
     raw interface_up_promise   ${interface-up-promise:target}
     key ue amarisoft:ue
+    key sdr amarisoft:sdr
     raw ue_nr_template   ${ue-nr.jinja2.cfg:target}
     raw ltelogs_template   ${ltelogs.jinja2.sh:target}
     raw sdr_busy_promise   ${sdr-busy-promise:target}

software/ors-amarisoft/promise/check_sdr_busy.py

 import os
 import errno
+import subprocess
 
 from zope.interface import implementer
 from slapos.grid.promise import interface
@@ -28,18 +29,22 @@ class RunPromise(GenericPromise):
       In this case, check whether the file exists.
     """
     testing = self.getConfig('testing') == "True"
-    sdr_dev = '/dev/sdr0'
+    sdr = self.getConfig('sdr')
 
     if testing:
         self.logger.info("skipping promise")
         return
-
     try:
-      open(sdr_dev, 'w').close()
-      self.logger.error("eNB is not using %s", sdr_dev)
-    except IOError as e:
-      if e.errno == errno.EBUSY:
-        self.logger.info("eNB is using %s", sdr_dev)
+      out = subprocess.check_output([
+        sdr + '/sdr_util', '-c', '0', 'version'], stderr=subprocess.STDOUT)
+    except subprocess.CalledProcessError as e:
+      if e.returncode == 1 and \
+        ("DMA channel is already opened" in e.output.decode() or \
+         "Device or resource busy" in e.output.decode()):
+        self.logger.info("eNB is using /dev/sdr0")
+        return
+    self.logger.error("eNB is not using /dev/sdr0")
+
 
   def test(self):
     """