Support added for oci_core_public_ip_pool resource and byoip data sources

Author: rashik-bhasin

CHANGELOG.md

@@ -2,6 +2,7 @@
 - Support for query parameters added to `object_storage` `object` resource
 - Support for custom certificates added to `apigateway` `certificate` resource
 - Support added for update Instance Console Connections
+- Support added for `oci_core_public_ip_pool` resource and `byoip` data source
 
 ## 3.94.0 (September 23, 2020)
 

examples/networking/public_ip_pool/main.tf

@@ -0,0 +1,61 @@
+// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+provider "oci" {
+  tenancy_ocid     = "${var.tenancy_ocid}"
+  user_ocid        = "${var.user_ocid}"
+  fingerprint      = "${var.fingerprint}"
+  private_key_path = "${var.private_key_path}"
+  region           = "${var.region}"
+}
+
+variable "tenancy_ocid" {}
+variable "user_ocid" {}
+variable "fingerprint" {}
+variable "private_key_path" {}
+variable "compartment_ocid" {}
+variable "region" {}
+variable "ssh_public_key" {}
+
+variable "byoip_range_id" {}
+
+variable "public_ip_pool_cidr_block" {}
+
+resource "oci_core_public_ip" "test_public_ip" {
+  compartment_id    = "${var.compartment_ocid}"
+  lifetime          = "RESERVED"
+  public_ip_pool_id = "${oci_core_public_ip_pool_capacity.test_public_ip_pool_capacity.public_ip_pool_id}"
+}
+
+resource "oci_core_public_ip_pool_capacity" "test_public_ip_pool_capacity" {
+  public_ip_pool_id = "${oci_core_public_ip_pool.test_public_ip_pool.id}"
+  cidr_block        = "${var.public_ip_pool_cidr_block}"
+  byoip_id          = "${var.byoip_range_id}"
+}
+
+resource "oci_core_public_ip_pool" "test_public_ip_pool" {
+  compartment_id = "${var.compartment_ocid}"
+}
+
+resource "oci_core_vcn" "test_vcn" {
+  cidr_block     = "10.0.0.0/16"
+  compartment_id = "${var.compartment_ocid}"
+}
+
+resource "oci_core_nat_gateway" "test_nat_gateway" {
+  block_traffic  = "false"
+  compartment_id = "${var.compartment_ocid}"
+  display_name   = "displayName"
+  public_ip_id   = "${oci_core_public_ip.test_public_ip.id}"
+  vcn_id         = "${oci_core_vcn.test_vcn.id}"
+}
+
+data "oci_core_public_ip_pool" "public_ip_pool" {
+  public_ip_pool_id = "${oci_core_public_ip_pool_capacity.test_public_ip_pool_capacity.public_ip_pool_id}"
+}
+
+output "public_ip_pool" {
+  value = [
+    "${data.oci_core_public_ip_pool.public_ip_pool}",
+  ]
+}

oci/core_byoip_allocated_range_test.go

@@ -0,0 +1,68 @@
+// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package oci
+
+import (
+	"fmt"
+	"log"
+	"testing"
+	"time"
+
+	"github.com/hashicorp/terraform/helper/resource"
+	"github.com/hashicorp/terraform/terraform"
+
+	"github.com/terraform-providers/terraform-provider-oci/httpreplay"
+)
+
+var (
+	byoipAllocatedRangeDataSourceRepresentation = map[string]interface{}{
+		"byoip_range_id": Representation{repType: Required, create: `${var.byoip_range_id}`},
+	}
+
+	ByoipAllocatedRangeResourceConfig = PublicIpPoolAddCapacityResourceDependencies +
+		generateResourceFromRepresentationMap("oci_core_public_ip_pool_capacity", "test_public_ip_pool_capacity", Required, Create, publicIpPoolCapacityRepresentation)
+)
+
+func TestCoreByoipAllocatedRangeResource_basic(t *testing.T) {
+	httpreplay.SetScenario("TestCoreByoipAllocatedRangeResource_basic")
+	defer httpreplay.SaveScenario()
+
+	provider := testAccProvider
+	config := testProviderConfig()
+
+	compartmentId := getEnvSettingWithBlankDefault("compartment_ocid")
+	compartmentIdVariableStr := fmt.Sprintf("variable \"compartment_id\" { default = \"%s\" }\n", compartmentId)
+
+	datasourceName := "data.oci_core_byoip_allocated_ranges.test_byoip_allocated_ranges"
+
+	resource.Test(t, resource.TestCase{
+		PreCheck: func() { testAccPreCheck(t) },
+		Providers: map[string]terraform.ResourceProvider{
+			"oci": provider,
+		},
+		Steps: []resource.TestStep{
+			// create dependencies
+			{
+				Config: config + compartmentIdVariableStr + ByoipAllocatedRangeResourceConfig,
+				Check: func(s *terraform.State) (err error) {
+					log.Printf("[DEBUG] Wait for oci_core_public_ip_pool and oci_core_public_ip_pool_capacity resource to get created first")
+					time.Sleep(2 * time.Minute)
+					return nil
+				},
+			},
+			// verify datasource
+			{
+				Config: config +
+					generateDataSourceFromRepresentationMap("oci_core_byoip_allocated_ranges", "test_byoip_allocated_ranges", Required, Create, byoipAllocatedRangeDataSourceRepresentation) +
+					compartmentIdVariableStr + ByoipAllocatedRangeResourceConfig,
+				Check: resource.ComposeAggregateTestCheckFunc(
+					resource.TestCheckResourceAttrSet(datasourceName, "byoip_range_id"),
+
+					resource.TestCheckResourceAttrSet(datasourceName, "byoip_allocated_range_collection.#"),
+					resource.TestCheckResourceAttr(datasourceName, "byoip_allocated_range_collection.0.items.#", "1"),
+				),
+			},
+		},
+	})
+}

oci/core_byoip_allocated_ranges_data_source.go

@@ -0,0 +1,153 @@
+// Copyright (c) 2017, 2020, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package oci
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform/helper/schema"
+	oci_core "github.com/oracle/oci-go-sdk/v25/core"
+)
+
+func init() {
+	RegisterDatasource("oci_core_byoip_allocated_ranges", CoreByoipAllocatedRangesDataSource())
+}
+
+func CoreByoipAllocatedRangesDataSource() *schema.Resource {
+	return &schema.Resource{
+		Read: readCoreByoipAllocatedRanges,
+		Schema: map[string]*schema.Schema{
+			"filter": dataSourceFiltersSchema(),
+			"byoip_range_id": {
+				Type:     schema.TypeString,
+				Required: true,
+			},
+			"byoip_allocated_range_collection": {
+				Type:     schema.TypeList,
+				Computed: true,
+				Elem: &schema.Resource{
+					Schema: map[string]*schema.Schema{
+						// Required
+
+						// Optional
+
+						// Computed
+						"items": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									// Required
+
+									// Optional
+
+									// Computed
+									"cidr_block": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+									"public_ip_pool_id": {
+										Type:     schema.TypeString,
+										Computed: true,
+									},
+								},
+							},
+						},
+					},
+				},
+			},
+		},
+	}
+}
+
+func readCoreByoipAllocatedRanges(d *schema.ResourceData, m interface{}) error {
+	sync := &CoreByoipAllocatedRangesDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*OracleClients).virtualNetworkClient()
+
+	return ReadResource(sync)
+}
+
+type CoreByoipAllocatedRangesDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_core.VirtualNetworkClient
+	Res    *oci_core.ListByoipAllocatedRangesResponse
+}
+
+func (s *CoreByoipAllocatedRangesDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *CoreByoipAllocatedRangesDataSourceCrud) Get() error {
+	request := oci_core.ListByoipAllocatedRangesRequest{}
+
+	if byoipRangeId, ok := s.D.GetOkExists("byoip_range_id"); ok {
+		tmp := byoipRangeId.(string)
+		request.ByoipRangeId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = getRetryPolicy(false, "core")
+
+	response, err := s.Client.ListByoipAllocatedRanges(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	request.Page = s.Res.OpcNextPage
+
+	for request.Page != nil {
+		listResponse, err := s.Client.ListByoipAllocatedRanges(context.Background(), request)
+		if err != nil {
+			return err
+		}
+
+		s.Res.Items = append(s.Res.Items, listResponse.Items...)
+		request.Page = listResponse.OpcNextPage
+	}
+
+	return nil
+}
+
+func (s *CoreByoipAllocatedRangesDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(GenerateDataSourceID())
+	resources := []map[string]interface{}{}
+	byoipAllocatedRange := map[string]interface{}{}
+
+	items := []interface{}{}
+	for _, item := range s.Res.Items {
+		items = append(items, ByoipAllocatedRangeSummaryToMap(item))
+	}
+	byoipAllocatedRange["items"] = items
+
+	if f, fOk := s.D.GetOkExists("filter"); fOk {
+		items = ApplyFiltersInCollection(f.(*schema.Set), items, CoreByoipAllocatedRangesDataSource().Schema["byoip_allocated_range_collection"].Elem.(*schema.Resource).Schema)
+		byoipAllocatedRange["items"] = items
+	}
+
+	resources = append(resources, byoipAllocatedRange)
+	if err := s.D.Set("byoip_allocated_range_collection", resources); err != nil {
+		return err
+	}
+
+	return nil
+}
+
+func ByoipAllocatedRangeSummaryToMap(obj oci_core.ByoipAllocatedRangeSummary) map[string]interface{} {
+	result := map[string]interface{}{}
+
+	if obj.CidrBlock != nil {
+		result["cidr_block"] = string(*obj.CidrBlock)
+	}
+
+	if obj.PublicIpPoolId != nil {
+		result["public_ip_pool_id"] = string(*obj.PublicIpPoolId)
+	}
+
+	return result
+}