simpleran: use urlparse to get frontend hostname

During tests a hostname and port is provided instead
of an URL, so hostname needs to be retrieved

software/simpleran/buildout.hash.cfg

@@ -36,7 +36,7 @@ md5sum = 3b6c08d7685e7c93ab451bec25e4815f
 
 [ru_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/libinstance.jinja2.cfg
-md5sum = eb3f43791b494c3d586e2717cdd6f660
+md5sum = 349b02e6993409361176a865b780b871
 
 [ru_sdr_libinstance.jinja2.cfg]
 _update_hash_filename_ = ru/sdr/libinstance.jinja2.cfg
@@ -60,7 +60,7 @@ md5sum = 52da9fe3a569199e35ad89ae1a44c30e
 
 [template-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = e89ee67dcee89923aace67759b3a7867
+md5sum = 04b723fc2a3d5555243921823b0e087b
 
 [template-ors-enb]
 _update_hash_filename_ = instance-ors-enb.jinja2.cfg
@@ -76,7 +76,7 @@ md5sum = 92fd8377819ae6e844f77937cecfa605
 
 [template-ue]
 _update_hash_filename_ = instance-ue.jinja2.cfg
-md5sum = 17b3324ed8554782456d30c888683f25
+md5sum = 7b6196d92e6988a52a78660c2b6a8b50
 
 [template-obsolete]
 _update_hash_filename_ = instance-obsolete.jinja2.cfg

software/simpleran/instance-enb.jinja2.cfg

@@ -346,8 +346,8 @@ ipeercell_dict = {{ dumps(ipeercell_dict) }}
 [publish-connection-information]
 <= monitor-publish
 recipe = slapos.cookbook:publish.serialised
-websocket-address = ${request-slave-frontend:connection-domain}/${nginx-params:websocket-path}
-websocket-port = 443
+websocket-hostname = ${frontend-urlparse:hostname}
+websocket-port = ${frontend-urlparse:port}
 websocket-password = ${websocket-password:passwd}
 enb-ipv6 = {{ my_ipv6 }}
 enb-ipv4 = {{ lan_ipv4 }}

software/simpleran/instance-ue.jinja2.cfg

@@ -141,8 +141,8 @@ recipe = slapos.cookbook:publish.serialised
 rue_bind_addr = {{my_ipv6}}
 ue-ipv4 = {{ lan_ipv4 }}
 ue-mac = {{ mac }}
-websocket-address = ${request-slave-frontend:connection-domain}/${nginx-params:websocket-path}
-websocket-port = 443
+websocket-hostname = ${frontend-urlparse:hostname}
+websocket-port = ${frontend-urlparse:port}
 websocket-password = ${websocket-password:passwd}
 monitor-gadget-url = ${:monitor-base-url}/gadget/software.cfg.html
 

software/simpleran/ru/libinstance.jinja2.cfg

@@ -459,12 +459,21 @@ cert-file = ${directory:etc}/websocket.crt
 executable = {{ nginx_executable }}
 wrapper = ${directory:bin}/nginx-with-ca
 
+[frontend-urlparse]
+recipe = slapos.recipe.build
+domain = ${request-slave-frontend:connection-domain}
+init =
+  import six.moves.urllib.parse as urlparse
+  parsed_url = urlparse.urlparse('wss://' + options['domain'])
+  options['hostname'] = parsed_url.hostname
+  options['port'] = parsed_url.port if parsed_url.port else 443
+
 {{ part('websocket-promise') }}
 <= monitor-promise-base
 promise = check_socket_listening
 name = websocket_promise.py
-config-host = ${request-slave-frontend:connection-domain}
-config-port = 443
+config-host = ${frontend-urlparse:hostname}
+config-port = ${frontend-urlparse:port}
 
 {{ part('amarisoft-stats-service') }}
 recipe = slapos.cookbook:wrapper