Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix setting of cluster id on Virtual Network creation #7

Merged
merged 1 commit into from
Dec 12, 2019
Merged

Fix setting of cluster id on Virtual Network creation #7

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 23 additions & 7 deletions opennebula/resource_opennebula_virtual_network.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,8 +387,11 @@ func resourceOpennebulaVirtualNetworkCreate(d *schema.ResourceData, meta interfa
return err
}

// Get Clusters list
clusters := getVnetClustersValue(d)

// Create VNet
vnetID, err := controller.VirtualNetworks().Create(vntpl, -1)
vnetID, err := controller.VirtualNetworks().Create(vntpl, clusters[0])
if err != nil {
return err
}
Expand Down Expand Up @@ -434,9 +437,9 @@ func resourceOpennebulaVirtualNetworkCreate(d *schema.ResourceData, meta interfa
}
}

// Set Clusters
if _, ok := d.GetOk("clusters"); ok {
err := setVnetClusters(d, meta, vnetID)
// Set Clusters (first in list is already set)
if len(clusters) > 1 {
err := setVnetClusters(clusters[1:], meta, vnetID)
if err != nil {
return err
}
Expand Down Expand Up @@ -694,18 +697,31 @@ func generateVnXML(d *schema.ResourceData) (string, error) {
return vnstring, nil
}

func setVnetClusters(d *schema.ResourceData, meta interface{}, id int) error {
func getVnetClustersValue(d *schema.ResourceData) []int {
var result = make([]int, 0)

if clusters, ok := d.GetOk("clusters"); ok {
clusterList := clusters.([]interface{})
for i := 0; i < len(clusterList); i++ {
result = append(result, clusterList[i].(int))
}
} else {
result = append(result, -1)
}
return result
}

func setVnetClusters(clusters []int, meta interface{}, id int) error {
controller := meta.(*goca.Controller)
// TODO: fix it after 5.10 release
// Force the "decrypt" bool to false to keep ONE 5.8 behavior
clusterPool, err := controller.Clusters().Info(false)
if err != nil {
return err
}
clusters := d.Get("clusters").([]interface{})
log.Printf("Number of clusters: %d", len(clusters))
for i := 0; i < len(clusters); i++ {
clusterid := clusters[i].(int)
clusterid := clusters[i]
for j := 0; j < len(clusterPool.Clusters); j++ {
if clusterid == clusterPool.Clusters[j].ID {
cc := controller.Cluster(clusterPool.Clusters[j].ID)
Expand Down