1. 01 Nov, 2022 34 commits
  2. 28 Oct, 2022 1 commit
  3. 26 Oct, 2022 2 commits
  4. 25 Oct, 2022 2 commits
    • Jérome Perrin's avatar
      service list, service info: output json · 58888667
      Jérome Perrin authored
      ## before
      
      ```console
      $ slapos service list
      List of services:
      erp5 /srv/slapgrid/slappart15/srv/project/slapos/software/erp5/software.cfg
      slapos-sr-testing /srv/slapgrid/slappart15/srv/project/slapos/software/slapos-sr-testing/software.cfg
      slapos-testing /srv/slapgrid/slappart15/srv/project/slapos/software/slapos-testing/software.cfg
      hugo /srv/slapgrid/slappart15/srv/project/slapos/software/hugo/software.cfg
      metabase /srv/slapgrid/slappart15/srv/project/slapos/software/metabase/software.cfg
      dufs /srv/slapgrid/slappart15/srv/project/slapos/software/webdav/software.cfg
      ```
      
      ```console
      $ slapos service info slapos-sr-testing
      Software Release URL: /srv/slapgrid/slappart15/srv/project/slapos/software/slapos-sr-testing/software.cfg
      Instance state: busy
      Instance parameters:
      {}
      Connection parameters:
      ("<?xml version='1.0' encoding='utf-8'?>\n"
      '<instance>\n'
      '  <parameter '
      'id="environment-script">/srv/slapgrid/slappart15/srv/runner/instance/slappart7/etc/slapos-local-development-environment.sh</parameter>\n'
      ```
      
      ## after
      
      ```console
      $ slapos service list
      {
        "dufs": "/srv/slapgrid/slappart15/srv/project/slapos/software/webdav/software.cfg",
        "erp5": "/srv/slapgrid/slappart15/srv/project/slapos/software/erp5/software.cfg",
        "hugo": "/srv/slapgrid/slappart15/srv/project/slapos/software/hugo/software.cfg",
        "metabase": "/srv/slapgrid/slappart15/srv/project/slapos/software/metabase/software.cfg",
        "slapos-sr-testing": "/srv/slapgrid/slappart15/srv/project/slapos/software/slapos-sr-testing/software.cfg",
        "slapos-testing": "/srv/slapgrid/slappart15/srv/project/slapos/software/slapos-testing/software.cfg"
      }
      ```
      ```console
      $ slapos service info slapos-sr-testing
      {
        "software-url": "/srv/slapgrid/slappart15/srv/project/slapos/software/slapos-sr-testing/software.cfg",
        "instance-state": "busy",
        "instance-parameters": {},
        "connection-parameters": {
          "environment-script": "/srv/slapgrid/slappart15/srv/runner/instance/slappart7/etc/slapos-local-development-environment.sh"
        }
      }
      ```
      
      
      See merge request nexedi/slapos.core!441
      58888667
    • Jérome Perrin's avatar
      cli/info,list: output in json format · b623b78b
      Jérome Perrin authored
      because json output is different on python2 and python3 and cli is only
      used on python2, we don't test the exact output in python2.
      b623b78b
  5. 24 Oct, 2022 1 commit
    • Jérome Perrin's avatar
      cli/info: better output of connection parameters · 0642e884
      Jérome Perrin authored
      before:
      
          $ slapos service info slapos-sr-testing
          Software Release URL: /srv/slapgrid/slappart15/srv/project/slapos/software/slapos-sr-testing/software.cfg
          Instance state: busy
          Instance parameters:
          {}
          Connection parameters:
          ("<?xml version='1.0' encoding='utf-8'?>\n"
           '<instance>\n'
           '  <parameter '
           'id="environment-script">/srv/slapgrid/slappart15/srv/runner/instance/slappart7/etc/slapos-local-development-environment.sh</parameter>\n'
      
      after:
      
          $ slapos service info slapos-sr-testing
          Software Release URL: /srv/slapgrid/slappart15/srv/project/slapos/software/slapos-sr-testing/software.cfg
          Instance state: busy
          Instance parameters:
          {}
          Connection parameters:
          {'environment-script': '/srv/slapgrid/slappart15/srv/runner/instance/slappart7/etc/slapos-local-development-environment.sh'}
      0642e884