From 6cbdff6ce14e7c0f8470c86fc18ab43af53266bd Mon Sep 17 00:00:00 2001 From: Pierre Neyron <pierre.neyron@imag.fr> Date: Thu, 6 Aug 2020 10:41:06 +0200 Subject: [PATCH] [spec] fixup: update of the oar_properties2 expected outputs. --- spec/output/graffiti-all-gpus_diff_stdout.txt | 6 ------ ...ved-OAR-updated-gpu-re-added-OAR-updated_diff_stdout.txt | 6 ------ ...iti-gpu-removed-OAR-updated-gpu-re-added_diff_stdout.txt | 6 ------ .../output/graffiti-gpu-removed-OAR-updated_diff_stdout.txt | 6 ------ spec/output/graffiti-gpu-removed_diff_stdout.txt | 6 ------ 5 files changed, 30 deletions(-) diff --git a/spec/output/graffiti-all-gpus_diff_stdout.txt b/spec/output/graffiti-all-gpus_diff_stdout.txt index 4dd1ffcc47..4295b7e7de 100644 --- a/spec/output/graffiti-all-gpus_diff_stdout.txt +++ b/spec/output/graffiti-all-gpus_diff_stdout.txt @@ -1,9 +1,5 @@ Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... ... done -Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... -... done -Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... -... done Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed clustera-1: OK clustera-2: OK @@ -20,5 +16,3 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad clustera-13: OK Properties existing on the fakesite server but not managed/known by the generator: disk, diskpath. Hint: you can delete properties with 'oarproperty -d <property>' or add them to the ignore list in lib/lib-oar-properties.rb. -Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... -... done diff --git a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_diff_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_diff_stdout.txt index 4dd1ffcc47..4295b7e7de 100644 --- a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_diff_stdout.txt +++ b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added-OAR-updated_diff_stdout.txt @@ -1,9 +1,5 @@ Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... ... done -Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... -... done -Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... -... done Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed clustera-1: OK clustera-2: OK @@ -20,5 +16,3 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad clustera-13: OK Properties existing on the fakesite server but not managed/known by the generator: disk, diskpath. Hint: you can delete properties with 'oarproperty -d <property>' or add them to the ignore list in lib/lib-oar-properties.rb. -Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... -... done diff --git a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_diff_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_diff_stdout.txt index 90f8dd77ad..677010e188 100644 --- a/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_diff_stdout.txt +++ b/spec/output/graffiti-gpu-removed-OAR-updated-gpu-re-added_diff_stdout.txt @@ -1,10 +1,6 @@ Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... ... done GPU has an unexpected number of resources (current:51 vs expected:52). -Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... -... done -Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... -... done Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed clustera-1: OK clustera-2: @@ -22,8 +18,6 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad clustera-13: OK Properties existing on the fakesite server but not managed/known by the generator: disk, diskpath. Hint: you can delete properties with 'oarproperty -d <property>' or add them to the ignore list in lib/lib-oar-properties.rb. -Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... -... done # Error: Resource 9679 (host=clustera-2.nancy.grid5000.fr cpu=1618 core=8555 cpuset=9 gpu=59 gpudevice=2) has a mismatch for ressource GPU: OAR API gives 59, generator wants 60. # Error: Resource 9679 (host=clustera-2.nancy.grid5000.fr cpu=1618 core=8555 cpuset=9 gpu=59 gpudevice=2) has a mismatch for ressource GPUDEVICE: OAR API gives 2, generator wants 3. # Error: Resource 9680 (host=clustera-2.nancy.grid5000.fr cpu=1618 core=8556 cpuset=11 gpu=59 gpudevice=2) has a mismatch for ressource GPU: OAR API gives 59, generator wants 60. diff --git a/spec/output/graffiti-gpu-removed-OAR-updated_diff_stdout.txt b/spec/output/graffiti-gpu-removed-OAR-updated_diff_stdout.txt index 4dd1ffcc47..4295b7e7de 100644 --- a/spec/output/graffiti-gpu-removed-OAR-updated_diff_stdout.txt +++ b/spec/output/graffiti-gpu-removed-OAR-updated_diff_stdout.txt @@ -1,9 +1,5 @@ Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... ... done -Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... -... done -Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... -... done Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed clustera-1: OK clustera-2: OK @@ -20,5 +16,3 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad clustera-13: OK Properties existing on the fakesite server but not managed/known by the generator: disk, diskpath. Hint: you can delete properties with 'oarproperty -d <property>' or add them to the ignore list in lib/lib-oar-properties.rb. -Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... -... done diff --git a/spec/output/graffiti-gpu-removed_diff_stdout.txt b/spec/output/graffiti-gpu-removed_diff_stdout.txt index 94bf7171bd..3068a0aded 100644 --- a/spec/output/graffiti-gpu-removed_diff_stdout.txt +++ b/spec/output/graffiti-gpu-removed_diff_stdout.txt @@ -1,10 +1,6 @@ Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... ... done GPU has an unexpected number of resources (current:52 vs expected:51). -Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... -... done -Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... -... done Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for added, ['~', 'key', 'old value', 'new value'] for changed clustera-1: OK clustera-2: @@ -22,8 +18,6 @@ Output format: [ '-', 'key', 'value'] for missing, [ '+', 'key', 'value'] for ad clustera-13: OK Properties existing on the fakesite server but not managed/known by the generator: disk, diskpath. Hint: you can delete properties with 'oarproperty -d <property>' or add them to the ignore list in lib/lib-oar-properties.rb. -Downloading resources properties from https://api.grid5000.fr/stable/sites/fakesite/internal/oarapi/resources/details.json?limit=999999 ... -... done # Error: Resource 9679 (host=clustera-2.nancy.grid5000.fr cpu=1618 core=8555 cpuset=9 gpu=60 gpudevice=3) has a mismatch for ressource GPU: OAR API gives 60, generator wants 59. # Error: Resource 9679 (host=clustera-2.nancy.grid5000.fr cpu=1618 core=8555 cpuset=9 gpu=60 gpudevice=3) has a mismatch for ressource GPUDEVICE: OAR API gives 3, generator wants 2. # Error: Resource 9680 (host=clustera-2.nancy.grid5000.fr cpu=1618 core=8556 cpuset=11 gpu=60 gpudevice=3) has a mismatch for ressource GPU: OAR API gives 60, generator wants 59. -- GitLab