ResiLien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13453 from tombuildsstuff/f-oracle-imports 

provider/opc: Import support for IP Networks
This commit is contained in:
Tom Harvey 2017-04-07 15:06:02 +01:00 committed by GitHub
parent 9eb8ca06f9 18dc5559ba
commit 4f66290ffc
3 changed files with 63 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
builtin/providers/opc/import_ip_network_test.go Normal file
View File

@ -0,0 +1,33 @@
package opc
import (
"testing"
"github.com/hashicorp/terraform/helper/acctest"
"github.com/hashicorp/terraform/helper/resource"
)
func TestAccOPCIPNetwork_importBasic(t *testing.T) {
resourceName := "opc_compute_ip_network.test"
rInt := acctest.RandInt()
config := testAccOPCIPNetworkConfig_Basic(rInt)
resource.Test(t, resource.TestCase{
PreCheck: func() {
testAccPreCheck(t)
},
Providers: testAccProviders,
CheckDestroy: opcResourceCheck(resourceName, testAccOPCCheckIPNetworkDestroyed),
Steps: []resource.TestStep{
{
Config: config,
},
{
ResourceName: resourceName,
ImportState: true,
ImportStateVerify: true,
},
},
})
}

3
builtin/providers/opc/resource_ip_network.go
View File

@ -13,6 +13,9 @@ func resourceOPCIPNetwork() *schema.Resource {
Read: resourceOPCIPNetworkRead, Read: resourceOPCIPNetworkRead,
Update: resourceOPCIPNetworkUpdate, Update: resourceOPCIPNetworkUpdate,
Delete: resourceOPCIPNetworkDelete, Delete: resourceOPCIPNetworkDelete,
Importer: &schema.ResourceImporter{
State: schema.ImportStatePassthrough,
},
Schema: map[string]*schema.Schema{ Schema: map[string]*schema.Schema{
"name": { "name": {

30
builtin/providers/opc/resource_ip_network_test.go
View File

@ -12,7 +12,31 @@ import (
func TestAccOPCIPNetwork_Basic(t *testing.T) { func TestAccOPCIPNetwork_Basic(t *testing.T) {
rInt := acctest.RandInt() rInt := acctest.RandInt()
resName := "opc_compute_ip_network.foo" resName := "opc_compute_ip_network.test"
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: opcResourceCheck(resName, testAccOPCCheckIPNetworkDestroyed),
Steps: []resource.TestStep{
{
Config: testAccOPCIPNetworkConfig_Basic(rInt),
Check: resource.ComposeTestCheckFunc(
opcResourceCheck(resName, testAccOPCCheckIPNetworkExists),
resource.TestCheckResourceAttr(resName, "ip_address_prefix", "10.0.12.0/24"),
resource.TestCheckResourceAttr(resName, "public_napt_enabled", "false"),
resource.TestCheckResourceAttr(resName, "description", fmt.Sprintf("testing-desc-%d", rInt)),
resource.TestCheckResourceAttr(resName, "name", fmt.Sprintf("testing-ip-network-%d", rInt)),
resource.TestMatchResourceAttr(resName, "uri", regexp.MustCompile("testing-ip-network")),
),
},
},
})
}
func TestAccOPCIPNetwork_Update(t *testing.T) {
rInt := acctest.RandInt()
resName := "opc_compute_ip_network.test"
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },
@ -46,7 +70,7 @@ func TestAccOPCIPNetwork_Basic(t *testing.T) {
func testAccOPCIPNetworkConfig_Basic(rInt int) string { func testAccOPCIPNetworkConfig_Basic(rInt int) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "opc_compute_ip_network" "foo" { resource "opc_compute_ip_network" "test" {
name = "testing-ip-network-%d" name = "testing-ip-network-%d"
description = "testing-desc-%d" description = "testing-desc-%d"
ip_address_prefix = "10.0.12.0/24" ip_address_prefix = "10.0.12.0/24"
@ -55,7 +79,7 @@ resource "opc_compute_ip_network" "foo" {
func testAccOPCIPNetworkConfig_BasicUpdate(rInt int) string { func testAccOPCIPNetworkConfig_BasicUpdate(rInt int) string {
return fmt.Sprintf(` return fmt.Sprintf(`
resource "opc_compute_ip_network" "foo" { resource "opc_compute_ip_network" "test" {
name = "testing-ip-network-%d" name = "testing-ip-network-%d"
description = "testing-desc-%d" description = "testing-desc-%d"
ip_address_prefix = "10.0.12.0/24" ip_address_prefix = "10.0.12.0/24"