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

B #2756: GOCA - fix tests

Browse Source
This commit is contained in:
treywelsh 2019-01-14 11:20:22 +01:00 committed by Ruben S. Montero
parent c9df73133f
commit eab7c21144
7 changed files with 26 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/oca/go/src/goca/image_test.go
View File

@ -71,7 +71,7 @@ func TestImage(t *testing.T) {
image, err = NewImageFromName(name)
if err != nil {
t.Error(err)
t.Fatal(err)
}
err = image.Info()

7
src/oca/go/src/goca/marketplace_test.go
View File

@ -2,14 +2,13 @@ package goca
import (
"testing"
"goca"
)
func TestMarketplace(t *testing.T){
var mkt_name string = "marketplace_test_go"
var market *goca.MarketPlace
var market *MarketPlace
var mkt_template string = "NAME = \"" + mkt_name + "\"\n" +
"MARKET_MAD = \"http\"\n" +
@ -17,13 +16,13 @@ func TestMarketplace(t *testing.T){
"PUBLIC_DIR = \"/var/loca/market-http\""
//Create Marketpkace
market_id, err := goca.CreateMarketPlace(mkt_template)
market_id, err := CreateMarketPlace(mkt_template)
if err != nil {
t.Errorf("Test failed:\n" + err.Error())
}
market = goca.NewMarketPlace(market_id)
market = NewMarketPlace(market_id)
market.Info()
actual, _:= market.XMLResource.XPath("/MARKETPLACE/NAME")

15
src/oca/go/src/goca/marketplaceapp_test.go
View File

@ -2,13 +2,12 @@ package goca
import (
"testing"
"goca"
"strconv"
)
func TestMarketplaceApp(t *testing.T){
var mkt_app_name string = "new_mkt_app"
var mkt_app *goca.MarketPlaceApp
var mkt_app *MarketPlaceApp
var mkt_app_tmpl string
var mkt_img_id uint
var market_id uint
@ -22,7 +21,7 @@ func TestMarketplaceApp(t *testing.T){
"TYPE = DATABLOCK\n" +
"SIZE = 1\n"
mkt_img_id, err = goca.CreateImage(img_tmpl, 1)
mkt_img_id, err = CreateImage(img_tmpl, 1)
if err != nil {
t.Errorf("Test failed:\n" + err.Error())
@ -36,7 +35,7 @@ func TestMarketplaceApp(t *testing.T){
"BASE_URL = \"http://url/\"\n" +
"PUBLIC_DIR = \"/var/loca/market-http\"\n"
market_id, err = goca.CreateMarketPlace(mkt_tmpl)
market_id, err = CreateMarketPlace(mkt_tmpl)
if err != nil {
t.Errorf("Test failed:\n" + err.Error())
@ -45,13 +44,13 @@ func TestMarketplaceApp(t *testing.T){
mkt_app_tmpl += "MARKETPLACE_ID=\"" + strconv.Itoa(int(market_id)) + "\"\n"
//Create MarketplaceApp
app_id, err := goca.CreateMarketPlaceApp(mkt_app_tmpl, int(market_id))
app_id, err := CreateMarketPlaceApp(mkt_app_tmpl, int(market_id))
if err != nil {
t.Errorf("Test failed:\n" + err.Error())
}
mkt_app = goca.NewMarketPlaceApp(app_id)
mkt_app = NewMarketPlaceApp(app_id)
mkt_app.Info()
actual, _:= mkt_app.XMLResource.XPath("/MARKETPLACEAPP/NAME")
@ -68,7 +67,7 @@ func TestMarketplaceApp(t *testing.T){
}
//delete image
img := goca.NewImage(mkt_img_id)
img := NewImage(mkt_img_id)
err = img.Delete()
if err != nil {
@ -76,7 +75,7 @@ func TestMarketplaceApp(t *testing.T){
}
//delete marketplace
market := goca.NewMarketPlace(market_id)
market := NewMarketPlace(market_id)
err = market.Delete()
if err != nil {

9
src/oca/go/src/goca/securitygroup_test.go
View File

@ -2,25 +2,24 @@ package goca
import (
"testing"
"goca"
)
func TestSGAllocate(t *testing.T){
var sg_name string = "new_test_sg"
var sg *goca.SecurityGroup
var sg *SecurityGroup
var sg_template string = "NAME = \"" + sg_name + "\"\n" +
"DESCRIPTION = \"test security group\"\n"+
"ATT1 = \"VAL1\"\n" +
"ATT2 = \"VAL2\""
//Create SG
sg_id, err := goca.CreateSecurityGroup(sg_template)
sg_id, err := CreateSecurityGroup(sg_template)
if err != nil {
t.Errorf("Test failed:\n" + err.Error())
}
sg = goca.NewSecurityGroup(sg_id)
sg = NewSecurityGroup(sg_id)
sg.Info()
actual, _:= sg.XMLResource.XPath("/SECURITY_GROUP/NAME")
@ -60,7 +59,7 @@ func TestSGAllocate(t *testing.T){
t.Errorf("Test failed:\n" + err.Error())
}
clone := goca.NewSecurityGroup(clone_id)
clone := NewSecurityGroup(clone_id)
clone.Info()
actual, _ = clone.XMLResource.XPath("/SECURITY_GROUP/NAME")

2
src/oca/go/src/goca/template_test.go
View File

@ -51,7 +51,7 @@ func TestTemplateCreateAndDelete(t *testing.T) {
template, err = NewTemplateFromName(templateName)
if err != nil {
t.Error(err)
t.Fatal(err)
}
err = template.Info()

2
src/oca/go/src/goca/virtualnetwork_test.go
View File

@ -52,7 +52,7 @@ func TestVirtualNetwork(t *testing.T) {
vnet, err = NewVirtualNetworkFromName(name)
if err != nil {
t.Error(err)
t.Fatal(err)
}
err = vnet.Info()

19
src/oca/go/src/goca/virtualrouter_test.go
View File

@ -2,27 +2,26 @@ package goca
import (
"testing"
"goca"
)
func TestVirtualRouter(t *testing.T){
var vr_name string = "new_vr"
var vr *goca.VirtualRouter
var vr *VirtualRouter
var vr_template string = "NAME = \"" + vr_name + "\"\n" +
"VROUTER = YES\n" +
"ATT1 = \"VAL1\"\n" +
"ATT2 = \"VAL2\""
//Create VirtualRouter
vr_id, err := goca.CreateVirtualRouter(vr_template)
vr_id, err := CreateVirtualRouter(vr_template)
if err != nil {
t.Errorf("Test failed:\n" + err.Error())
}
vr = goca.NewVirtualRouter(vr_id)
vr = NewVirtualRouter(vr_id)
vr.Info()
actual, _:= vr.XMLResource.XPath("/VROUTER/NAME")
@ -113,7 +112,7 @@ func TestVirtualRouter(t *testing.T){
"VROUTER = YES\n"+
"MEMORY = 64\n"
tmpl_id, err := goca.CreateTemplate(tmpl)
tmpl_id, err := CreateTemplate(tmpl)
if err != nil {
t.Errorf("Test failed:\n" + err.Error())
@ -122,14 +121,14 @@ func TestVirtualRouter(t *testing.T){
//Instantiate VirtualRouter
vr.Instantiate(1, int(tmpl_id), "vr_test_go", false, "")
vm, err := goca.NewVMFromName("vr_test_go")
vm, err := NewVMFromName("vr_test_go")
if err != nil {
t.Errorf("Test failed:\n" + err.Error())
t.Fatal("Test failed:\n" + err.Error())
}
vm.TerminateHard()
template := goca.NewTemplate(tmpl_id)
template := NewTemplate(tmpl_id)
template.Delete()
@ -137,7 +136,7 @@ func TestVirtualRouter(t *testing.T){
"BRIDGE = vbr0\n" +
"VN_MAD = dummy\n"
vnet_id, _ := goca.CreateVirtualNetwork(vn_tmpl, 0)
vnet_id, _ := CreateVirtualNetwork(vn_tmpl, 0)
nic_tmpl := "NIC = [ NETWORK=\"go-net\" ]"
@ -156,7 +155,7 @@ func TestVirtualRouter(t *testing.T){
t.Errorf("Test failed, expected: '%s', got: '%s'", "go-net", actual)
}
vnet := goca.NewVirtualNetwork(vnet_id)
vnet := NewVirtualNetwork(vnet_id)
vnet.Delete()
//Detach nic from VirtualRouter