shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-21 14:50:08 +03:00
Code Releases Wiki Activity

Ozones: update tests to work with latest developments

Browse Source
This commit is contained in:
Hector Sanjuan 2012-05-04 13:38:12 +02:00
parent 26c51cb3a3
commit 77fe50271b
8 changed files with 132 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/ozones/test/examples/pool/vdcpool0.json
View File

@ -2,13 +2,9 @@
"VDC_POOL": {
"VDC": [
{
"NAME": "vdcA",
"VDCADMINNAME": "vdcadminA",
"VDCADMIN_ID": 2,
"ID": 1,
"RESOURCES": {
"DATASTORES": [
100
],
"HOSTS": [
0,
1,
@ -27,21 +23,21 @@
8,
9,
10
]
},
"GROUP_ID": 100,
"ZONES_ID": 1,
"VDCADMINNAME": "vdcadminA",
"CLUSTER_ID": 100
},
{
"NAME": "vdcB",
"VDCADMIN_ID": 2,
"ID": 2,
"RESOURCES": {
],
"DATASTORES": [
100
],
]
},
"NAME": "vdcA",
"CLUSTER_ID": 100,
"ZONES_ID": 1,
"ID": 1,
"GROUP_ID": 100
},
{
"VDCADMINNAME": "vdcadminB",
"VDCADMIN_ID": 2,
"RESOURCES": {
"HOSTS": [
1
],
@ -56,21 +52,21 @@
6,
7,
8
]
},
"GROUP_ID": 100,
"ZONES_ID": 2,
"VDCADMINNAME": "vdcadminB",
"CLUSTER_ID": 100
},
{
"NAME": "vdcC",
"VDCADMIN_ID": 3,
"ID": 3,
"RESOURCES": {
],
"DATASTORES": [
100
],
]
},
"NAME": "vdcB",
"CLUSTER_ID": 100,
"ZONES_ID": 2,
"ID": 2,
"GROUP_ID": 100
},
{
"VDCADMINNAME": "vdcadminC",
"VDCADMIN_ID": 3,
"RESOURCES": {
"HOSTS": [
3
],
@ -85,12 +81,16 @@
15,
16,
17
],
"DATASTORES": [
100
]
},
"GROUP_ID": 101,
"NAME": "vdcC",
"CLUSTER_ID": 100,
"ZONES_ID": 1,
"VDCADMINNAME": "vdcadminC",
"CLUSTER_ID": 100
"ID": 3,
"GROUP_ID": 101
}
]
}

42
src/ozones/test/examples/pool/vdcpool_deleted.json
View File

@ -2,13 +2,9 @@
"VDC_POOL": {
"VDC": [
{
"NAME": "vdcA",
"VDCADMINNAME": "vdcadminA",
"VDCADMIN_ID": 2,
"ID": 1,
"RESOURCES": {
"DATASTORES": [
100
],
"HOSTS": [
0,
1,
@ -27,21 +23,21 @@
8,
9,
10
]
},
"GROUP_ID": 100,
"ZONES_ID": 1,
"VDCADMINNAME": "vdcadminA",
"CLUSTER_ID": 100
},
{
"NAME": "vdcB",
"VDCADMIN_ID": 2,
"ID": 2,
"RESOURCES": {
],
"DATASTORES": [
100
],
]
},
"NAME": "vdcA",
"CLUSTER_ID": 100,
"ZONES_ID": 1,
"ID": 1,
"GROUP_ID": 100
},
{
"VDCADMINNAME": "vdcadminB",
"VDCADMIN_ID": 2,
"RESOURCES": {
"HOSTS": [
1
],
@ -56,12 +52,16 @@
6,
7,
8
],
"DATASTORES": [
100
]
},
"GROUP_ID": 100,
"NAME": "vdcB",
"CLUSTER_ID": 100,
"ZONES_ID": 2,
"VDCADMINNAME": "vdcadminB",
"CLUSTER_ID": 100
"ID": 2,
"GROUP_ID": 100
}
]
}

28
src/ozones/test/examples/pool/zonepool0.json
View File

@ -2,24 +2,24 @@
"ZONE_POOL": {
"ZONE": [
{
"NAME": "zoneA",
"SUNSENDPOINT": "http://localhost:9869",
"SELFENDPOINT": null,
"ONENAME": "oneadminA",
"ID": 1,
"ONEPASS": "OkqWM2aSqbM/nlrdHGv3OA==",
"ENDPOINT": "http://localhost:2666/RPC2",
"NUMBERVDCS": 0
"SUNSENDPOINT": "http://localhost:9869",
"NAME": "zoneA",
"SELFENDPOINT": null,
"NUMBERVDCS": 0,
"ID": 1,
"ONENAME": "oneadminA",
"ONEPASS": "e/TkohQckqFcmcWFwrirUapdiLkg87GHPafKnxkzznk="
},
{
"NAME": "zoneB",
"SUNSENDPOINT": null,
"SELFENDPOINT": null,
"ONENAME": "oneadminB",
"ID": 2,
"ONEPASS": "8Si8vlo2P3qn5/SNxkMkDg==",
"ENDPOINT": "http://localhost:2667/RPC2",
"NUMBERVDCS": 0
"SUNSENDPOINT": null,
"NAME": "zoneB",
"SELFENDPOINT": null,
"NUMBERVDCS": 0,
"ID": 2,
"ONENAME": "oneadminB",
"ONEPASS": "DrnuZMnmOFVeYTXTVwTgEmOGw2orTjaU/f1NyuNKlQY="
}
]
}

14
src/ozones/test/examples/pool/zonepool_deleted.json
View File

@ -2,14 +2,14 @@
"ZONE_POOL": {
"ZONE": [
{
"NAME": "zoneA",
"SUNSENDPOINT": "http://localhost:9869",
"SELFENDPOINT": null,
"ONENAME": "oneadminA",
"ID": 1,
"ONEPASS": "OkqWM2aSqbM/nlrdHGv3OA==",
"ENDPOINT": "http://localhost:2666/RPC2",
"NUMBERVDCS": 0
"SUNSENDPOINT": "http://localhost:9869",
"NAME": "zoneA",
"SELFENDPOINT": null,
"NUMBERVDCS": 0,
"ID": 1,
"ONENAME": "oneadminA",
"ONEPASS": "e/TkohQckqFcmcWFwrirUapdiLkg87GHPafKnxkzznk="
}
]
}

16
src/ozones/test/examples/vdc/vdc0.json
View File

@ -1,12 +1,8 @@
{
"VDC": {
"NAME": "vdcA",
"VDCADMINNAME": "vdcadminA",
"VDCADMIN_ID": 2,
"ID": 1,
"RESOURCES": {
"DATASTORES": [
100
],
"HOSTS": [
0,
1,
@ -25,11 +21,15 @@
8,
9,
10
],
"DATASTORES": [
100
]
},
"GROUP_ID": 100,
"NAME": "vdcA",
"CLUSTER_ID": 100,
"ZONES_ID": 1,
"VDCADMINNAME": "vdcadminA",
"CLUSTER_ID": 100
"ID": 1,
"GROUP_ID": 100
}
}

12
src/ozones/test/examples/zone/zone0.json
View File

@ -1,14 +1,14 @@
{
"ZONE": {
"NAME": "zoneA",
"ENDPOINT": "http://localhost:2666/RPC2",
"SUNSENDPOINT": "http://localhost:9869",
"NAME": "zoneA",
"SELFENDPOINT": null,
"ID": 1,
"ONENAME": "oneadminA",
"VDCS": [
],
"SELFENDPOINT": null,
"ONENAME": "oneadminA",
"ID": 1,
"ONEPASS": "OkqWM2aSqbM/nlrdHGv3OA==",
"ENDPOINT": "http://localhost:2666/RPC2"
"ONEPASS": "e/TkohQckqFcmcWFwrirUapdiLkg87GHPafKnxkzznk="
}
}

25
src/ozones/test/spec/VDCManagement_spec.rb
View File

@ -154,13 +154,25 @@ module OZones
it "should be able to retrieve the vdc pool" do
vdcpool = @vdchelper.list_pool({:json => true})
vdcpool[0].should eql(0)
vdcpool[1].should eql(File.read(TESTS_PATH+"examples/pool/vdcpool0.json"))
got = vdcpool[1]
expected = File.read(TESTS_PATH+"examples/pool/vdcpool0.json")
got = JSON.parser.new(got, {:symbolize_names => true}).parse
expected = JSON.parser.new(expected, {:symbolize_names => true}).parse
got.should eql(expected)
end
it "should be able to retrieve a particular vdc" do
vdc = @vdchelper.show_resource(1, {:json => true})
vdc[0].should eql(0)
vdc[1].should eql(File.read(TESTS_PATH+"examples/vdc/vdc0.json"))
got = vdc[1]
expected = File.read(TESTS_PATH+"examples/vdc/vdc0.json")
got = JSON.parser.new(got, {:symbolize_names => true}).parse
expected = JSON.parser.new(expected, {:symbolize_names => true}).parse
got.should eql(expected)
end
it "should allow deleting a vdc" do
@ -168,8 +180,13 @@ module OZones
rc[0].should eql(0)
rc = @vdchelper.list_pool({:json => true})
rc[0].should eql(0)
rc[1].should eql(File.read(TESTS_PATH+
"examples/pool/vdcpool_deleted.json"))
got = rc[1]
expected = File.read(TESTS_PATH+"examples/pool/vdcpool_deleted.json")
got = JSON.parser.new(got, {:symbolize_names => true}).parse
expected = JSON.parser.new(expected, {:symbolize_names => true}).parse
got.should eql(expected)
end
it "should fail on non-existing vdc deletion" do

26
src/ozones/test/spec/ZoneManagement_spec.rb
View File

@ -72,14 +72,25 @@ module OZones
it "should be able to retrieve the zone pool" do
zonepool = @helper.list_pool({:json => true})
zonepool[0].should eql(0)
zonepool[1].should eql(File.read(TESTS_PATH+
"examples/pool/zonepool0.json"))
got = zonepool[1]
expected = File.read(TESTS_PATH+"examples/pool/zonepool0.json")
got = JSON.parser.new(got, {:symbolize_names => true}).parse
expected = JSON.parser.new(expected, {:symbolize_names => true}).parse
got.should eql(expected)
end
it "should be able to retrieve a particular zone" do
zone = @helper.show_resource(1,{:json => true})
zone[0].should eql(0)
zone[1].should eql(File.read(TESTS_PATH+"examples/zone/zone0.json"))
got = zone[1]
expected = File.read(TESTS_PATH+"examples/zone/zone0.json")
got = JSON.parser.new(got, {:symbolize_names => true}).parse
expected = JSON.parser.new(expected, {:symbolize_names => true}).parse
got.should eql(expected)
end
it "should allow deleting a zone" do
@ -87,8 +98,13 @@ module OZones
rc[0].should eql(0)
rc = @helper.list_pool({:json => true})
rc[0].should eql(0)
rc[1].should eql(File.read(TESTS_PATH+
"examples/pool/zonepool_deleted.json"))
got = rc[1]
expected = File.read(TESTS_PATH+"examples/pool/zonepool_deleted.json")
got = JSON.parser.new(got, {:symbolize_names => true}).parse
expected = JSON.parser.new(expected, {:symbolize_names => true}).parse
got.should eql(expected)
end
it "should fail on non existing zone deletion" do