Mentions légales du service

Skip to content
Snippets Groups Projects
Commit 6ce7dda8 authored by Teddy Valette's avatar Teddy Valette
Browse files

[gen/wiki/oar] using get_api helper instead of get_oar_data

parent 1290be1c
No related branches found
No related tags found
1 merge request!105[gen/wiki/oar] use get_api helper and raise an error when undocumented properties
Pipeline #150003 passed
...@@ -243,20 +243,18 @@ class OarPropertiesGenerator < WikiGenerator ...@@ -243,20 +243,18 @@ class OarPropertiesGenerator < WikiGenerator
refapi = load_data_hierarchy refapi = load_data_hierarchy
#Properties generated from oar-properties generator #Properties generated from oar-properties generator
props = {} props = {}
oar_data_properties = [] oarapi_properties = []
G5K::SITES.each_with_index{ |site_uid, index| G5K::SITES.each_with_index{ |site_uid, index|
props[site_uid] = {} props[site_uid] = {}
props[site_uid]["default"] = get_ref_default_properties(site_uid, refapi["sites"][site_uid]) props[site_uid]["default"] = get_ref_default_properties(site_uid, refapi["sites"][site_uid])
props[site_uid]["disk"] = get_ref_disk_properties(site_uid, refapi["sites"][site_uid]) props[site_uid]["disk"] = get_ref_disk_properties(site_uid, refapi["sites"][site_uid])
}
# Retrieve all oar fields from the first site RefRepo::Utils::get_api("sites/#{G5K::SITES.first}/internal/oarapi/resources/details.json?limit=999999")['items'].each { |oarapi_details|
if index == 0 oarapi_details.keys.each { |property|
get_oar_data(site_uid, {:api => {}, :verbose => false}).each { |oar_node_data, _| oarapi_properties << property unless oarapi_properties.include? property
oar_node_data.each { |key, _| }
oar_data_properties << key unless oar_data_properties.include? key
}
}
end
} }
#Compiled properties used to generate page #Compiled properties used to generate page
...@@ -289,11 +287,11 @@ class OarPropertiesGenerator < WikiGenerator ...@@ -289,11 +287,11 @@ class OarPropertiesGenerator < WikiGenerator
} }
# Compare properties with fields from oar db # Compare properties with fields from oar db
oar_data_properties.reject!{|x| (@@properties.keys.include? x or @@ignored_properties.include? x)} oarapi_properties.reject!{|x| (@@properties.keys.include? x or @@ignored_properties.include? x)}
@generated_content = "{{Portal|User}}\nProperties on resources managed by OAR allow users to select them according to their experiment's characteristics." + MW::LINE_FEED @generated_content = "{{Portal|User}}\nProperties on resources managed by OAR allow users to select them according to their experiment's characteristics." + MW::LINE_FEED
if not oar_data_properties.empty? if not oarapi_properties.empty?
@generated_content += "{{Warning|text=Following properties are not documented : " + oar_data_properties.sort.join(', ') + "}}" + MW::LINE_FEED @generated_content += "{{Warning|text=Following properties are not documented : " + oarapi_properties.sort.join(', ') + "}}" + MW::LINE_FEED
end end
@generated_content += MW::heading("OAR Properties", 1) + MW::LINE_FEED @generated_content += MW::heading("OAR Properties", 1) + MW::LINE_FEED
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment