Skip to content

Commit

Permalink
Testcase: wait_till on container_cluster
Browse files Browse the repository at this point in the history
  • Loading branch information
@kavya498 @hkantare
kavya498 authored and hkantare committed Feb 15, 2021
1 parent bfbe6d3 commit a983b2b
Showing 1 changed file with 101 additions and 139 deletions.
240 changes: 101 additions & 139 deletions ibm/resource_ibm_container_cluster_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,15 @@ package ibm

import (
"fmt"
"log"
"regexp"
"strings"
"testing"

bluemix "github.com/IBM-Cloud/bluemix-go"
"github.com/IBM-Cloud/bluemix-go/session"
"github.com/hashicorp/terraform-plugin-sdk/helper/acctest"
"github.com/hashicorp/terraform-plugin-sdk/helper/resource"

"github.com/IBM-Cloud/bluemix-go/api/account/accountv2"
v1 "github.com/IBM-Cloud/bluemix-go/api/container/containerv1"
"github.com/IBM-Cloud/bluemix-go/api/mccp/mccpv2"
"github.com/hashicorp/terraform-plugin-sdk/terraform"

"github.com/IBM-Cloud/bluemix-go/api/container/containerv1"
)

func TestAccIBMContainerCluster_basic(t *testing.T) {
Expand Down Expand Up @@ -75,6 +70,33 @@ func TestAccIBMContainerCluster_basic(t *testing.T) {
})
}

func TestAccIBMContainerClusterWaitTill(t *testing.T) {
clusterName := fmt.Sprintf("terraform_%d", acctest.RandIntRange(10, 100))
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckIBMContainerClusterDestroy,
Steps: []resource.TestStep{
{
Config: testAccCheckIBMContainerClusterWaitTill(clusterName),
Check: resource.ComposeTestCheckFunc(
resource.TestCheckResourceAttr(
"ibm_container_cluster.testacc_cluster", "name", clusterName),
resource.TestCheckResourceAttr(
"ibm_container_cluster.testacc_cluster", "default_pool_size", "1"),
resource.TestCheckResourceAttr(
"ibm_container_cluster.testacc_cluster", "kube_version", kubeVersion),
resource.TestCheckResourceAttr(
"ibm_container_cluster.testacc_cluster", "hardware", "shared"),
resource.TestCheckResourceAttr(
"ibm_container_cluster.testacc_cluster", "worker_pools.#", "1"),
resource.TestCheckResourceAttrSet(
"ibm_container_cluster.testacc_cluster", "resource_group_id"),
),
},
},
})
}
func TestAccIBMContainerCluster_trusted(t *testing.T) {
clusterName := fmt.Sprintf("terraform_%d", acctest.RandIntRange(10, 100))
resource.Test(t, resource.TestCase{
Expand Down Expand Up @@ -336,8 +358,8 @@ func testAccCheckIBMContainerClusterDestroy(s *terraform.State) error {
if rs.Type != "ibm_container_cluster" {
continue
}

targetEnv := getClusterTargetHeaderTestACC()
targetEnv := containerv1.ClusterTargetHeader{}
// targetEnv := getClusterTargetHeaderTestACC()
// Try to find the key
_, err := csClient.Clusters().Find(rs.Primary.ID, targetEnv)

Expand All @@ -351,53 +373,53 @@ func testAccCheckIBMContainerClusterDestroy(s *terraform.State) error {
return nil
}

func getClusterTargetHeaderTestACC() v1.ClusterTargetHeader {
org := cfOrganization
space := cfSpace
c := new(bluemix.Config)
sess, err := session.New(c)
if err != nil {
log.Fatal(err)
}
// func getClusterTargetHeaderTestACC() v1.ClusterTargetHeader {
// org := cfOrganization
// space := cfSpace
// c := new(bluemix.Config)
// sess, err := session.New(c)
// if err != nil {
// log.Fatal(err)
// }

client, err := mccpv2.New(sess)
// client, err := mccpv2.New(sess)

if err != nil {
log.Fatal(err)
}
// if err != nil {
// log.Fatal(err)
// }

orgAPI := client.Organizations()
myorg, err := orgAPI.FindByName(org, BluemixRegion)
// orgAPI := client.Organizations()
// myorg, err := orgAPI.FindByName(org, BluemixRegion)

if err != nil {
log.Fatal(err)
}
// if err != nil {
// log.Fatal(err)
// }

spaceAPI := client.Spaces()
myspace, err := spaceAPI.FindByNameInOrg(myorg.GUID, space, BluemixRegion)
// spaceAPI := client.Spaces()
// myspace, err := spaceAPI.FindByNameInOrg(myorg.GUID, space, BluemixRegion)

if err != nil {
log.Fatal(err)
}
// if err != nil {
// log.Fatal(err)
// }

accClient, err := accountv2.New(sess)
if err != nil {
log.Fatal(err)
}
accountAPI := accClient.Accounts()
myAccount, err := accountAPI.FindByOrg(myorg.GUID, c.Region)
if err != nil {
log.Fatal(err)
}
// accClient, err := accountv2.New(sess)
// if err != nil {
// log.Fatal(err)
// }
// accountAPI := accClient.Accounts()
// myAccount, err := accountAPI.FindByOrg(myorg.GUID, c.Region)
// if err != nil {
// log.Fatal(err)
// }

target := v1.ClusterTargetHeader{
OrgID: myorg.GUID,
SpaceID: myspace.GUID,
AccountID: myAccount.GUID,
}
// target := v1.ClusterTargetHeader{
// OrgID: myorg.GUID,
// SpaceID: myspace.GUID,
// AccountID: myAccount.GUID,
// }

return target
}
// return target
// }

func testAccCheckIBMContainerClusterBasic(clusterName string) string {
return fmt.Sprintf(`
Expand All @@ -409,8 +431,6 @@ data "ibm_resource_group" "testacc_ds_resource_group" {
resource "ibm_container_cluster" "testacc_cluster" {
name = "%s"
datacenter = "%s"
worker_num = 1
resource_group_id = data.ibm_resource_group.testacc_ds_resource_group.id
default_pool_size = 1
Expand All @@ -424,6 +444,28 @@ resource "ibm_container_cluster" "testacc_cluster" {
region = "%s"
} `, clusterName, datacenter, kubeVersion, machineType, publicVlanID, privateVlanID, csRegion)
}
func testAccCheckIBMContainerClusterWaitTill(clusterName string) string {
return fmt.Sprintf(`
data "ibm_resource_group" "testacc_ds_resource_group" {
is_default = "true"
}
resource "ibm_container_cluster" "testacc_cluster" {
name = "%s"
datacenter = "%s"
resource_group_id = data.ibm_resource_group.testacc_ds_resource_group.id
default_pool_size = 1
wait_till = "MasterNodeReady"
hardware = "shared"
kube_version = "%s"
machine_type = "%s"
public_vlan_id = "%s"
private_vlan_id = "%s"
region = "%s"
} `, clusterName, datacenter, kubeVersion, machineType, publicVlanID, privateVlanID, csRegion)
}

func testAccCheckIBMContainerClusterKmsEnable(clusterName, kmsInstanceName, rootKeyName string) string {
return fmt.Sprintf(`
Expand Down Expand Up @@ -469,26 +511,12 @@ func testAccCheckIBMContainerClusterKmsEnable(clusterName, kmsInstanceName, root
func testAccCheckIBMContainerClusterTrusted(clusterName string) string {
return fmt.Sprintf(`
data "ibm_org" "org" {
org = "%s"
}
data "ibm_space" "space" {
org = "%s"
space = "%s"
}
data "ibm_account" "acc" {
org_guid = data.ibm_org.org.id
}
resource "ibm_container_cluster" "testacc_cluster" {
name = "%s"
datacenter = "%s"
org_guid = data.ibm_org.org.id
space_guid = data.ibm_space.space.id
account_guid = data.ibm_account.acc.id
default_pool_size = 1
Expand All @@ -500,56 +528,30 @@ resource "ibm_container_cluster" "testacc_cluster" {
no_subnet = true
is_trusted = true
wait_time_minutes = 1440
} `, cfOrganization, cfOrganization, cfSpace, clusterName, datacenter, kubeVersion, trustedMachineType, publicVlanID, privateVlanID)
} `, clusterName, datacenter, kubeVersion, trustedMachineType, publicVlanID, privateVlanID)
}

func testAccCheckIBMContainerClusterNosubnetFalse(clusterName string) string {
return fmt.Sprintf(`
data "ibm_org" "org" {
org = "%s"
}
data "ibm_space" "space" {
org = "%s"
space = "%s"
}
data "ibm_account" "acc" {
org_guid = data.ibm_org.org.id
}
resource "ibm_container_cluster" "testacc_cluster" {
name = "%s"
datacenter = "%s"
org_guid = data.ibm_org.org.id
space_guid = data.ibm_space.space.id
account_guid = data.ibm_account.acc.id
machine_type = "%s"
hardware = "dedicated"
public_vlan_id = "%s"
private_vlan_id = "%s"
no_subnet = false
} `, cfOrganization, cfOrganization, cfSpace, clusterName, datacenter, machineType, publicVlanID, privateVlanID)
} `, clusterName, datacenter, machineType, publicVlanID, privateVlanID)
}

func testAccCheckIBMContainerClusterWithWorkerNumZero(clusterName string) string {
return fmt.Sprintf(`
data "ibm_org" "org" {
org = "%s"
}
data "ibm_space" "space" {
org = "%s"
space = "%s"
}
data "ibm_account" "acc" {
org_guid = data.ibm_org.org.id
}
resource "ibm_container_cluster" "testacc_cluster" {
name = "%s"
Expand All @@ -562,7 +564,7 @@ resource "ibm_container_cluster" "testacc_cluster" {
public_vlan_id = "%s"
private_vlan_id = "%s"
no_subnet = true
} `, cfOrganization, cfOrganization, cfSpace, clusterName, datacenter, machineType, publicVlanID, privateVlanID)
} `, clusterName, datacenter, machineType, publicVlanID, privateVlanID)
}

func testAccCheckIBMContainerClusterOptionalOrgSpaceBasic(clusterName string) string {
Expand All @@ -583,34 +585,20 @@ resource "ibm_container_cluster" "testacc_cluster" {
func testAccCheckIBMContainerClusterDiskEnc(clusterName string) string {
return fmt.Sprintf(`
data "ibm_org" "org" {
org = "%s"
}
data "ibm_space" "space" {
org = "%s"
space = "%s"
}
data "ibm_account" "acc" {
org_guid = data.ibm_org.org.id
}
resource "ibm_container_cluster" "testacc_cluster" {
name = "%s"
datacenter = "%s"
org_guid = data.ibm_org.org.id
space_guid = data.ibm_space.space.id
account_guid = data.ibm_account.acc.id
machine_type = "%s"
hardware = "shared"
public_vlan_id = "%s"
private_vlan_id = "%s"
no_subnet = true
disk_encryption = false
} `, cfOrganization, cfOrganization, cfSpace, clusterName, datacenter, machineType, publicVlanID, privateVlanID)
} `, clusterName, datacenter, machineType, publicVlanID, privateVlanID)
}

func testAccCheckIBMContainerClusterUpdate(clusterName string) string {
Expand Down Expand Up @@ -642,34 +630,20 @@ resource "ibm_container_cluster" "testacc_cluster" {
func testAccCheckIBMContainerClusterPrivateAndPublicSubnet(clusterName string) string {
return fmt.Sprintf(`
data "ibm_org" "org" {
org = "%s"
}
data "ibm_space" "space" {
org = "%s"
space = "%s"
}
data "ibm_account" "acc" {
org_guid = data.ibm_org.org.id
}
resource "ibm_container_cluster" "testacc_cluster" {
name = "%s"
datacenter = "%s"
org_guid = data.ibm_org.org.id
space_guid = data.ibm_space.space.id
account_guid = data.ibm_account.acc.id
machine_type = "%s"
hardware = "shared"
public_vlan_id = "%s"
private_vlan_id = "%s"
no_subnet = true
subnet_id = ["%s", "%s"]
} `, cfOrganization, cfOrganization, cfSpace, clusterName, datacenter, machineType, publicVlanID, privateVlanID, privateSubnetID, publicSubnetID)
} `, clusterName, datacenter, machineType, publicVlanID, privateVlanID, privateSubnetID, publicSubnetID)
}

func testAccCheckIBMContainerClusterPrivateSubnet(clusterName string) string {
Expand Down Expand Up @@ -719,18 +693,6 @@ resource "ibm_container_cluster" "testacc_cluster" {
func testAccCheckIBMContainerCluster_worker_count(clusterName string) string {
return fmt.Sprintf(`
data "ibm_org" "org" {
org = "%s"
}
data "ibm_space" "space" {
org = "%s"
space = "%s"
}
data "ibm_account" "acc" {
org_guid = data.ibm_org.org.id
}
resource "ibm_container_cluster" "testacc_cluster" {
name = "%s"
Expand All @@ -745,7 +707,7 @@ resource "ibm_container_cluster" "testacc_cluster" {
public_vlan_id = "%s"
private_vlan_id = "%s"
no_subnet = true
} `, cfOrganization, cfOrganization, cfSpace, clusterName, datacenter, machineType, publicVlanID, privateVlanID)
} `, clusterName, datacenter, machineType, publicVlanID, privateVlanID)
}

func testAccCheckIBMContainerClusterWorkerCountUpdate(clusterName string) string {
Expand Down

0 comments on commit a983b2b

Please sign in to comment.