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

component/bridge-utils/buildout.cfg

+[buildout]
+extends =
+  ../autoconf/buildout.cfg
+  ../automake/buildout.cfg
+
+parts =
+  brctl
+
+
+[brctl]
+recipe = slapos.recipe.cmmi
+url = https://mirrors.edge.kernel.org/pub/linux/utils/net/bridge-utils/bridge-utils-1.7.1.tar.xz
+md5sum = 3e1fee4dc22cac5457c2f6ffb990a518
+environment =
+  PATH=${autoconf:location}/bin:${automake:location}/bin:%(PATH)s
+pre-configure =
+  aclocal &&
+  autoconf

component/glib/buildout.cfg

@@ -25,7 +25,7 @@ configure-options =
   --disable-fam
   --disable-xattr
   --disable-man
-  --with-python=${buildout:executable}
+  --with-python=$PYTHON
 environment =
   PATH=${gettext:location}/bin:${patch:location}/bin:${perl:location}/bin:${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${gettext:location}/include -I${zlib:location}/include
@@ -34,3 +34,4 @@ environment =
   LIBFFI_LIBS= -L${libffi:location}/lib -Wl,-rpath=${libffi:location}/lib -lffi
   PCRE_CFLAGS=-I${pcre:location}/include
   PCRE_LIBS=-L${pcre:location}/lib -Wl,-rpath=${pcre:location}/lib -lpcre
+post-install = rm %(location)s/bin/gtester-report

component/miniupnpd/buildout.cfg

+[buildout]
+extends =
+  ../nftables/buildout.cfg
+  ../util-linux/buildout.cfg
+  ../pkgconfig/buildout.cfg
+  ../openssl/buildout.cfg
+  ../zlib/buildout.cfg
+
+
+parts =
+  miniupnpd
+
+[miniupnp-repository]
+recipe = slapos.recipe.build:gitclone
+repository = https://github.com/miniupnp/miniupnp.git
+revision = miniupnpd_2_3_0
+git-executable = ${git:location}/bin/git
+
+
+[miniupnpd]
+recipe = slapos.recipe.cmmi
+shared = true
+path = ${miniupnp-repository:location}/miniupnpd
+environment =
+  PATH=${pkgconfig:location}/bin:%(PATH)s
+  PKG_CONFIG_PATH=${iptables:location}/lib/pkgconfig:${libuuid:location}/lib/pkgconfig:${openssl:location}/lib/pkgconfig
+  LDFLAGS=-L${libuuid:location}/lib -L${openssl:location}/lib -L${zlib:location}/lib
+# because these configure not support prefix syntax
+configure-command = ./configure
+configure-options =
+  --firewall=iptables
+make-options =
+  -f Makefile.linux
+make-targets =
+  install PREFIX=%(location)s

format-json

-#!/usr/bin/env python
+#!/usr/bin/env python3
 r"""Command-line tool to format software release JSON for slapos.
 
 Inspired by json.tool from python, but enforcing 2 spaces and non-sorted keys.

software/beremiz-ide/buildout.hash.cfg

@@ -15,7 +15,7 @@
 
 [instance]
 filename = instance.cfg.in
-md5sum = fd556a0cb44610f0b0898b7126bd77b2
+md5sum = db7fe97f4c6b84cfadb7b5c68eab517a
 
 [template-instance-beremiz]
 filename = instance-beremiz.cfg.jinja2.in
@@ -23,7 +23,7 @@ md5sum = c92317d0d754f62d3259136d1a0df1ac
 
 [template-instance-beremiz-test]
 filename = instance-beremiz-test.cfg.jinja2.in
-md5sum = ff7cf06927041f6aec5ad559950b69cb
+md5sum = a2fa2b9d3a225a1dd71db67bd4fea769
 
 [template-fluxbox-menu.in]
 filename = fluxbox-menu.in

software/beremiz-ide/instance-beremiz-test.cfg.jinja2.in

@@ -21,6 +21,13 @@ environment =
   XORG_LOCK_DIR=${xserver:lock-dir}
   DISPLAY=${xserver:display}
 
+[beremiz-env.sh]
+# Add openssl needed to build matiec during tests
+inline +=
+  #export OPENSSL_CRYPTO_LIBRARY={{ openssl_location }}/lib
+  #export OPENSSL_INCLUDE_DIR={{ openssl_location }}/include
+  export OPENSSL_ROOT_DIR={{ openssl_location }}
+
 [runTestSuite]
 env.sh  = ${beremiz-env.sh:output}
 workdir = {{ nxdtest_dir }}

software/beremiz-ide/instance.cfg.in

@@ -82,4 +82,5 @@ extra-context =
   raw instance_nxdtest   {{ nxdtest_template }}
   raw xdotool_bin        {{ xdotool_location }}/bin/xdotool
   raw opencv_location    {{ opencv_location }}
+  raw openssl_location   {{ openssl_location }}
   raw nxdtest_dir        {{ buildout_directory }}

software/ors-amarisoft/buildout.hash.cfg

@@ -24,7 +24,7 @@ md5sum = c9994f2ef03edd7d6773307a6385c47c
 
 [template-lte-enb]
 _update_hash_filename_ = instance-enb.jinja2.cfg
-md5sum = c450b8c307d20738a98bcb4f6ffeee16
+md5sum = 34026b07bdd850dd3fb3ffff5377a0c2
 
 [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 = 9732653a0e2c7fe91d80da80762430d2
+md5sum = 7acdbad30c130faa3bce49b04b2c0c2f
 
 [template-lte-mme]
 _update_hash_filename_ = instance-mme.jinja2.cfg
@@ -48,7 +48,7 @@ md5sum = dcaac06553a3222b14c0013a13f4a149
 
 [enb.jinja2.cfg]
 filename = config/enb.jinja2.cfg
-md5sum = 8029046031f17da3f81ace017ba193c9
+md5sum = de256b536ef731f123d9f9a239cdce06
 
 [sib23.asn]
 filename = config/sib23.asn
@@ -56,7 +56,7 @@ md5sum = b377dac7f1fcf94fb9ce9ebed617f36a
 
 [gnb.jinja2.cfg]
 filename = config/gnb.jinja2.cfg
-md5sum = 7f7c8ddf242027bddc3e84c7a0c74474
+md5sum = 8d0c56aef8446b4f5b41353f1ee775f6
 
 [ltelogs.jinja2.sh]
 filename = ltelogs.jinja2.sh

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

@@ -4,7 +4,7 @@
 #define N_ANTENNA_UL        2
 
 {
-  log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,file.rotate=1G,file.path=/dev/null",
+  log_options: "all.level=error,all.max_size=0,nas.level=debug,nas.max_size=1,s1ap.level=debug,s1ap.max_size=1,x2ap.level=debug,x2ap.max_size=1,rrc.level=debug,rrc.max_size=1,phy.level=info,file.rotate=1G,file.path=/dev/null",
   log_filename: "{{ directory['log'] }}/enb.log",
 
   rf_driver: {

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

@@ -6,7 +6,7 @@
 #define NR_LONG_PUCCH_FORMAT 2  // Values: 2, 3, 4
 
 {
-  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,file.rotate=1G,file.path=/dev/null",
+  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",
 
   rf_driver: {

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

@@ -75,6 +75,8 @@ inline =
   #!/bin/sh
 {% if not slapparameter_dict.get("testing", False) %}
   sudo /opt/amarisoft/rm-tmp-lte | true;
+  sudo /opt/amarisoft/init-sdr | true;
+  sudo /opt/amarisoft/init-enb | true;
   {{ enb }}/lteenb ${directory:etc}/enb.cfg >> ${directory:log}/enb-output.log 2>> ${directory:log}/enb-output.log
 {% endif %}
 

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

@@ -76,6 +76,8 @@ inline =
   #!/bin/sh
 {% if not slapparameter_dict.get("testing", False) %}
   sudo /opt/amarisoft/rm-tmp-lte | true;
+  sudo /opt/amarisoft/init-sdr | true;
+  sudo /opt/amarisoft/init-enb | true;
   {{ enb }}/lteenb ${directory:etc}/gnb.cfg >> ${directory:log}/gnb-output.log 2>> ${directory:log}/gnb-output.log
 {% endif %}
 

software/slapos-testing/buildout.hash.cfg

@@ -15,4 +15,4 @@
 
 [template]
 filename = instance.cfg
-md5sum = 3112bf86fa543df52548a551f5413f99
+md5sum = a8bd56d112344ae56138e3a775fec478

software/slapos-testing/instance.cfg

@@ -87,12 +87,26 @@ repository = ${slapos.rebootstrap-repository:location}
 <= download-source
 repository = ${rubygemsrecipe-repository:location}
 
+[re6stnet]
+<= download-source
+repository = ${re6stnet-repository:location}
+
+[re6stnet-test-runner]
+recipe = slapos.recipe.template:jinja2
+template = inline:#!/bin/sh
+  #change #!/usr/bin/python2 -> #!/real_python_path/bin/pythonVersion
+  sed '1s?/usr/bin/python2?${python:location}/bin/python${python:version}?' -i ${re6stnet-repository:location}/re6st/ovpn-*
+  # update files in /sys/class/net
+  mount -t sysfs sysfs /sys
+
+  python -m unittest discover -v
+rendered = $${re6stnet:location}/test-runner.sh
 
 [slapos-test-runner-nxdtest-environment.sh]
 recipe = slapos.recipe.template
 output = $${create-directory:etc}/$${:_buildout_section_name_}
 inline =
-  export PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${jq:location}/bin:${sed:location}/bin:${grep:location}/bin:${git:location}/bin:${libxslt:location}/bin:${socat:location}/bin:${lmsensors:location}/bin:${rsync:location}/bin/:${buildout:bin-directory}:$PATH
+  export PATH=${coreutils:location}/bin:${curl:location}/bin:${openssl:location}/bin:${jq:location}/bin:${sed:location}/bin:${grep:location}/bin:${git:location}/bin:${libxslt:location}/bin:${socat:location}/bin:${lmsensors:location}/bin:${rsync:location}/bin/:${iptables:location}/sbin:${miniupnpd:location}/usr/sbin:${brctl:location}/sbin:${openvpn:location}/sbin:${babeld:location}/bin:${buildout:bin-directory}:$PATH
   export SLAPOS_TEST_IPV4=$${slap-configuration:ipv4-random}
   export SLAPOS_TEST_IPV6=$${slap-configuration:ipv6-random}
   export SLAPOS_TEST_EGGS_DIRECTORY=$${buildout:eggs-directory}
@@ -105,6 +119,7 @@ recipe = slapos.recipe.template
 output = $${:workdir}/.nxdtest
 workdir = $${create-directory:nxdtest-working-dir}
 inline =
+  import six
   TestCase(
       "kedifa",
       ['python', '-m', 'unittest', 'discover', '-v'],
@@ -199,6 +214,14 @@ inline =
       cwd="""$${rubygemsrecipe:location}""",
       summaryf=UnitTest.summary,
   )
+  if six.PY2:
+    TestCase(
+        "re6stnet",
+        ['unshare', '-Umnr', '$${re6stnet-test-runner:rendered}'],
+        cwd="""$${re6stnet:location}/re6st/tests""",
+        summaryf=UnitTest.summary,
+    )
+
 
 [runTestSuite]
 env.sh = $${slapos-test-runner-nxdtest-environment.sh:output}

software/slapos-testing/software-py2.cfg

@@ -4,3 +4,7 @@ extends =
 
 [python]
 part = python2.7
+
+[extra-eggs]
+eggs +=
+  ${re6stnet-setup:egg}

software/slapos-testing/software.cfg

@@ -19,6 +19,11 @@ extends =
   ../../component/userhosts/buildout.cfg
   ../../component/postgresql/buildout.cfg
   ../../component/psycopg2/buildout.cfg
+  ../../component/nftables/buildout.cfg
+  ../../component/miniupnpd/buildout.cfg
+  ../../component/openvpn/buildout.cfg
+  ../../component/babeld/buildout.cfg
+  ../../component/bridge-utils/buildout.cfg
   ../../stack/slapos.cfg
   ../../stack/caucase/buildout.cfg
   ../../stack/nxdtest.cfg
@@ -116,6 +121,14 @@ setup = ${slapos.rebootstrap-repository:location}
 egg = rubygemsrecipe[test]
 setup = ${rubygemsrecipe-repository:location}
 
+[re6stnet-setup]
+<= setup-develop-egg
+egg = re6stnet[test]
+setup = ${re6stnet-repository:location}
+
+[extra-eggs]
+eggs =
+
 [eggs]
 <= python-interpreter
 eggs +=
@@ -142,6 +155,7 @@ eggs +=
   ${rubygemsrecipe-setup:egg}
   zope.testing
   supervisor
+  ${extra-eggs:eggs}
 
 [eggs/scripts]
 recipe = zc.recipe.egg
@@ -215,6 +229,10 @@ repository = https://lab.nexedi.com/nexedi/slapos.rebootstrap.git
 <= git-clone-repository
 repository = https://lab.nexedi.com/nexedi/rubygemsrecipe.git
 
+[re6stnet-repository]
+<= git-clone-repository
+repository = https://lab.nexedi.com/nexedi/re6stnet.git
+
 [template]
 recipe = slapos.recipe.template
 url = ${:_profile_base_location_}/${:filename}
@@ -253,3 +271,8 @@ zope.testing = 4.6.2
 pathlib = 1.0.1
 psycopg2 = 2.8.6
 iniparse = 0.5
+miniupnpc = 1.9
+nemu = 0.3.1
+multiping = 1.1.2
+python-passfd = 0.2
+python-unshare = 0.2

update-hash

-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Helper script to update buildout.hash.cfg
 

validate-schema

-#!/usr/bin/env python
+#!/usr/bin/env python3
 import argparse
 import json
 import os.path