1. 07 Nov, 2023 1 commit
    • Kirill Smelkov's avatar
      software/ors-amarisoft: Fix pythonwitheggs to explicitly specify in-SlapOS lxml · 77c7da90
      Kirill Smelkov authored
      Our python interpreter uses ncclient which depends on lxml egg, but does not
      explicitly specify to use that lxml from slapos component.
      
      Until now we were lucky because slapos-cookbook depends on the correct lxml and
      we have slapos-cookbook as the second entry in the part list with only
      `template` preceding it.
      
      However I needed to use pythonwitheggs inside that template and then got the
      build failure, because now pythonwitheggs was built before slapos-cookbook and
      tried to use lxml without slapos component:
      
          INFO Building without Cython.
          INFO Error: Please make sure the libxml2 and libxslt development packages are installed.
          INFO An error occurred when trying to install lxml 4.9.1. Look above this message for any errors that were output by easy_install.
          INFO While:
          INFO   Installing pythonwitheggs.
          INFO   Base installation request: 'websocket-client', 'pynacl', 'bcrypt', 'xmltodict', 'ncclient'
          INFO     Requirement of ncclient==0.6.13: six
          INFO     Requirement of ncclient==0.6.13: lxml>=3.3.0
          INFO     Requirement of ncclient==0.6.13: paramiko>=1.15.0
          INFO     Requirement of ncclient==0.6.13: setuptools>0.6
          INFO     Requirement of bcrypt==3.1.4: six>=1.4.1
          INFO     Requirement of bcrypt==3.1.4: cffi>=1.1
          INFO     Requirement of pynacl==1.3.0: cffi>=1.4.1
          INFO     Requirement of pynacl==1.3.0: six
          INFO   Getting distribution for 'lxml==4.9.1'.
          INFO Error: Couldn't install: lxml 4.9.1
      
      -> Fix it by explicitly specifying in-slapos lxml egg to be used.
      
      /cc @jhuge, @Daetalus
      /reviewed-by @lu.xu, @xavier_thompson
      /reviewed-on nexedi/slapos!1469
      77c7da90
  2. 06 Nov, 2023 5 commits
  3. 02 Nov, 2023 8 commits
    • Joanne Hugé's avatar
    • Joanne Hugé's avatar
      2c69944b
    • Kirill Smelkov's avatar
      software/ors-amarisoft: Fix `render-templates -d` to remove all generated files · 9644a9f3
      Kirill Smelkov authored
      `render-templates -d` is used to remove all files that it previously
      generated, so that it is easy to look around during development.
      
      But, probably due to oversight, it was only *tdd files, that were
      removed, with *fdd generated files still left in place.
      
      -> Fix it.
      
      The list of generated files, that is now additionally removed after this patch is:
      
              instance-fdd-enb-input-schema.json
              instance-fdd-gnb-input-schema.json
              instance-fdd-lopcomm-enb-input-schema.json
              instance-fdd-lopcomm-gnb-input-schema.json
              instance-fdd-lopcomm-ue-lte-input-schema.json
              instance-fdd-lopcomm-ue-nr-input-schema.json
              instance-fdd-ors-enb-input-schema.json
              instance-fdd-ors-gnb-input-schema.json
              instance-fdd-ors-ue-lte-input-schema.json
              instance-fdd-ors-ue-nr-input-schema.json
              instance-fdd-ue-lte-input-schema.json
              instance-fdd-ue-nr-input-schema.json
              software-fdd-lopcomm.cfg
              software-fdd-lopcomm.cfg.json
              software-fdd-ors.cfg
              software-fdd-ors.cfg.json
              software-fdd.cfg
              software-fdd.cfg.json
              test/testFDD-LOPCOMM.py
              test/testFDD-ORS.py
              test/testFDD.py
      
      /cc @tomo, @xavier_thompson, @Daetalus
      /reviewed-by @jhuge, @lu.xu
      /reviewed-on nexedi/slapos!1463
      9644a9f3
    • Kirill Smelkov's avatar
      software/ors-amarisoft: slapos-render-config: Remove duplicated code from slapos.recipe.template · 41d90e26
      Kirill Smelkov authored
      For its operation slapos-render-config mimics jinja2 templates rendering
      done for real in slapos. But to do so it currently duplicates the code
      from slapos.recipe.template.
      
      We can do the same by reusing slapos.recipe.template instead of
      duplicating code from there.
      
      -> Do it.
      
      The output of generated gnb.cfg is the same before and after this patch.
      
      /cc @xavier_thompson, @Daetalus
      /reviewed-by @jhuge, @lu.xu, @tomo
      /reviewed-on nexedi/slapos!1462
      41d90e26
    • Kirill Smelkov's avatar
      software/ors-amarisoft: slapos-render-config: Document what this program does · dcc326cd
      Kirill Smelkov authored
      When I was first starting to look around inside ors-amarisoft software
      release for me it was not clear off-hand what this program is for. It
      should be more clear about what's the intent if there is explicit
      comment.
      
      /cc @xavier_thompson, @Daetalus
      /reviewed-by @jhuge, @lu.xu, @tomo
      /reviewed-on nexedi/slapos!1462
      dcc326cd
    • Kirill Smelkov's avatar
      software/ors-amarisoft: Fix slapos-render-config · 994048e6
      Kirill Smelkov authored
      a6eaad9a (software/ors-amarisoft: add network_name parameter) updated
      enb.jinja2.cfg and gnb.jinja2.cfg to require slap_configuration['configuration.com_addr']
      and other parameters to be present, but did not updated
      slapos-render-confg, which got broken as the result:
      
          (py3.venv) kirr@deca:~/src/wendelin/slapos/slapos/software/ors-amarisoft$ python slapos-render-config.py
          ...
          Traceback (most recent call last):
            File "/home/kirr/src/wendelin/slapos/slapos/software/ors-amarisoft/slapos-render-config.py", line 232, in <module>
              f.write(r._render().decode())
                      ^^^^^^^^^^^
            File "/home/kirr/src/wendelin/slapos/slapos/software/ors-amarisoft/slapos-render-config.py", line 206, in _render
              return template_object.render(**self.context).encode(self.encoding)
                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
            File "/home/kirr/src/wendelin/venv/py3.venv/lib/python3.11/site-packages/jinja2/environment.py", line 1301, in render
              self.environment.handle_exception()
            File "/home/kirr/src/wendelin/venv/py3.venv/lib/python3.11/site-packages/jinja2/environment.py", line 936, in handle_exception
              raise rewrite_traceback_stack(source=source)
            File "config/gnb.jinja2.cfg", line 62, in top-level template code
              com_addr: "{{ slap_configuration['configuration.com_addr'] }}:{{ slap_configuration['configuration.com_ws_port'] }}",
            ^^^^^^^^^^^^^^^^^^^^^^^^^
          jinja2.exceptions.UndefinedError: 'dict object' has no attribute 'configuration.com_addr'
      
      -> Fix it.
      
      /cc @xavier_thompson, @Daetalus
      /reviewed-by @jhuge, @lu.xu, @tomo
      /reviewed-on nexedi/slapos!1462
      994048e6
    • Kirill Smelkov's avatar
      software/ors-amarisoft: Adjust check-cpri-lock promise to explicitly specify watched CPRI ports · 3381f9c5
      Kirill Smelkov authored
      In multiRU we will need to be able to check multiple CPRI boards and multiple
      SFP ports on them, not only SFP ports on CPRI board 0 that was implicitly used
      until now.
      
      -> As a preparatory step the SR to explicitly specify which CPRI resources are being verified.
      
      This patch is necessary because in slapos.toolbox!127
      we adjust check_cpri_lock plugin to require CPRI device + SFP port to be
      explicitly specified.
      
      /cc @tomo, @xavier_thompson, @Daetalus
      /reviewed-by @lu.xu, @jhuge
      /reviewed-on !1461
      3381f9c5
    • Jérome Perrin's avatar
      component/ghostscript: version up 10.02.1 · cdc565e5
      Jérome Perrin authored
      cdc565e5
  4. 01 Nov, 2023 1 commit
  5. 31 Oct, 2023 5 commits
  6. 30 Oct, 2023 2 commits
  7. 27 Oct, 2023 2 commits
  8. 26 Oct, 2023 5 commits
  9. 24 Oct, 2023 6 commits
  10. 23 Oct, 2023 5 commits