Commit 80f822af authored by BASU Anirvan's avatar BASU Anirvan Committed by Lucas Nussbaum
Browse files

added /servers to site nancy

parent 24c7e1f8
......@@ -14,9 +14,6 @@
require 'spec_helper'
# abasu - 03.03.2016 - updated values from 070663579dafada27e078f468614f85a62cf2992
# to d03a97ebe1fcf3b9f10cf4eb066a1b97ddd4e09a
describe RootController do
render_views
......@@ -26,7 +23,7 @@ describe RootController do
json.should == {
"type"=>"grid",
"uid"=>"grid5000",
"version"=>"d03a97ebe1fcf3b9f10cf4eb066a1b97ddd4e09a",
"version"=>"8a562420c9a659256eeaafcfd89dfa917b5fb4d0",
"release"=>Grid5000::VERSION,
"timestamp"=>@now.to_i,
"links"=>[
......@@ -34,7 +31,7 @@ describe RootController do
{"rel"=>"sites", "href"=>"/sites", "type"=>"application/vnd.grid5000.collection+json"},
{"rel"=>"self", "type"=>"application/vnd.grid5000.item+json", "href"=>"/"},
{"rel"=>"parent", "type"=>"application/vnd.grid5000.item+json", "href"=>"/"},
{"rel"=>"version", "type"=>"application/vnd.grid5000.item+json", "href"=>"/versions/d03a97ebe1fcf3b9f10cf4eb066a1b97ddd4e09a"},
{"rel"=>"version", "type"=>"application/vnd.grid5000.item+json", "href"=>"/versions/8a562420c9a659256eeaafcfd89dfa917b5fb4d0"},
{"rel"=>"versions", "type"=>"application/vnd.grid5000.collection+json", "href"=>"/versions"},
{"rel"=>"users", "type"=>"application/vnd.grid5000.collection+json", "href"=>"/users"},
{"rel"=>"notifications", "type"=>"application/vnd.grid5000.collection+json", "href"=>"/notifications"}
......@@ -49,7 +46,7 @@ describe RootController do
json.should == {
"type"=>"grid",
"uid"=>"grid5000",
"version"=>"d03a97ebe1fcf3b9f10cf4eb066a1b97ddd4e09a",
"version"=>"8a562420c9a659256eeaafcfd89dfa917b5fb4d0",
"release"=>Grid5000::VERSION,
"timestamp"=>@now.to_i,
"links"=>[
......@@ -57,7 +54,7 @@ describe RootController do
{"rel"=>"sites", "href"=>"/sid/sites", "type"=>"application/vnd.grid5000.collection+json"},
{"rel"=>"self", "type"=>"application/vnd.grid5000.item+json", "href"=>"/sid/"},
{"rel"=>"parent", "type"=>"application/vnd.grid5000.item+json", "href"=>"/sid/"},
{"rel"=>"version", "type"=>"application/vnd.grid5000.item+json", "href"=>"/sid/versions/d03a97ebe1fcf3b9f10cf4eb066a1b97ddd4e09a"},
{"rel"=>"version", "type"=>"application/vnd.grid5000.item+json", "href"=>"/sid/versions/8a562420c9a659256eeaafcfd89dfa917b5fb4d0"},
{"rel"=>"versions", "type"=>"application/vnd.grid5000.collection+json", "href"=>"/sid/versions"},
{"rel"=>"users", "type"=>"application/vnd.grid5000.collection+json", "href"=>"/sid/users"},
{"rel"=>"notifications", "type"=>"application/vnd.grid5000.collection+json", "href"=>"/sid/notifications"}
......
......@@ -83,8 +83,7 @@ describe SitesController do
}['href'].should == "/sites/rennes/clusters"
json['links'].find{|l|
l['rel'] == 'version'
# abasu - 03.03.2016 - updated value from 070663579dafada27e078f468614f85a62cf2992
}['href'].should == "/sites/rennes/versions/d03a97ebe1fcf3b9f10cf4eb066a1b97ddd4e09a"
}['href'].should == "/sites/rennes/versions/8a562420c9a659256eeaafcfd89dfa917b5fb4d0"
end
it "should return subresource links that are only in testing branch" do
......
......@@ -21,10 +21,9 @@ describe VersionsController do
it "should get the list of versions" do
get :index, :resource => "/sites", :format => :json
response.status.should == 200
# abasu - 03.03.2016 - update "total" and "length" from 8 to 9
json["total"].should == 9
json["total"].should == 10
json["offset"].should == 0
json["items"].length.should == 9
json["items"].length.should == 10
json["links"].map{|l| l["rel"]}.sort.should == ["parent", "self"]
json["items"][0].keys.sort.should == ["author", "date", "links", "message", "type", "uid"]
json["items"][0]["links"].map{|l| l["rel"]}.sort.should == ["parent", "self"]
......
{
"alias": [
"storage5k"
],
"kind": "physical",
"monitoring": {
"metric": "power",
"wattmeter": "multiple"
},
"sensors": {
"network": {
"available": true,
"resolution": 1
},
"power": {
"available": true,
"resolution": 1,
"via": {
"pdu": [
{
"port": 8,
"uid": "griffon-pdu1"
},
{
"port": 8,
"uid": "griffon-pdu2"
}
]
}
}
},
"serial": null,
"type": "server",
"uid": "storage5k",
"warranty": 1.2012
}
{
"alias": [
],
"kind": "physical",
"monitoring": {
"metric": "power",
"wattmeter": "multiple"
},
"network_adapters": {
"bmc": {
"ip": "172.17.79.21"
},
"default": {
"ip": "172.16.79.21"
}
},
"sensors": {
"network": {
"available": true,
"resolution": 1
},
"power": {
"available": true,
"resolution": 1,
"via": {
"pdu": [
{
"port": 20,
"uid": "grisou-pdu1"
},
{
"port": 20,
"uid": "grisou-pdu2"
}
]
}
}
},
"serial": "92ZLL82",
"type": "server",
"uid": "talc-data",
"warranty": 11.202
}
Cleared accidental removal of nancy clusters
added /servers to site nancy
......@@ -14,3 +14,4 @@ ae5c7e2e8d298690c7917ed129b210f9c4bdbf90 5a5bdfcfa33b5a025677591815f4b024524c81a
6e63ed50a2f4e2ed6d594420b969e660aa4d0310 5b02702daa827f7e39ebf7396af26735c9d2aacd Cyril Rohr <cyril.rohr@inria.fr> 1320833401 +0100 checkout: moving from testing to master
5b02702daa827f7e39ebf7396af26735c9d2aacd 070663579dafada27e078f468614f85a62cf2992 David Margery <david.margery@inria.fr> 1434979330 +0200 commit: Changes in data to test for fix to 5065
070663579dafada27e078f468614f85a62cf2992 d03a97ebe1fcf3b9f10cf4eb066a1b97ddd4e09a Anirvan BASU <Anirvan.BASU@INRIA.fr> 1457104522 +0100 commit: added nancy clusters for unit tests on bug #6363
d03a97ebe1fcf3b9f10cf4eb066a1b97ddd4e09a 8a562420c9a659256eeaafcfd89dfa917b5fb4d0 Anirvan BASU <Anirvan.BASU@INRIA.fr> 1477556809 +0200 commit: added /servers to site nancy
......@@ -11,3 +11,4 @@ ae5c7e2e8d298690c7917ed129b210f9c4bdbf90 5a5bdfcfa33b5a025677591815f4b024524c81a
729d479d0dd550b256cfc34171a701247f16b235 5b02702daa827f7e39ebf7396af26735c9d2aacd Cyril Rohr <cyril.rohr@irisa.fr> 1294243789 +0100 commit: Add synlinks for environments.
5b02702daa827f7e39ebf7396af26735c9d2aacd 070663579dafada27e078f468614f85a62cf2992 David Margery <david.margery@inria.fr> 1434979330 +0200 commit: Changes in data to test for fix to 5065
070663579dafada27e078f468614f85a62cf2992 d03a97ebe1fcf3b9f10cf4eb066a1b97ddd4e09a Anirvan BASU <Anirvan.BASU@INRIA.fr> 1457104522 +0100 commit: added nancy clusters for unit tests on bug #6363
d03a97ebe1fcf3b9f10cf4eb066a1b97ddd4e09a 8a562420c9a659256eeaafcfd89dfa917b5fb4d0 Anirvan BASU <Anirvan.BASU@INRIA.fr> 1477556809 +0200 commit: added /servers to site nancy
xAn0 EQmUFB\EP 'qmwUY8ҶORP^v
}p}% M,@D"nFWH Mߙ :OjQ`TOeu*䖨31Ye*<CrP?fH{$!o*3@ rBF/8%6'zz#UvFc6Jq9 SsUʆkV7^}8*
\ No newline at end of file
x1n1@QjbH05E, Q0xA PI?͗jU$&q=cfI`\48xJ9.ӈ}o;2؏?v0sro>"l7,EMmej
K?fM
\ No newline at end of file
d03a97ebe1fcf3b9f10cf4eb066a1b97ddd4e09a
8a562420c9a659256eeaafcfd89dfa917b5fb4d0
......@@ -16,8 +16,7 @@ require 'spec_helper'
describe Grid5000::Repository do
before do
# abasu - 03.03.2016 - updated value from 070663579dafada27e078f468614f85a62cf2992
@latest_commit = "d03a97ebe1fcf3b9f10cf4eb066a1b97ddd4e09a"
@latest_commit = "8a562420c9a659256eeaafcfd89dfa917b5fb4d0"
end
it "should instantiate a new repository object with the correct settings" do
......@@ -194,8 +193,7 @@ describe Grid5000::Repository do
describe "versions_for" do
it "find the versions for a resource" do
# abasu - 03.03.2016 - update "total" value from 8 to 9
@repository.versions_for("grid5000/sites")["total"].should == 9
@repository.versions_for("grid5000/sites")["total"].should == 10
end
it "should return an empty list if the resource does not exist" do
@repository.versions_for("grid5000/doesnotexist").should == {"total"=>0, "offset"=>0, "items"=>[]}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment