Merge branch 'bug12247' into 'master'

Bug12247 group storage

See merge request !150

data/grid5000/sites/lille/servers/granche-srv1.json

@@ -2,6 +2,11 @@
   "alias": [
     "storage1"
   ],
+  "group_storage": {
+    "name": "storage1",
+    "rate": 50000000000,
+    "size": 90000000000000
+  },
   "kind": "physical",
   "monitoring": {
     "metric": "power",

data/grid5000/sites/lille/servers/granche-srv2.json

@@ -3,6 +3,11 @@
     "storage2",
     "modules"
   ],
+  "group_storage": {
+    "name": "storage2",
+    "rate": 50000000000,
+    "size": 90000000000000
+  },
   "kind": "physical",
   "monitoring": {
     "metric": "power",

data/grid5000/sites/luxembourg/servers/srv-data.json

@@ -7,6 +7,11 @@
     "storage1",
     "modules"
   ],
+  "group_storage": {
+    "name": "storage1",
+    "rate": 20000000000,
+    "size": 40000000000000
+  },
   "kind": "physical",
   "network_adapters": {
     "bmc": {

data/grid5000/sites/lyon/servers/alcor.json

@@ -2,6 +2,11 @@
   "alias": [
     "storage1"
   ],
+  "group_storage": {
+    "name": "storage1",
+    "rate": 10000000000,
+    "size": 75000000000000
+  },
   "kind": "physical",
   "network_adapters": {
     "bmc": {

data/grid5000/sites/nancy/servers/talc-data2.json

@@ -2,6 +2,11 @@
   "alias": [
 
   ],
+  "group_storage": {
+    "name": "talc-data2",
+    "rate": 10000000000,
+    "size": 200000000000000
+  },
   "kind": "physical",
   "network_adapters": {
     "bmc": {

data/grid5000/sites/rennes/servers/srv-bigdata.json

@@ -4,6 +4,11 @@
     "storage1",
     "modules"
   ],
+  "group_storage": {
+    "name": "storage1",
+    "rate": 10000000000,
+    "size": 100000000000000
+  },
   "kind": "physical",
   "network_adapters": {
     "bmc": {

data/grid5000/sites/sophia/servers/srv-data.json

@@ -5,6 +5,11 @@
     "storage1",
     "modules"
   ],
+  "group_storage": {
+    "name": "storage1",
+    "rate": 1000000000,
+    "size": 30000000000000
+  },
   "kind": "physical",
   "network_adapters": {
     "bmc": {

input/grid5000/sites/lille/servers/physical.yaml

@@ -322,6 +322,10 @@ granche-srv1:
             port: 11
           - uid: pdu-b2p2
             port: 11
+  group_storage:
+    name: storage1
+    size: 90000000000000
+    rate: 50000000000
 
 granche-srv2:
   kind: physical
@@ -353,3 +357,7 @@ granche-srv2:
             port: 10
           - uid: pdu-b2p2
             port: 10
+  group_storage:
+    name: storage2
+    size: 90000000000000
+    rate: 50000000000

input/grid5000/sites/luxembourg/servers/servers.yaml

@@ -35,6 +35,10 @@ srv-data:
     bmc:
       ip: 172.17.190.70
       mac: D0:94:66:92:94:C1
+  group_storage:
+    name: storage1
+    size: 40000000000000
+    rate: 20000000000
 
 petitprince-cmc:
   kind: physical

input/grid5000/sites/lyon/servers/servers.yaml

@@ -51,6 +51,10 @@ alcor:
     bmc:
       ip: 172.17.62.11
       mac: 4C:D9:8F:6E:26:89
+  group_storage:
+    name: storage1
+    size: 75000000000000
+    rate: 10000000000
 
 nebula:
   kind: physical

input/grid5000/sites/nancy/servers/servers.yaml

@@ -279,6 +279,10 @@ talc-data2:
     bmc:
       ip: 172.17.79.30
       mac: 4c:d9:8f:63:31:d3
+  group_storage:
+    name: talc-data2
+    size: 200000000000000
+    rate: 10000000000
 
 srv3:
   kind: physical

input/grid5000/sites/rennes/servers/servers.yaml

@@ -69,6 +69,10 @@ srv-bigdata:
       ip: 172.16.111.7
     bmc:
       ip: 172.17.111.7
+  group_storage:
+    name: storage1
+    size: 100000000000000
+    rate: 10000000000
 
 rook-storage0:
   kind: physical

input/grid5000/sites/sophia/servers/physical.yaml

@@ -105,6 +105,10 @@ srv-data:
       mounted: true
       ip: 172.17.143.5
       mac: 14:18:77:45:b8:63
+  group_storage:
+    name: storage1
+    size: 30000000000000
+    rate: 1000000000
 
 gwol-south:
   kind: physical

lib/refrepo/gen/wiki.rb

@@ -7,6 +7,7 @@ require 'refrepo/gen/wiki/generators/oar_properties'
 require 'refrepo/gen/wiki/generators/site_hardware'
 require 'refrepo/gen/wiki/generators/site_network'
 require 'refrepo/gen/wiki/generators/status'
+require 'refrepo/gen/wiki/generators/group_storage'
 
 module RefRepo::Gen::Wiki
 
@@ -30,6 +31,10 @@ module RefRepo::Gen::Wiki
     'oar_properties' => {
       :gen => OarPropertiesGenerator,
       :page => 'OAR_Properties'
+    },
+    'group_storage' => {
+      :gen => GroupStorageGenerator,
+      :page => 'Group_Storage'
     }
   }
   SITE_GENERATORS = {

lib/refrepo/gen/wiki/generators/group_storage.rb

+# coding: utf-8
+
+class GroupStorageGenerator < WikiGenerator
+
+  def initialize(page_name)
+    super(page_name)
+  end
+
+  def generate_content
+    table_columns = ["Site", "Server Name", "Size", "Link Speed", "Notes"]
+    table_data = []
+    global_hash = get_global_hash
+
+    # Loop over Grid'5000 sites
+    global_hash["sites"].sort.to_h.each { |site_uid, site_hash|
+      site_hash.fetch("servers").sort.to_h.each_value { |server_hash|
+        next unless server_hash['group_storage']
+        group_storage = server_hash['group_storage']
+        table_data << [
+          "[[#{site_uid.capitalize}:Hardware|#{site_uid.capitalize}]]",
+          "#{group_storage['name']}.#{site_uid}.grid5000.fr",
+          G5K.get_size(group_storage['size'], 'metric'),
+          G5K.get_rate(group_storage['rate']),
+          group_storage["comment"] || ""
+        ]
+      }
+    }
+    # Sort by site and server name
+    table_data.sort_by! { |row|
+      [row[0], row[1]]
+    }
+
+    # Table construction
+    table_options = 'class="wikitable sortable" style="text-align: center;"'
+    @generated_content = MW.generate_table(table_options, table_columns, table_data)
+    @generated_content += MW.italic(MW.small(generated_date_string))
+    @generated_content += MW::LINE_FEED
+  end
+end

lib/refrepo/valid/input/schemas/schema-site.yaml

@@ -31,6 +31,13 @@ servers:
               available: boolean
               resolution: optional_integer
               via: optional
+      group_storage:
+        <optional_hash>:
+          name: string
+          size: integer
+          rate: integer
+          comment: optional_string
+
 name: string
 location: string
 web: string