diff --git a/Gemfile b/Gemfile
index 06fb443cd683164ece14fec5ba4aab703a9156d7..b79d3e8c0f801b72e253abd3a6c533d681356810 100644
--- a/Gemfile
+++ b/Gemfile
@@ -2,3 +2,4 @@ source :rubygems
gem 'json_pure', '~> 1.5'
gem 'net-ssh'
+gem 'restfully','1.0.5'
diff --git a/Gemfile.lock b/Gemfile.lock
index 50f1ecdcddc992d0c32339703a17fb5836bc37ea..6c50772b8756e10e915968081b21e5d1edbae4c8 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,8 +1,45 @@
GEM
remote: http://rubygems.org/
specs:
+ addressable (2.2.8)
+ backports (2.5.1)
+ bond (0.4.2)
+ json (1.7.0)
json_pure (1.5.1)
+ mime-types (1.18)
net-ssh (2.1.0)
+ rack (1.4.1)
+ rack-cache (1.2)
+ rack (>= 0.4)
+ rb-readline (0.4.2)
+ rest-client (1.6.7)
+ mime-types (>= 1.16)
+ rest-client-components (1.2.0)
+ rack (>= 1.0.1)
+ rest-client (>= 1.6.0, < 1.7.0)
+ restfully (1.0.5)
+ addressable
+ backports
+ json (~> 1.5)
+ rack-cache
+ rb-readline
+ rest-client (~> 1.6)
+ rest-client-components
+ ripl (= 0.6.1)
+ ripl-color_streams
+ ripl-multi_line
+ ripl-play (~> 0.2.1)
+ ripl-short_errors
+ ripl (0.6.1)
+ bond (~> 0.4.0)
+ ripl-color_streams (0.1.2)
+ ripl (>= 0.2.8)
+ ripl-multi_line (0.3.0)
+ ripl (>= 0.3.6)
+ ripl-play (0.2.1)
+ ripl (>= 0.3.0)
+ ripl-short_errors (0.1.0)
+ ripl (>= 0.2.8)
PLATFORMS
ruby
@@ -10,3 +47,4 @@ PLATFORMS
DEPENDENCIES
json_pure (~> 1.5)
net-ssh
+ restfully (= 1.0.5)
diff --git a/Rakefile b/Rakefile
index 4d9a32a4622e11a52a1de288e511f5fe1a65e9e5..f59fae8e73b90e87dedb3fedfd287c82e9cc4a09 100644
--- a/Rakefile
+++ b/Rakefile
@@ -9,14 +9,13 @@ ROOT_DIR = File.expand_path File.dirname(__FILE__)
LIB_DIR = File.join(ROOT_DIR, "generators", "lib")
$LOAD_PATH.unshift(LIB_DIR) unless $LOAD_PATH.include?(LIB_DIR)
-EXTRA_DIR = File.join(ROOT_DIR, "extras")
-EXTRA_DIR_LIB = File.join(EXTRA_DIR, "lib")
-$LOAD_PATH.unshift(EXTRA_DIR_LIB) unless $LOAD_PATH.include?(EXTRA_DIR_LIB)
+EXTRA_DIR = File.join(ROOT_DIR, "extra", "lib")
+$LOAD_PATH.unshift(EXTRA_DIR) unless $LOAD_PATH.include?(EXTRA_DIR)
Rake.application.options.trace = true
require 'grid5000'
-require 'naming-pattern'
+#require 'naming-pattern'
task :environment do
Dir.chdir(ROOT_DIR)
@@ -71,13 +70,12 @@ namespace :netlinks do
# copy the 'extra' dir on the site,
# execute all the probing on all hosts
# retrieve the result from all hosts
- extra_dir_basename = File.basename(EXTRA_DIR)
prober = "weathermap.#{site}.grid5000.fr"
- sh "rsync -av #{EXTRA_DIR} #{prober}:"
- sh "ssh #{prober} 'cd #{extra_dir_basename} && http_proxy=http://proxy:3128 bundle install'"
+ sh "rsync -av extra #{prober}:"
+ sh "ssh #{prober} 'cd extra && bundle install'"
probes.each do |info|
- sh "ssh #{prober} 'cd #{extra_dir_basename} && ./bin/net-links.rb --host #{info[:uid]} --community #{info[:snmp_community]} --logger stdout:warn'"
+ sh "ssh #{prober} 'cd extra && ./bin/net-links.rb --host #{info[:uid]} --community #{info[:snmp_community]} --logger stdout:warn'"
end
probes.each do |info|
sh "rsync -av #{prober}:/tmp/#{info[:uid]}.yaml #{net_links_dir}/"
@@ -104,16 +102,12 @@ namespace :netlinks do
end
def format_port(coord,raw_port,linecards)
# puts "#{coord.inspect} #{raw_port.inspect}"
- neighbor,port,site = nil
+ neighbor,site = nil
if raw_port.has_key? :fqdn
neighbor,site = raw_port[:fqdn].scan(/([^.]+)\.([^.]+)\.grid5000\.fr/).flatten
elsif raw_port.has_key? :uid
- if ((scan = raw_port[:uid].scan(/([^.]+)\.([^.]+)\.grid5000\.fr/)).size > 0)
- neighbor,site = scan.flatten
- else
- neighbor = raw_port[:uid]
- end
- port = raw_port[:port]
+ neighbor,site = raw_port[:uid].scan(/([^.]+)\.([^.]+)\.grid5000\.fr/).flatten
+ neighbor = raw_port[:uid] if neighbor.nil?
end
return if neighbor.nil?
@@ -122,17 +116,12 @@ namespace :netlinks do
linecards[l] = {"ports"=>{}} unless linecards.has_key? l
ports = linecards[l]["ports"]
formated_port = ports[p]
- if formated_port.nil? and port.nil?
+ if formated_port.nil?
ports[p] = neighbor
elsif formated_port.is_a? Hash
ports[p]["uid"] = neighbor
- ports[p]["port"] = port unless port.nil?
else
- if port.nil?
- ports[p] = neighbor
- else
- ports[p] = {"uid"=>neighbor,"port"=>port}
- end
+ ports[p] = neighbor
end
end
def browse_naming_patterns(dico,patterns,&block)
@@ -231,47 +220,6 @@ namespace :netlinks do
puts "+-#{"-" * message_size}-+"
end
end
- task :net_links => [:environment,:hosts] do
- host,site = @host.scan(/(\S+)\.(\S+)/).flatten
- dirs = Dir.glob("generators/input/#{site}/")
- if dirs.empty?
- @logger.error "Failed to find a directory containing the net-links yaml file for your site '#{site}'"
- next
- end
- @equipments = dirs.map do |dir|
- site = File.basename(dir)
- net_links_file = File.join(dir,"net-links.yaml")
- net_links_dir = File.join(dir,"net-links")
-
- net_links_orig = YAML::load_file(net_links_file)
- net_links = net_links_orig.select do |uid,properties|
- uid.match(Regexp.new(host.gsub(/\*/,'\S+'))) != nil
- end
- if net_links.empty?
- @logger.warn "Failed to find any host described within the file #{net_links_file}."
- else
- {:net_links => net_links,:net_links_orig => net_links_orig,:net_links_file=>net_links_file}
- end
- end
- end
- desc "Manually modify net-links.yaml with custumized script."
- task :manual => :net_links do
-# puts @net_links.inspect
- # gw.grenoble
- gw = @equipments[0]
- puts gw[:net_links]
- linecards = gw[:net_links]["sbordeplage-2"]["linecards"][1]
- linecards["ports"] = {} if linecards["ports"].nil?
- ports = linecards["ports"]
- 11.upto(51) do |i|
- ports[i-10] = "bordeplage-#{i}"
- end
- # When all net links in a site are formated, we write them in they file.
- File.open(gw[:net_links_file],'w'){|f| YAML::dump(gw[:net_links_orig].merge(gw[:net_links]),f)}
- puts "updated #{gw[:net_links_file]}"
-
- end
-
desc "Update net-links.yaml with the kavlan like config file."
task :kavlan => [:environment,:hosts] do
config_file = ENV['CONF']
@@ -288,31 +236,26 @@ namespace :netlinks do
net_links_file = File.join(dir,"net-links.yaml")
net_links_dir = File.join(dir,"net-links")
- net_links_orig = YAML::load_file(net_links_file)
- net_links = net_links_orig.select do |uid,properties|
+ net_links = YAML::load_file(net_links_file)
+ net_links.keep_if do |uid,properties|
uid.match(Regexp.new(host.gsub(/\*/,'\S+'))) != nil
end
if net_links.empty?
@logger.warn "Failed to find any host described within the file #{net_links_file}."
else
# parse the kavlan like config file
- # #newservices 9/2 FastIron
config = {}
File.read(config_file).lines.each do |line|
if ((scan = line.strip.scan(/^([^.]+)\.([^.]+)\.grid5000\.fr\s+(\S+)\s+(\S+)$/)).size > 0)
-
uid,site,ifname,router = scan.flatten
router = router.downcase
config[router] = [] unless config.has_key? router
- port = {:ifname=>ifname}
- if ((scan = uid.scan(/^([^-]+)-([^-]+)-(\S+)$/)).size>0)
- cluster,node_id,iface = scan.flatten
- port[:uid] = "#{cluster}-#{node_id}"
- port[:port] = iface
- else
- port[:uid] = uid
- end
- config[router].push(port)
+# if ((scan = uid.scan(/^(\S+-\d+)-(\S+)$/)).size > 0)
+# uid,port = scan.flatten
+# config[router].push({:uid=>uid,:ifname=>ifname,:port=>port})
+# else
+ config[router].push({:uid=>uid,:ifname=>ifname})
+# end
end
end
@@ -344,7 +287,7 @@ namespace :netlinks do
end
end
# When all net links in a site are formated, we write them in they file.
- File.open(net_links_file,'w'){|f| YAML::dump(net_links_orig.merge(net_links),f)}
+ File.open(net_links_file,'w'){|f| YAML::dump(net_links,f)}
message.push "#{net_links_file} hosts=#{updated.inspect}"
end
end
@@ -368,12 +311,14 @@ namespace :netlinks do
@logger.error "Failed to find a directory containing the net-links yaml file for your site '#{site}'"
next
end
+
generator = "#{File.join(ROOT_DIR, "generators", "grid5000")}"
net_link_generator = "#{File.join(ROOT_DIR, "generators", "input", "net-links-generator.rb")}"
dirs.each do |dir|
site = File.basename(dir)
net_links_file = File.expand_path(File.join(dir,"net-links.yaml"))
- command = "#{generator} #{net_link_generator} #{net_links_file}"
+ site_file = File.expand_path(File.join(dir,"..","#{site}.rb"))
+ command = "#{generator} #{site_file} #{net_link_generator} #{net_links_file}"
command << " -s" if ENV['DRY'] && ENV['DRY'] != "0"
sh command
end
diff --git a/data/grid5000/sites/bordeaux/bordeaux.json b/data/grid5000/sites/bordeaux/bordeaux.json
index b39445f3ab811349204f69696774d7643f3d1207..1f41eead3628d67bada08a6a85af9c35d1354b00 100755
--- a/data/grid5000/sites/bordeaux/bordeaux.json
+++ b/data/grid5000/sites/bordeaux/bordeaux.json
@@ -1,4 +1,15 @@
{
+ "compilation_server": false,
+ "description": "Grid5000 Bordeaux site",
+ "email_contact": "bordeaux-staff@lists.grid5000.fr",
+ "latitude": 44.833333,
+ "location": "Bordeaux, France",
+ "longitude": -0.566667,
+ "name": "Bordeaux",
+ "security_contact": "bordeaux-staff@lists.grid5000.fr",
+ "sys_admin_contact": "bordeaux-staff@lists.grid5000.fr",
"type": "site",
- "uid": "bordeaux"
+ "uid": "bordeaux",
+ "user_support_contact": "bordeaux-staff@lists.grid5000.fr",
+ "web": "http://www.grid5000.fr/mediawiki/index.php/Bordeaux:Home"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/grenoble/grenoble.json b/data/grid5000/sites/grenoble/grenoble.json
index f6e279f293cac56e0a7b480352f9bef44a12fd2f..66bd1596b214ae11640bc3140dde20ecf4cc7243 100755
--- a/data/grid5000/sites/grenoble/grenoble.json
+++ b/data/grid5000/sites/grenoble/grenoble.json
@@ -1,4 +1,15 @@
{
+ "compilation_server": false,
+ "description": "Grid'5000 Grenoble site",
+ "email_contact": "grenoble-staff@lists.grid5000.fr",
+ "latitude": 45.1833,
+ "location": "Grenoble, France",
+ "longitude": 5.7167,
+ "name": "Grenoble",
+ "security_contact": "grenoble-staff@lists.grid5000.fr",
+ "sys_admin_contact": "grenoble-staff@lists.grid5000.fr",
"type": "site",
- "uid": "grenoble"
+ "uid": "grenoble",
+ "user_support_contact": "grenoble-staff@lists.grid5000.fr",
+ "web": "http://www.grid5000.fr/mediawiki/index.php/Grenoble:Home"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/lille.json b/data/grid5000/sites/lille/lille.json
index b50fe747eb4ddad1d504a2fa47de1247e6dbba6b..90599ccb8fb58cf4e758af1e79f04f4539d46159 100755
--- a/data/grid5000/sites/lille/lille.json
+++ b/data/grid5000/sites/lille/lille.json
@@ -1,4 +1,14 @@
{
+ "description": "",
+ "email_contact": null,
+ "latitude": 50.65,
+ "location": "Lille, France",
+ "longitude": 3.0833,
+ "name": "Lille",
+ "security_contact": null,
+ "sys_admin_contact": null,
"type": "site",
- "uid": "lille"
+ "uid": "lille",
+ "user_support_contact": null,
+ "web": null
}
\ No newline at end of file
diff --git a/data/grid5000/sites/lille/network_equipments/gw.json b/data/grid5000/sites/lille/network_equipments/gw.json
index 83b82194f5e597e5fd2d5ce869f1a8e613aa3f95..7118d84df088fc963ed2c3d8f3d92939af27cfc6 100644
--- a/data/grid5000/sites/lille/network_equipments/gw.json
+++ b/data/grid5000/sites/lille/network_equipments/gw.json
@@ -28,41 +28,6 @@
},
{
-<<<<<<< HEAD
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-1"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-2"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-3"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
-=======
"uid": "chinqchint-1"
},
{
@@ -72,84 +37,12 @@
"uid": "chinqchint-3"
},
{
->>>>>>> network API generator scripts revisited and improved.
"uid": "chinqchint-4"
},
{
},
{
-<<<<<<< HEAD
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-6"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-7"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-8"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-9"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-10"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-11"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-12"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
-=======
"uid": "chinqchint-6"
},
{
@@ -171,255 +64,12 @@
"uid": "chinqchint-12"
},
{
->>>>>>> network API generator scripts revisited and improved.
"uid": "chinqchint-13"
},
{
"uid": "chinqchint-14"
},
{
-<<<<<<< HEAD
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-15"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-16"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-17"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-18"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-19"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-20"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-21"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-22"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-23"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-24"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-25"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-26"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-27"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-28"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-29"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-30"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-31"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-32"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-33"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-34"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-35"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-36"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-37"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-38"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-39"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-40"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
-=======
"uid": "chinqchint-15"
},
{
@@ -498,7 +148,6 @@
"uid": "chinqchint-40"
},
{
->>>>>>> network API generator scripts revisited and improved.
"uid": "chinqchint-5"
},
{
@@ -516,50 +165,6 @@
},
{
-<<<<<<< HEAD
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-41"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-42"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-43"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-44"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
-=======
"uid": "chinqchint-41"
},
{
@@ -572,49 +177,12 @@
"uid": "chinqchint-44"
},
{
->>>>>>> network API generator scripts revisited and improved.
"uid": "chinqchint-45"
},
{
},
{
-<<<<<<< HEAD
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-1"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-3"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-2"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-5"
-=======
"uid": "chimint-1"
},
{
@@ -625,146 +193,11 @@
},
{
->>>>>>> network API generator scripts revisited and improved.
},
{
},
{
-<<<<<<< HEAD
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-6"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-8"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-7"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-9"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-10"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-11"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-12"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-13"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-14"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-17"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-16"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-15"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-18"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chirloute-2"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
-=======
"uid": "chimint-6"
},
{
@@ -807,48 +240,12 @@
"uid": "chirloute-2"
},
{
->>>>>>> network API generator scripts revisited and improved.
"uid": "chirloute-4"
},
{
"uid": "chimint-20"
},
{
-<<<<<<< HEAD
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-19"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chirloute-1"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chirloute-3"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
-=======
},
{
@@ -858,93 +255,12 @@
"uid": "chirloute-3"
},
{
->>>>>>> network API generator scripts revisited and improved.
"uid": "chirloute-6"
},
{
"uid": "chirloute-8"
},
{
-<<<<<<< HEAD
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chirloute-5"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-1"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-2"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-3"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-4"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-5"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-6"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-7"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
-=======
"uid": "chirloute-5"
},
{
@@ -969,7 +285,6 @@
},
{
->>>>>>> network API generator scripts revisited and improved.
"uid": "chinqchint-46"
}
],
@@ -983,177 +298,6 @@
},
{
-<<<<<<< HEAD
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-8"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-9"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-10"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-11"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-12"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-13"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-14"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-15"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-16"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-17"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-18"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-19"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-20"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-21"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-22"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-23"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-24"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-25"
- },
- {
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-26"
-=======
},
{
@@ -1209,7 +353,6 @@
},
{
->>>>>>> network API generator scripts revisited and improved.
},
{
@@ -1221,85 +364,6 @@
},
{
-<<<<<<< HEAD
- "kind": "switch",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
- "uid": "sw-admin1"
- },
- {
- "kind": "switch",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
- "uid": "sw-admin1"
- },
- {
- "kind": "switch",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
- "uid": "sw-admin2"
- },
- {
- "kind": "switch",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
- "uid": "sw-admin2"
- },
- {
- "kind": "switch",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
- "uid": "sw-admin3"
- },
- {
- "kind": "switch",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
- "uid": "sw-admin3"
- },
- {
- "kind": "switch",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
- "uid": "sw-admin4"
- },
- {
- "kind": "switch",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
-=======
"uid": "sw-admin1"
},
{
@@ -1321,7 +385,6 @@
"uid": "sw-admin4"
},
{
->>>>>>> network API generator scripts revisited and improved.
"uid": "sw-admin4"
},
{
@@ -1374,41 +437,13 @@
},
{
-<<<<<<< HEAD
- "kind": "switch",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
- "uid": "sw-admin5"
- },
- {
- "kind": "switch",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
-=======
},
{
->>>>>>> network API generator scripts revisited and improved.
"uid": "sw-admin5"
},
{
"kind": "node",
-<<<<<<< HEAD
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
-=======
->>>>>>> network API generator scripts revisited and improved.
"uid": "chirloute-7"
}
],
diff --git a/data/grid5000/sites/lille/network_equipments/sw-admin1.json b/data/grid5000/sites/lille/network_equipments/sw-admin1.json
index 9fd6c4098e48a1f0150e656950a9c98cb4bf5a72..0d1bf5aea1e77ac9ae28803e2121b008600c941f 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-admin1.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-admin1.json
@@ -12,96 +12,6 @@
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-1"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-23"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-2"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-24"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-3"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-25"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-4"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-26"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-5"
-=======
},
{
@@ -127,182 +37,11 @@
},
{
->>>>>>> network API generator scripts revisited and improved.
},
{
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-6"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-28"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-7"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-29"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-8"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-30"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-9"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-31"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-10"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-32"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-11"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-33"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-12"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-34"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-13"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-35"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-14"
-=======
},
{
@@ -352,162 +91,11 @@
},
{
->>>>>>> network API generator scripts revisited and improved.
},
{
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-15"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-37"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-16"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-38"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-17"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-39"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-18"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-40"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-19"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-41"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-20"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-42"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-21"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-43"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-22"
-=======
},
{
@@ -551,7 +139,6 @@
},
{
->>>>>>> network API generator scripts revisited and improved.
},
{
"uid": "sw-admin4"
@@ -564,31 +151,11 @@
},
{
"kind": "router",
-<<<<<<< HEAD
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
- "uid": "gw"
- },
- {
- "kind": "router",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
- "uid": "gw"
-=======
"uid": "gw-lille-6k.grid5000.fr"
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
->>>>>>> network API generator scripts revisited and improved.
}
],
"rate": 1000000
diff --git a/data/grid5000/sites/lille/network_equipments/sw-admin2.json b/data/grid5000/sites/lille/network_equipments/sw-admin2.json
index 20a9becf0214a1b406522af174ca059a1d67b3fb..224242b2401f86e16a598742a31a31a4632df8f5 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-admin2.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-admin2.json
@@ -12,146 +12,6 @@
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-44"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chirloute-4"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-45"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-20"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chinqchint-46"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chirloute-2"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-2"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chirloute-1"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-1"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chirloute-3"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-5"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chirloute-6"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-3"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chirloute-8"
-=======
},
{
@@ -192,132 +52,11 @@
},
{
->>>>>>> network API generator scripts revisited and improved.
},
{
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chirloute-5"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-6"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-1"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-8"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-2"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-7"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-3"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-9"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-4"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-10"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-5"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-13"
-=======
},
{
@@ -352,162 +91,11 @@
},
{
->>>>>>> network API generator scripts revisited and improved.
},
{
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-12"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-7"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-11"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-8"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-14"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-9"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-15"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-10"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-18"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-11"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-17"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-12"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-16"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-13"
- },
- {
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chimint-19"
-=======
},
{
@@ -551,7 +139,6 @@
},
{
->>>>>>> network API generator scripts revisited and improved.
},
{
"uid": "sw-admin4"
@@ -564,31 +151,11 @@
},
{
"kind": "router",
-<<<<<<< HEAD
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
- "uid": "gw"
- },
- {
- "kind": "router",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
- "uid": "gw"
-=======
"uid": "gw-lille-6k.grid5000.fr"
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
->>>>>>> network API generator scripts revisited and improved.
}
],
"rate": 1000000
diff --git a/data/grid5000/sites/lille/network_equipments/sw-admin3.json b/data/grid5000/sites/lille/network_equipments/sw-admin3.json
index 6779af9f900e422f0ab8a7f47dffb63e61bc6c9d..fa47e75099763d052bcbd7c333ed0248f39ad2ba 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-admin3.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-admin3.json
@@ -12,103 +12,37 @@
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-14"
-=======
->>>>>>> network API generator scripts revisited and improved.
},
{
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-15"
-=======
->>>>>>> network API generator scripts revisited and improved.
},
{
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-16"
-=======
->>>>>>> network API generator scripts revisited and improved.
},
{
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-17"
-=======
->>>>>>> network API generator scripts revisited and improved.
},
{
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-18"
-=======
->>>>>>> network API generator scripts revisited and improved.
},
{
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-19"
-=======
->>>>>>> network API generator scripts revisited and improved.
},
{
@@ -120,103 +54,37 @@
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-21"
-=======
->>>>>>> network API generator scripts revisited and improved.
},
{
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-22"
-=======
->>>>>>> network API generator scripts revisited and improved.
},
{
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-23"
-=======
->>>>>>> network API generator scripts revisited and improved.
},
{
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-24"
-=======
->>>>>>> network API generator scripts revisited and improved.
},
{
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-25"
-=======
->>>>>>> network API generator scripts revisited and improved.
},
{
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chicon-26"
-=======
->>>>>>> network API generator scripts revisited and improved.
},
{
@@ -228,18 +96,7 @@
},
{
-<<<<<<< HEAD
- "device": "eth0",
- "kind": "node",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "chirloute-7"
-=======
->>>>>>> network API generator scripts revisited and improved.
},
{
@@ -294,31 +151,11 @@
},
{
"kind": "router",
-<<<<<<< HEAD
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
- "uid": "gw"
- },
- {
- "kind": "router",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
- "uid": "gw"
-=======
"uid": "gw-lille-6k.grid5000.fr"
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
->>>>>>> network API generator scripts revisited and improved.
}
],
"rate": 1000000
diff --git a/data/grid5000/sites/lille/network_equipments/sw-admin4.json b/data/grid5000/sites/lille/network_equipments/sw-admin4.json
index d47c29bdee18a1a04e8512fd42dd308aef950cb4..b2139156fc705e5d72730d6201ec416fccb61b1b 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-admin4.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-admin4.json
@@ -151,31 +151,11 @@
},
{
"kind": "router",
-<<<<<<< HEAD
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
- "uid": "gw"
- },
- {
- "kind": "router",
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "trunked": true,
- "uid": "gw"
-=======
"uid": "gw-lille-6k.grid5000.fr"
},
{
"kind": "router",
"uid": "gw-lille-6k.grid5000.fr"
->>>>>>> network API generator scripts revisited and improved.
}
],
"rate": 1000000
diff --git a/data/grid5000/sites/lille/network_equipments/sw-admin5.json b/data/grid5000/sites/lille/network_equipments/sw-admin5.json
index ac574cde0d4f1dd03bc74dd5ddde4e091dfe4ba9..6f4cc84ef6a244163e3987a309ca36c8eeea320e 100644
--- a/data/grid5000/sites/lille/network_equipments/sw-admin5.json
+++ b/data/grid5000/sites/lille/network_equipments/sw-admin5.json
@@ -155,16 +155,7 @@
},
{
"kind": "router",
-<<<<<<< HEAD
-<<<<<<< HEAD
- "rate": 1000000000,
-=======
- "rate": 1000000,
->>>>>>> [lille,lyon,nancy] First pass at a network equipment description.
- "uid": "gw"
-=======
"uid": "gw-lille-6k.grid5000.fr"
->>>>>>> network API generator scripts revisited and improved.
}
],
"rate": 1000000
diff --git a/data/grid5000/sites/luxembourg/luxembourg.json b/data/grid5000/sites/luxembourg/luxembourg.json
index d7c0ffc0e170e4fca5d74d8e45c9abcb8f37e075..7faeca345ebe01a8953b690bd291b9ead135d170 100644
--- a/data/grid5000/sites/luxembourg/luxembourg.json
+++ b/data/grid5000/sites/luxembourg/luxembourg.json
@@ -1,4 +1,15 @@
{
+ "compilation_server": false,
+ "description": "",
+ "email_contact": "luxembourg-staff@lists.grid5000.fr",
+ "latitude": 49.1,
+ "location": "Luxembourg, France",
+ "longitude": 6.6667,
+ "name": "Luxembourg",
+ "security_contact": "luxembourg-staff@lists.grid5000.fr",
+ "sys_admin_contact": "luxembourg-staff@lists.grid5000.fr",
"type": "site",
- "uid": "luxembourg"
+ "uid": "luxembourg",
+ "user_support_contact": "luxembourg-staff@lists.grid5000.fr",
+ "web": "https://www.grid5000.fr/mediawiki/index.php/Luxembourg:Home"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/lyon/lyon.json b/data/grid5000/sites/lyon/lyon.json
index 5bc4f3335a2e849b6a01e04d78e96f5a38797fd2..aa7f92870c2d95ac7d8398512cecc3885bc2e642 100755
--- a/data/grid5000/sites/lyon/lyon.json
+++ b/data/grid5000/sites/lyon/lyon.json
@@ -1,4 +1,15 @@
{
+ "compilation_server": false,
+ "description": "Lyon Grid'5000 Site",
+ "email_contact": "lyon-staff@lists.grid5000.fr",
+ "latitude": 45.7667,
+ "location": "Lyon, France",
+ "longitude": 4.8333,
+ "name": "Lyon",
+ "security_contact": "lyon-staff@lists.grid5000.fr",
+ "sys_admin_contact": "lyon-staff@lists.grid5000.fr",
"type": "site",
- "uid": "lyon"
+ "uid": "lyon",
+ "user_support_contact": "lyon-staff@lists.grid5000.fr",
+ "web": "https://www.grid5000.fr/mediawiki/index.php/Lyon:Home"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/nancy/nancy.json b/data/grid5000/sites/nancy/nancy.json
index f2585c4b2c2edb200afe48ea21dfbbf0908c6345..6dc0992ed437142c12f2734f71b3a320bb2caf12 100755
--- a/data/grid5000/sites/nancy/nancy.json
+++ b/data/grid5000/sites/nancy/nancy.json
@@ -1,4 +1,14 @@
{
+ "compilation_server": false,
+ "description": "",
+ "latitude": 48.7,
+ "location": "Nancy, France",
+ "longitude": 6.2,
+ "name": "Nancy",
+ "security_contact": "nancy-staff@lists.grid5000.fr",
+ "sys_admin_contact": "nancy-staff@lists.grid5000.fr",
"type": "site",
- "uid": "nancy"
+ "uid": "nancy",
+ "user_support_contact": "nancy-staff@lists.grid5000.fr",
+ "web": "http://www.loria.fr"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/reims/reims.json b/data/grid5000/sites/reims/reims.json
index 04d8d96049f58d8ae01f608abc14faa8a10f5dae..e5bcb6adb330aaa3692445004647317fa0008ec7 100644
--- a/data/grid5000/sites/reims/reims.json
+++ b/data/grid5000/sites/reims/reims.json
@@ -1,4 +1,15 @@
{
+ "compilation_server": false,
+ "description": "Grid5000 Reims site",
+ "email_contact": "reims-staff@lists.grid5000.fr",
+ "latitude": 49.244508,
+ "location": "Reims, France",
+ "longitude": 4.062714,
+ "name": "Reims",
+ "security_contact": "reims-staff@lists.grid5000.fr",
+ "sys_admin_contact": "reims-staff@lists.grid5000.fr",
"type": "site",
- "uid": "reims"
+ "uid": "reims",
+ "user_support_contact": "reims-staff@lists.grid5000.fr",
+ "web": "http://www.grid5000.fr/mediawiki/index.php/Reims:Home"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/rennes/rennes.json b/data/grid5000/sites/rennes/rennes.json
index 99ad5e450bdd3136f0f401dc599ebc33ba09d176..c589b942030a5f1f4c3fa73ee71c2594d8235021 100755
--- a/data/grid5000/sites/rennes/rennes.json
+++ b/data/grid5000/sites/rennes/rennes.json
@@ -1,4 +1,15 @@
{
+ "compilation_server": false,
+ "description": "",
+ "email_contact": "rennes-staff@lists.grid5000.fr",
+ "latitude": 48.1,
+ "location": "Rennes, France",
+ "longitude": -1.6667,
+ "name": "Rennes",
+ "security_contact": "rennes-staff@lists.grid5000.fr",
+ "sys_admin_contact": "rennes-staff@lists.grid5000.fr",
"type": "site",
- "uid": "rennes"
+ "uid": "rennes",
+ "user_support_contact": "rennes-staff@lists.grid5000.fr",
+ "web": "http://www.irisa.fr"
}
\ No newline at end of file
diff --git a/data/grid5000/sites/toulouse/toulouse.json b/data/grid5000/sites/toulouse/toulouse.json
index 1d84b0c5211bf2219a245246e0d802449eeaa70d..fcc1c906fab0ae07438b146cf5f4dbf5ac9f75dd 100755
--- a/data/grid5000/sites/toulouse/toulouse.json
+++ b/data/grid5000/sites/toulouse/toulouse.json
@@ -1,5 +1,4 @@
{
-<<<<<<< HEAD
"compilation_server": false,
"description": "Toulouse Grid'5000 Site",
"latitude": 43.6167,
@@ -12,8 +11,4 @@
"uid": "toulouse",
"user_support_contact": "toulouse-staff@lists.grid5000.fr",
"web": "https://www.grid5000.fr/mediawiki/index.php/Toulouse:Home"
-=======
- "type": "site",
- "uid": "toulouse"
->>>>>>> network API generator scripts revisited and improved.
}
\ No newline at end of file