Mentions légales du service

Skip to content

Bug12144 positionnement des propriétés sur les ressources disk comme sur les ressources default

LOUP David requested to merge bug12144 into master

Cette MR fix le bug 12144 : https://intranet.grid5000.fr/bugzilla/show_bug.cgi?id=12144

Avec le commit 4f716650, les propriétés des ressources "default" sont aussi positionnées sur les ressources "disk". Certaines propriétés sont ensuite surchargées (ex: network_address = '') ou crées (ex: diskpath) spécifiquement pour les ressources disk.

Le commit bdfec996 met à jour les sorties du générateur attendues par rspec pour que le CI passe.

Le diff de rake gen:oar-properties sur un cluster sans, puis avec disques réservables. Il faudrait un relecteur pour vérifier que je n'oublie aucune propriétés.

➜ reference-repository(bug12144): rake gen:oar-properties DO=diff VERBOSE=2 SITE=lyon CLUSTER=nova   
Downloading resources properties from https://api.grid5000.fr/stable/sites/lyon/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
  nova-1: OK
  nova-2: OK
  nova-3: OK
  nova-4: OK
  nova-5: OK
  nova-6: OK
  nova-7: OK
  nova-8: OK
  nova-9: OK
  nova-10: OK
  nova-11: OK
  nova-12: OK
  nova-13: OK
  nova-14: OK
  nova-15: OK
  nova-16: OK
  nova-17: OK
  nova-18: OK
  nova-19: OK
  nova-20: OK
  nova-21: OK
  nova-22: OK
  nova-23: OK
➜ reference-repository(bug12144): rake gen:oar-properties DO=diff VERBOSE=2 SITE=grenoble CLUSTER=yeti
Downloading resources properties from https://api.grid5000.fr/stable/sites/grenoble/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
  yeti-1: OK
  yeti-2: OK
  yeti-3: OK
  yeti-4: OK
  ["yeti-1", "sdb.yeti-1"]:
    ["~", "chassis", nil, "Dell Inc. PowerEdge R940 6FGQSM2"]
    ["~", "cluster_priority", nil, 201801]
    ["~", "cpuarch", nil, "x86_64"]
    ["~", "cpucore", nil, 16]
    ["~", "cpufreq", nil, "2.1"]
    ["~", "cputype", nil, "Intel Xeon Gold 6130"]
    ["~", "disk_reservation_count", nil, 3]
    ["~", "disktype", nil, "SAS"]
    ["~", "eth_count", nil, 1]
    ["~", "eth_rate", nil, 10]
    ["~", "gpu_count", nil, 0]
    ["~", "ib", nil, "NO"]
    ["~", "ib_count", nil, 0]
    ["~", "ib_rate", nil, 0]
    ["~", "ip", nil, "172.16.19.1"]
    ["~", "max_walltime", nil, 0]
    ["~", "memcore", nil, 12288]
    ["~", "memcpu", nil, 196608]
    ["~", "memnode", nil, 786432]
    ["~", "mic", nil, "NO"]
    ["~", "myri", nil, "NO"]
    ["~", "myri_count", nil, 0]
    ["~", "myri_rate", nil, 0]
    ["~", "nodemodel", nil, "Dell PowerEdge R940"]
    ["~", "opa_count", nil, 1]
    ["~", "opa_rate", nil, 100]
    ["~", "switch", nil, "gw"]
    ["~", "virtual", nil, "ivt"]
    ["~", "wattmeter", nil, "YES"]
  ["yeti-1", "sdc.yeti-1"]: same modifications as above
  ["yeti-1", "sdd.yeti-1"]: same modifications as above
  ["yeti-2", "sdb.yeti-2"]:
    ["~", "chassis", nil, "Dell Inc. PowerEdge R940 6FGRSM2"]
    ["~", "cluster_priority", nil, 201801]
    ["~", "cpuarch", nil, "x86_64"]
    ["~", "cpucore", nil, 16]
    ["~", "cpufreq", nil, "2.1"]
    ["~", "cputype", nil, "Intel Xeon Gold 6130"]
    ["~", "disk_reservation_count", nil, 3]
    ["~", "disktype", nil, "SAS"]
    ["~", "eth_count", nil, 1]
    ["~", "eth_rate", nil, 10]
    ["~", "gpu_count", nil, 0]
    ["~", "ib", nil, "NO"]
    ["~", "ib_count", nil, 0]
    ["~", "ib_rate", nil, 0]
    ["~", "ip", nil, "172.16.19.2"]
    ["~", "max_walltime", nil, 0]
    ["~", "memcore", nil, 12288]
    ["~", "memcpu", nil, 196608]
    ["~", "memnode", nil, 786432]
    ["~", "mic", nil, "NO"]
    ["~", "myri", nil, "NO"]
    ["~", "myri_count", nil, 0]
    ["~", "myri_rate", nil, 0]
    ["~", "nodemodel", nil, "Dell PowerEdge R940"]
    ["~", "opa_count", nil, 1]
    ["~", "opa_rate", nil, 100]
    ["~", "switch", nil, "gw"]
    ["~", "virtual", nil, "ivt"]
    ["~", "wattmeter", nil, "YES"]
  ["yeti-2", "sdc.yeti-2"]: same modifications as above
  ["yeti-2", "sdd.yeti-2"]: same modifications as above
  ["yeti-3", "sdb.yeti-3"]:
    ["~", "chassis", nil, "Dell Inc. PowerEdge R940 6FGPSM2"]
    ["~", "cluster_priority", nil, 201801]
    ["~", "cpuarch", nil, "x86_64"]
    ["~", "cpucore", nil, 16]
    ["~", "cpufreq", nil, "2.1"]
    ["~", "cputype", nil, "Intel Xeon Gold 6130"]
    ["~", "disk_reservation_count", nil, 3]
    ["~", "disktype", nil, "SAS"]
    ["~", "eth_count", nil, 1]
    ["~", "eth_rate", nil, 10]
    ["~", "gpu_count", nil, 0]
    ["~", "ib", nil, "NO"]
    ["~", "ib_count", nil, 0]
    ["~", "ib_rate", nil, 0]
    ["~", "ip", nil, "172.16.19.3"]
    ["~", "max_walltime", nil, 0]
    ["~", "memcore", nil, 12288]
    ["~", "memcpu", nil, 196608]
    ["~", "memnode", nil, 786432]
    ["~", "mic", nil, "NO"]
    ["~", "myri", nil, "NO"]
    ["~", "myri_count", nil, 0]
    ["~", "myri_rate", nil, 0]
    ["~", "nodemodel", nil, "Dell PowerEdge R940"]
    ["~", "opa_count", nil, 1]
    ["~", "opa_rate", nil, 100]
    ["~", "switch", nil, "gw"]
    ["~", "virtual", nil, "ivt"]
    ["~", "wattmeter", nil, "YES"]
  ["yeti-3", "sdc.yeti-3"]: same modifications as above
  ["yeti-3", "sdd.yeti-3"]: same modifications as above
  ["yeti-4", "sdb.yeti-4"]:
    ["~", "chassis", nil, "Dell Inc. PowerEdge R940 6FGMSM2"]
    ["~", "cluster_priority", nil, 201801]
    ["~", "cpuarch", nil, "x86_64"]
    ["~", "cpucore", nil, 16]
    ["~", "cpufreq", nil, "2.1"]
    ["~", "cputype", nil, "Intel Xeon Gold 6130"]
    ["~", "disk_reservation_count", nil, 3]
    ["~", "disktype", nil, "SAS"]
    ["~", "eth_count", nil, 1]
    ["~", "eth_rate", nil, 10]
    ["~", "gpu_count", nil, 0]
    ["~", "ib", nil, "NO"]
    ["~", "ib_count", nil, 0]
    ["~", "ib_rate", nil, 0]
    ["~", "ip", nil, "172.16.19.4"]
    ["~", "max_walltime", nil, 0]
    ["~", "memcore", nil, 12288]
    ["~", "memcpu", nil, 196608]
    ["~", "memnode", nil, 786432]
    ["~", "mic", nil, "NO"]
    ["~", "myri", nil, "NO"]
    ["~", "myri_count", nil, 0]
    ["~", "myri_rate", nil, 0]
    ["~", "nodemodel", nil, "Dell PowerEdge R940"]
    ["~", "opa_count", nil, 1]
    ["~", "opa_rate", nil, 100]
    ["~", "switch", nil, "gw"]
    ["~", "virtual", nil, "ivt"]
    ["~", "wattmeter", nil, "YES"]
  ["yeti-4", "sdc.yeti-4"]: same modifications as above
  ["yeti-4", "sdd.yeti-4"]: same modifications as above
Edited by Pierre Neyron

Merge request reports