testing

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

@@ -34,7 +34,7 @@ promise = ${:etc}/promise
 log = ${:var}/log
 
 [request-common-base]
-recipe = slapos.cookbook:request.serialised
+recipe = slapos.cookbook:requestoptional.serialised
 software-url = {{ slap_connection['software-release-url'] }}
 server-url = {{ slap_connection['server-url'] }}
 computer-id = {{ slap_connection['computer-id'] }}

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

@@ -33,7 +33,7 @@ promise = ${:etc}/promise
 log = ${:var}/log
 
 [request-common-base]
-recipe = slapos.cookbook:request.serialised
+recipe = slapos.cookbook:requestoptional.serialised
 software-url = {{ slap_connection['software-release-url'] }}
 server-url = {{ slap_connection['server-url'] }}
 computer-id = {{ slap_connection['computer-id'] }}

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

@@ -34,7 +34,7 @@ promise = ${:etc}/promise
 log = ${:var}/log
 
 [request-common-base]
-recipe = slapos.cookbook:request.serialised
+recipe = slapos.cookbook:requestoptional.serialised
 software-url = {{ slap_connection['software-release-url'] }}
 server-url = {{ slap_connection['server-url'] }}
 computer-id = {{ slap_connection['computer-id'] }}

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

@@ -156,4 +156,4 @@ recipe = slapos.cookbook:promise.plugin
 eggs = slapos.core
 file = {{ interface_up_promise }}
 output = ${directory:plugins}/check-tun-up.py
-config-ifname = ${slap-configuration:tun-name}
+config-ifname = "slaptun0"

software/ors-amarisoft/test/README.md

+Tests for ors-amarisoft software release

software/ors-amarisoft/test/setup.py

+##############################################################################
+#
+# Copyright (c) 2018 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+from setuptools import setup, find_packages
+
+version = '0.0.1.dev0'
+name = 'slapos.test.ors_amarisoft'
+with open("README.md") as f:
+  long_description = f.read()
+
+setup(
+    name=name,
+    version=version,
+    description="Test for SlapOS' ors-amarisoft",
+    long_description=long_description,
+    long_description_content_type='text/markdown',
+    maintainer="Nexedi",
+    maintainer_email="info@nexedi.com",
+    url="https://lab.nexedi.com/nexedi/slapos",
+    packages=find_packages(),
+    install_requires=[
+        'slapos.core',
+        'slapos.libnetworkcache',
+        'slapos.cookbook',
+    ],
+    zip_safe=True,
+    test_suite='test',
+)

software/ors-amarisoft/test/test.py

+##############################################################################
+#
+# Copyright (c) 2018 Nexedi SA and Contributors. All Rights Reserved.
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 3
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+import os
+import json
+
+from slapos.testing.testcase import makeModuleSetUpAndTestCaseClass
+
+setUpModule, ORS3700TestCase = makeModuleSetUpAndTestCaseClass(
+    os.path.abspath(
+        os.path.join(os.path.dirname(__file__), '..', 'software-tdd3700.cfg')))
+
+
+class TestInstance(ORS3700TestCase):
+  def test_instance(self):
+    self.logger.info('Start test_instance')
+    # START: mock .slapos-resource with tap.ipv4_addr
+    # needed for netconfig.sh
+    test_partition_slapos_resource_file = os.path.join(
+      self.computer_partition_root_path, '.slapos-resource')
+    path = os.path.realpath(os.curdir)
+    while path != '/':
+      root_slapos_resource_file = os.path.join(path, '.slapos-resource')
+      if os.path.exists(root_slapos_resource_file):
+        break
+      path = os.path.realpath(os.path.join(path, '..'))
+    else:
+      raise ValueError('No .slapos-resource found to base the mock on')
+    self.logger.info('root_slapos_resource_file: ' + str(root_slapos_resource_file))
+    with open(root_slapos_resource_file) as fh:
+      root_slapos_resource = json.load(fh)
+    if root_slapos_resource['tun']['tun_addr'] == '':
+      root_slapos_resource['tun'].update({
+        "ipv4_addr": "10.0.0.1", 
+        "ipv4_gateway": "", 
+        "ipv4_netmask": "255.255.128.0", 
+        "ipv4_network": "10.0.0.1/17", 
+        "ipv6_addr": "", 
+        "ipv6_gateway": "", 
+        "ipv6_netmask": "", 
+        "ipv6_network": "", 
+        "name": "slaptun0"
+      })
+    with open(test_partition_slapos_resource_file, 'w') as fh:
+      json.dump(root_slapos_resource, fh, indent=4)
+    self.slap.waitForInstance(max_retry=10)
+    # END: mock .slapos-resource with tap.ipv4_addr
+
+    #connection_parameter_dict = self.getConnectionParameterDictJson()
+    connection_parameters = self.computer_partition.getConnectionParameterDict()