diff --git a/src/ozones/test/examples/pool/vdcpool0.json b/src/ozones/test/examples/pool/vdcpool0.json index 1401a09b5b..a1bdeb5bb3 100644 --- a/src/ozones/test/examples/pool/vdcpool0.json +++ b/src/ozones/test/examples/pool/vdcpool0.json @@ -2,34 +2,95 @@ "VDC_POOL": { "VDC": [ { - "ID": 1, - "ACLS": "2,3,4,5,6,7", - "HOSTS": "1,2,3", "NAME": "vdcA", - "ZONES_ID": 1, + "VDCADMIN_ID": 2, + "ID": 1, + "RESOURCES": { + "DATASTORES": [ + 100 + ], + "HOSTS": [ + 0, + 1, + 2 + ], + "NETWORKS": [ + 0 + ], + "ACLS": [ + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + }, "GROUP_ID": 100, + "ZONES_ID": 1, "VDCADMINNAME": "vdcadminA", - "VDCADMIN_ID": 2 + "CLUSTER_ID": 100 }, { - "ID": 2, - "ACLS": "2,3,4,5", - "HOSTS": "1", "NAME": "vdcB", - "ZONES_ID": 2, + "VDCADMIN_ID": 2, + "ID": 2, + "RESOURCES": { + "DATASTORES": [ + 100 + ], + "HOSTS": [ + 1 + ], + "NETWORKS": [ + 0 + ], + "ACLS": [ + 2, + 3, + 4, + 5, + 6, + 7, + 8 + ] + }, "GROUP_ID": 100, + "ZONES_ID": 2, "VDCADMINNAME": "vdcadminB", - "VDCADMIN_ID": 2 + "CLUSTER_ID": 100 }, { - "ID": 3, - "ACLS": "8,9,10,11", - "HOSTS": "4", "NAME": "vdcC", - "ZONES_ID": 1, + "VDCADMIN_ID": 3, + "ID": 3, + "RESOURCES": { + "DATASTORES": [ + 100 + ], + "HOSTS": [ + 3 + ], + "NETWORKS": [ + 0 + ], + "ACLS": [ + 11, + 12, + 13, + 14, + 15, + 16, + 17 + ] + }, "GROUP_ID": 101, + "ZONES_ID": 1, "VDCADMINNAME": "vdcadminC", - "VDCADMIN_ID": 3 + "CLUSTER_ID": 100 } ] } diff --git a/src/ozones/test/examples/pool/vdcpool_deleted.json b/src/ozones/test/examples/pool/vdcpool_deleted.json index bd6fd87e84..9933c90dc9 100644 --- a/src/ozones/test/examples/pool/vdcpool_deleted.json +++ b/src/ozones/test/examples/pool/vdcpool_deleted.json @@ -2,24 +2,66 @@ "VDC_POOL": { "VDC": [ { - "ID": 1, - "ACLS": "2,3,4,5,6,7", - "HOSTS": "1,2,3", "NAME": "vdcA", - "ZONES_ID": 1, + "VDCADMIN_ID": 2, + "ID": 1, + "RESOURCES": { + "DATASTORES": [ + 100 + ], + "HOSTS": [ + 0, + 1, + 2 + ], + "NETWORKS": [ + 0 + ], + "ACLS": [ + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + }, "GROUP_ID": 100, + "ZONES_ID": 1, "VDCADMINNAME": "vdcadminA", - "VDCADMIN_ID": 2 + "CLUSTER_ID": 100 }, { - "ID": 2, - "ACLS": "2,3,4,5", - "HOSTS": "1", "NAME": "vdcB", - "ZONES_ID": 2, + "VDCADMIN_ID": 2, + "ID": 2, + "RESOURCES": { + "DATASTORES": [ + 100 + ], + "HOSTS": [ + 1 + ], + "NETWORKS": [ + 0 + ], + "ACLS": [ + 2, + 3, + 4, + 5, + 6, + 7, + 8 + ] + }, "GROUP_ID": 100, + "ZONES_ID": 2, "VDCADMINNAME": "vdcadminB", - "VDCADMIN_ID": 2 + "CLUSTER_ID": 100 } ] } diff --git a/src/ozones/test/examples/pool/zonepool0.json b/src/ozones/test/examples/pool/zonepool0.json index 1eaf1751fa..55e4228586 100644 --- a/src/ozones/test/examples/pool/zonepool0.json +++ b/src/ozones/test/examples/pool/zonepool0.json @@ -2,24 +2,24 @@ "ZONE_POOL": { "ZONE": [ { - "ID": 1, - "ENDPOINT": "http://localhost:2666/RPC2", - "NUMBERVDCS": 0, - "SUNSENDPOINT": "http://localhost:9869", "NAME": "zoneA", + "SUNSENDPOINT": "http://localhost:9869", "SELFENDPOINT": null, "ONENAME": "oneadminA", - "ONEPASS": "OkqWM2aSqbM/nlrdHGv3OA==" + "ID": 1, + "ONEPASS": "OkqWM2aSqbM/nlrdHGv3OA==", + "ENDPOINT": "http://localhost:2666/RPC2", + "NUMBERVDCS": 0 }, { - "ID": 2, - "ENDPOINT": "http://localhost:2667/RPC2", - "NUMBERVDCS": 0, - "SUNSENDPOINT": null, "NAME": "zoneB", + "SUNSENDPOINT": null, "SELFENDPOINT": null, "ONENAME": "oneadminB", - "ONEPASS": "8Si8vlo2P3qn5/SNxkMkDg==" + "ID": 2, + "ONEPASS": "8Si8vlo2P3qn5/SNxkMkDg==", + "ENDPOINT": "http://localhost:2667/RPC2", + "NUMBERVDCS": 0 } ] } diff --git a/src/ozones/test/examples/pool/zonepool_deleted.json b/src/ozones/test/examples/pool/zonepool_deleted.json index 6ec991ee16..0176e04da5 100644 --- a/src/ozones/test/examples/pool/zonepool_deleted.json +++ b/src/ozones/test/examples/pool/zonepool_deleted.json @@ -2,14 +2,14 @@ "ZONE_POOL": { "ZONE": [ { - "ID": 1, - "ENDPOINT": "http://localhost:2666/RPC2", - "NUMBERVDCS": 0, - "SUNSENDPOINT": "http://localhost:9869", "NAME": "zoneA", + "SUNSENDPOINT": "http://localhost:9869", "SELFENDPOINT": null, "ONENAME": "oneadminA", - "ONEPASS": "OkqWM2aSqbM/nlrdHGv3OA==" + "ID": 1, + "ONEPASS": "OkqWM2aSqbM/nlrdHGv3OA==", + "ENDPOINT": "http://localhost:2666/RPC2", + "NUMBERVDCS": 0 } ] } diff --git a/src/ozones/test/examples/vdc/vdc0.json b/src/ozones/test/examples/vdc/vdc0.json index b716f24472..35d7a92420 100644 --- a/src/ozones/test/examples/vdc/vdc0.json +++ b/src/ozones/test/examples/vdc/vdc0.json @@ -1,12 +1,35 @@ { "VDC": { - "ID": 1, - "ACLS": "2,3,4,5,6,7", - "HOSTS": "1,2,3", "NAME": "vdcA", - "ZONES_ID": 1, + "VDCADMIN_ID": 2, + "ID": 1, + "RESOURCES": { + "DATASTORES": [ + 100 + ], + "HOSTS": [ + 0, + 1, + 2 + ], + "NETWORKS": [ + 0 + ], + "ACLS": [ + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10 + ] + }, "GROUP_ID": 100, + "ZONES_ID": 1, "VDCADMINNAME": "vdcadminA", - "VDCADMIN_ID": 2 + "CLUSTER_ID": 100 } } \ No newline at end of file diff --git a/src/ozones/test/examples/zone/zone0.json b/src/ozones/test/examples/zone/zone0.json index 6b8d182e36..108a250402 100644 --- a/src/ozones/test/examples/zone/zone0.json +++ b/src/ozones/test/examples/zone/zone0.json @@ -1,14 +1,14 @@ { "ZONE": { - "ID": 1, - "ENDPOINT": "http://localhost:2666/RPC2", + "NAME": "zoneA", "SUNSENDPOINT": "http://localhost:9869", "VDCS": [ ], - "NAME": "zoneA", "SELFENDPOINT": null, "ONENAME": "oneadminA", - "ONEPASS": "OkqWM2aSqbM/nlrdHGv3OA==" + "ID": 1, + "ONEPASS": "OkqWM2aSqbM/nlrdHGv3OA==", + "ENDPOINT": "http://localhost:2666/RPC2" } } \ No newline at end of file diff --git a/src/ozones/test/spec/VDCManagement_spec.rb b/src/ozones/test/spec/VDCManagement_spec.rb index 35be54b574..1d006721e3 100644 --- a/src/ozones/test/spec/VDCManagement_spec.rb +++ b/src/ozones/test/spec/VDCManagement_spec.rb @@ -28,6 +28,7 @@ $: << RUBY_LIB_LOCATION+"/cli" require 'command_parser' require 'ozones_helper/zones_helper.rb' require 'ozones_helper/vdc_helper.rb' +require 'pp' TESTS_PATH = File.dirname(__FILE__)+"/../" @@ -48,28 +49,62 @@ module OZones TESTS_PATH+"etc/one_auth_b"), "http://localhost:2667/RPC2") + clusterA = OpenNebula::Cluster.new(OpenNebula::Cluster.build_xml, + @clientA) + clusterA.allocate("clusterA") + + sleep 1 + + clusterB = OpenNebula::Cluster.new(OpenNebula::Cluster.build_xml, + @clientB) + clusterB.allocate("clusterB") + hostA=OpenNebula::Host.new(OpenNebula::Host.build_xml, @clientA) - hostA.allocate("hostA1","im_dummy","vmm_dummy","tm_dummy","dummy") - hostA.allocate("hostA2","im_dummy","vmm_dummy","tm_dummy","dummy") - hostA.allocate("hostA3","im_dummy","vmm_dummy","tm_dummy","dummy") - hostA.allocate("hostA4","im_dummy","vmm_dummy","tm_dummy","dummy") + hostA.allocate("hostA1","im_dummy","vmm_dummy","dummy",100) + hostA.allocate("hostA2","im_dummy","vmm_dummy","dummy",100) + hostA.allocate("hostA3","im_dummy","vmm_dummy","dummy",100) + hostA.allocate("hostA4","im_dummy","vmm_dummy","dummy",100) hostB=OpenNebula::Host.new(OpenNebula::Host.build_xml, @clientB) - hostB.allocate("hostB1","im_dummy","vmm_dummy","tm_dummy","dummy") - hostB.allocate("hostB2","im_dummy","vmm_dummy","tm_dummy","dummy") - hostB.allocate("hostB3","im_dummy","vmm_dummy","tm_dummy","dummy") + hostB.allocate("hostB1","im_dummy","vmm_dummy","dummy",100) + hostB.allocate("hostB2","im_dummy","vmm_dummy","dummy",100) + hostB.allocate("hostB3","im_dummy","vmm_dummy","dummy",100) + + ds_tmpl = File.new(TESTS_PATH+"templates/datastore.template").read + dsA = OpenNebula::Datastore.new(OpenNebula::Datastore.build_xml, @clientA) + dsA.allocate(ds_tmpl,100) + + sleep 1 + + dsB = OpenNebula::Datastore.new(OpenNebula::Datastore.build_xml, @clientB) + dsB.allocate(ds_tmpl,100) + + sleep 1 + + vnet_tmpl = File.new(TESTS_PATH+"templates/vnet.template").read + vnetA = OpenNebula::VirtualNetwork.new(OpenNebula::VirtualNetwork.build_xml, @clientA) + rc = vnetA.allocate(vnet_tmpl,100) + + sleep 1 + + vnetB = OpenNebula::VirtualNetwork.new(OpenNebula::VirtualNetwork.build_xml, @clientB) + rc = vnetB.allocate(vnet_tmpl,100) + end it "should be able to create a couple of zones" do rc = @zonehelper.create_resource(TESTS_PATH+"templates/zoneA.template") rc[0].should eql(0) + + sleep 1 + rc = @zonehelper.create_resource(TESTS_PATH+"templates/zoneB.template") rc[0].should eql(0) end it "should be able to create one vdc with apropiate ONE resources" do - @vdchelper.create_resource(TESTS_PATH+"templates/vdcA.template", - {:force => false})[0].should eql(0) + rc = @vdchelper.create_resource(TESTS_PATH+"templates/vdcA.template", + {:force => false}) upool = OpenNebula::UserPool.new(@clientA) upool.info @@ -96,18 +131,19 @@ module OZones apool = OpenNebula::AclPool.new(@clientA) apool.info # TODO check ACLs + end it "should be able to create a couple of VDCs" do @vdchelper.create_resource(TESTS_PATH+"templates/vdcB.template", - {:force => false})[0].should eql(0) + {:force => true})[0].should eql(0) @vdchelper.create_resource(TESTS_PATH+"templates/vdcC.template", - {:force => false})[0].should eql(0) + {:force => true})[0].should eql(0) end it "should fail when creating an existing VDC" do @vdchelper.create_resource(TESTS_PATH+"templates/vdcA.template", - {:force => false})[0].should eql(-1) + {:force => true})[0].should eql(-1) end it "should fail when creating a VDC upon a non existing zone" do @@ -140,5 +176,5 @@ module OZones rc = @vdchelper.delete_resource(7, {}) rc[0].should eql(-1) end - end + end end diff --git a/src/ozones/test/spec/ZoneManagement_spec.rb b/src/ozones/test/spec/ZoneManagement_spec.rb index e60e5caf11..8826fef7c0 100644 --- a/src/ozones/test/spec/ZoneManagement_spec.rb +++ b/src/ozones/test/spec/ZoneManagement_spec.rb @@ -42,7 +42,9 @@ module OZones rc = @helper.create_resource(TESTS_PATH+"templates/zoneA.template") rc[0].should eql(0) - @helper.create_resource(TESTS_PATH+"templates/zoneB.template") + sleep 1 + + rc = @helper.create_resource(TESTS_PATH+"templates/zoneB.template") rc[0].should eql(0) end diff --git a/src/ozones/test/templates/datastore.template b/src/ozones/test/templates/datastore.template new file mode 100644 index 0000000000..4f7c968fd1 --- /dev/null +++ b/src/ozones/test/templates/datastore.template @@ -0,0 +1,3 @@ +NAME=datastore +DS_MAD=fs +TM_MAD=dummy diff --git a/src/ozones/test/templates/vdc.no.zone.template b/src/ozones/test/templates/vdc.no.zone.template index 88a1168eb0..b6420d81f5 100644 --- a/src/ozones/test/templates/vdc.no.zone.template +++ b/src/ozones/test/templates/vdc.no.zone.template @@ -1,5 +1,8 @@ NAME=vdc VDCADMINNAME=vdcadminbogus VDCADMINPASS=vdcpassbogus -ZONEID=18 -HOSTS=1 \ No newline at end of file +ZONE_ID=18 +CLUSTER_ID=100 +HOSTS=1 +DATASTORES=100 +NETWORKS=0 diff --git a/src/ozones/test/templates/vdc.wrong.zone.template b/src/ozones/test/templates/vdc.wrong.zone.template index 8ff03fbf6a..26dae12fbe 100644 --- a/src/ozones/test/templates/vdc.wrong.zone.template +++ b/src/ozones/test/templates/vdc.wrong.zone.template @@ -1,5 +1,5 @@ NAME=vdcB VDCADMINNAME=vdcadminB VDCADMINPASS=vdcpassB -ZONEID=3 +ZONE_ID=3 HOSTS=1 \ No newline at end of file diff --git a/src/ozones/test/templates/vdcA.template b/src/ozones/test/templates/vdcA.template index a8e8a81662..10842b7f0c 100644 --- a/src/ozones/test/templates/vdcA.template +++ b/src/ozones/test/templates/vdcA.template @@ -1,5 +1,8 @@ NAME=vdcA VDCADMINNAME=vdcadminA VDCADMINPASS=vdcpassA -ZONEID=1 -HOSTS=1,2,3 \ No newline at end of file +ZONE_ID=1 +CLUSTER_ID=100 +HOSTS=0,1,2 +DATASTORES=100 +NETWORKS=0 diff --git a/src/ozones/test/templates/vdcB.template b/src/ozones/test/templates/vdcB.template index fa9276fe5b..84ce1d56b8 100644 --- a/src/ozones/test/templates/vdcB.template +++ b/src/ozones/test/templates/vdcB.template @@ -1,5 +1,8 @@ NAME=vdcB VDCADMINNAME=vdcadminB VDCADMINPASS=vdcpassB -ZONEID=2 -HOSTS=1 \ No newline at end of file +ZONE_ID=2 +CLUSTER_ID=100 +HOSTS=1 +DATASTORES=100 +NETWORKS=0 diff --git a/src/ozones/test/templates/vdcC.template b/src/ozones/test/templates/vdcC.template index 47c2b9148b..089d342563 100644 --- a/src/ozones/test/templates/vdcC.template +++ b/src/ozones/test/templates/vdcC.template @@ -1,5 +1,8 @@ NAME=vdcC VDCADMINNAME=vdcadminC VDCADMINPASS=vdcpassC -ZONEID=1 -HOSTS=4 +ZONE_ID=1 +CLUSTER_ID=100 +HOSTS=3 +DATASTORES=100 +NETWORKS=0 diff --git a/src/ozones/test/templates/vnet.template b/src/ozones/test/templates/vnet.template new file mode 100644 index 0000000000..d84b2268bc --- /dev/null +++ b/src/ozones/test/templates/vnet.template @@ -0,0 +1,5 @@ +NAME = "Blue LAN" +TYPE = FIXED +BRIDGE = vbr1 + +LEASES = [IP=130.10.0.1]