Added - Support for VTAP feature in vcn service

Author: Shruti Shetye

examples/networking/capture_filter/capture_filter.tf

@@ -0,0 +1,38 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {
+}
+
+variable "user_ocid" {
+}
+
+variable "fingerprint" {
+}
+
+variable "private_key_path" {
+}
+
+variable "compartment_ocid" {
+}
+
+variable "region" {
+}
+
+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
+}
+
+resource "oci_core_capture_filter" "example_capture_filter" {
+  compartment_id = var.compartment_ocid
+  display_name   = "exampleCaptureFilter"
+  filter_type    = "VTAP"
+  vtap_capture_filter_rules {
+    traffic_direction = "INGRESS"
+  }
+}
+

examples/networking/vtap/vtap.tf

@@ -0,0 +1,87 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+variable "tenancy_ocid" {
+}
+
+variable "user_ocid" {
+}
+
+variable "fingerprint" {
+}
+
+variable "private_key_path" {
+}
+
+variable "compartment_ocid" {
+}
+
+variable "region" {
+}
+
+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
+}
+
+resource "oci_core_vcn" "example_vcn" {
+  cidr_block     = "10.1.0.0/16"
+  compartment_id = var.compartment_ocid
+  display_name   = "exampleVCN"
+  dns_label      = "tfexamplevcn"
+}
+
+resource "oci_core_capture_filter" "example_capture_filter" {
+  compartment_id = var.compartment_ocid
+  display_name   = "exampleCaptureFilter"
+  filter_type    = "VTAP"
+  vtap_capture_filter_rules {
+    traffic_direction = "INGRESS"
+  }
+}
+
+// A regional subnet will not specify an Availability Domain
+resource "oci_core_subnet" "regional_subnet" {
+  cidr_block        = "10.1.1.0/24"
+  display_name      = "regionalSubnet"
+  dns_label         = "regionalsubnet"
+  compartment_id    = var.compartment_ocid
+  vcn_id            = oci_core_vcn.example_vcn.id
+  security_list_ids = [oci_core_vcn.example_vcn.default_security_list_id]
+  route_table_id    = oci_core_vcn.example_vcn.default_route_table_id
+  dhcp_options_id   = oci_core_vcn.example_vcn.default_dhcp_options_id
+}
+
+resource "oci_core_network_security_group" "test_network_security_group" {
+  #Required
+  compartment_id = var.compartment_ocid
+  vcn_id         = oci_core_vcn.example_vcn.id
+}
+
+resource "oci_load_balancer" "lb1" {
+  shape          = "100Mbps"
+  compartment_id = var.compartment_ocid
+
+  subnet_ids = [
+    oci_core_subnet.regional_subnet.id,
+  ]
+
+  display_name               = "lb1"
+  is_private                 = true
+  network_security_group_ids = [oci_core_network_security_group.test_network_security_group.id]
+}
+
+resource "oci_core_vtap" "example_vtap" {
+  compartment_id    = var.compartment_ocid
+  vcn_id            = oci_core_vcn.example_vcn.id
+  display_name      = "exampleVtap"
+  capture_filter_id = oci_core_capture_filter.example_capture_filter.id
+  source_id         = oci_load_balancer.lb1.id
+  source_type       = "LOAD_BALANCER"
+  target_ip         = "1.1.1.1"
+  is_vtap_enabled   = true
+}
+

internal/integrationtest/core_capture_filter_test.go

@@ -248,6 +248,8 @@ func init() {
 	RegisterDatasource("oci_core_byoip_allocated_ranges", tf_core.CoreByoipAllocatedRangesDataSource())
 	RegisterDatasource("oci_core_byoip_range", tf_core.CoreByoipRangeDataSource())
 	RegisterDatasource("oci_core_byoip_ranges", tf_core.CoreByoipRangesDataSource())
+	RegisterDatasource("oci_core_capture_filter", tf_core.CoreCaptureFilterDataSource())
+	RegisterDatasource("oci_core_capture_filters", tf_core.CoreCaptureFiltersDataSource())
 	RegisterDatasource("oci_core_cluster_network", tf_core.CoreClusterNetworkDataSource())
 	RegisterDatasource("oci_core_cluster_network_instances", tf_core.CoreClusterNetworkInstancesDataSource())
 	RegisterDatasource("oci_core_cluster_networks", tf_core.CoreClusterNetworksDataSource())
@@ -362,6 +364,8 @@ func init() {
 	RegisterDatasource("oci_core_volume_group_replicas", tf_core.CoreVolumeGroupReplicasDataSource())
 	RegisterDatasource("oci_core_volume_groups", tf_core.CoreVolumeGroupsDataSource())
 	RegisterDatasource("oci_core_volumes", tf_core.CoreVolumesDataSource())
+	RegisterDatasource("oci_core_vtap", tf_core.CoreVtapDataSource())
+	RegisterDatasource("oci_core_vtaps", tf_core.CoreVtapsDataSource())
 	// data_connectivity service
 	RegisterDatasource("oci_data_connectivity_registries", tf_data_connectivity.DataConnectivityRegistriesDataSource())
 	RegisterDatasource("oci_data_connectivity_registry", tf_data_connectivity.DataConnectivityRegistryDataSource())

internal/integrationtest/core_vtap_test.go

@@ -184,6 +184,7 @@ func init() {
 	RegisterResource("oci_core_app_catalog_subscription", tf_core.CoreAppCatalogSubscriptionResource())
 	RegisterResource("oci_core_boot_volume", tf_core.CoreBootVolumeResource())
 	RegisterResource("oci_core_boot_volume_backup", tf_core.CoreBootVolumeBackupResource())
+	RegisterResource("oci_core_capture_filter", tf_core.CoreCaptureFilterResource())
 	RegisterResource("oci_core_cluster_network", tf_core.CoreClusterNetworkResource())
 	RegisterResource("oci_core_compute_capacity_reservation", tf_core.CoreComputeCapacityReservationResource())
 	RegisterResource("oci_core_compute_image_capability_schema", tf_core.CoreComputeImageCapabilitySchemaResource())
@@ -241,6 +242,7 @@ func init() {
 	RegisterResource("oci_core_volume_backup_policy_assignment", tf_core.CoreVolumeBackupPolicyAssignmentResource())
 	RegisterResource("oci_core_volume_group", tf_core.CoreVolumeGroupResource())
 	RegisterResource("oci_core_volume_group_backup", tf_core.CoreVolumeGroupBackupResource())
+	RegisterResource("oci_core_vtap", tf_core.CoreVtapResource())
 	// data_connectivity service
 	RegisterResource("oci_data_connectivity_registry", tf_data_connectivity.DataConnectivityRegistryResource())
 	RegisterResource("oci_data_connectivity_registry_connection", tf_data_connectivity.DataConnectivityRegistryConnectionResource())

internal/provider/register_datasource.go

@@ -1013,6 +1013,26 @@ var exportCoreDrgRouteTableRouteRuleHints = &TerraformResourceHints{
 	resourceAbbreviation: "drg_route_table_route_rule",
 }
 
+var exportCoreCaptureFilterHints = &TerraformResourceHints{
+	resourceClass:        "oci_core_capture_filter",
+	datasourceClass:      "oci_core_capture_filters",
+	datasourceItemsAttr:  "capture_filters",
+	resourceAbbreviation: "capture_filter",
+	discoverableLifecycleStates: []string{
+		string(oci_core.CaptureFilterLifecycleStateAvailable),
+	},
+}
+
+var exportCoreVtapHints = &TerraformResourceHints{
+	resourceClass:        "oci_core_vtap",
+	datasourceClass:      "oci_core_vtaps",
+	datasourceItemsAttr:  "vtaps",
+	resourceAbbreviation: "vtap",
+	discoverableLifecycleStates: []string{
+		string(oci_core.VtapLifecycleStateAvailable),
+	},
+}
+
 var exportDataConnectivityRegistryHints = &TerraformResourceHints{
 	resourceClass:          "oci_data_connectivity_registry",
 	datasourceClass:        "oci_data_connectivity_registries",

internal/provider/register_resource.go

@@ -335,6 +335,8 @@ var coreResourceGraph = TerraformResourceGraph{
 		{TerraformResourceHints: exportCoreVolumeGroupBackupHints},
 		{TerraformResourceHints: exportCoreVolumeHints},
 		{TerraformResourceHints: exportCorePublicIpPoolHints},
+		{TerraformResourceHints: exportCoreCaptureFilterHints},
+		{TerraformResourceHints: exportCoreVtapHints},
 	},
 	"oci_core_boot_volume": {
 		{

internal/resourcediscovery/export_definitions.go

@@ -0,0 +1,98 @@
+// Copyright (c) 2017, 2021, Oracle and/or its affiliates. All rights reserved.
+// Licensed under the Mozilla Public License v2.0
+
+package core
+
+import (
+	"context"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema"
+	oci_core "github.com/oracle/oci-go-sdk/v65/core"
+
+	"github.com/terraform-providers/terraform-provider-oci/internal/client"
+	"github.com/terraform-providers/terraform-provider-oci/internal/tfresource"
+)
+
+func CoreCaptureFilterDataSource() *schema.Resource {
+	fieldMap := make(map[string]*schema.Schema)
+	fieldMap["capture_filter_id"] = &schema.Schema{
+		Type:     schema.TypeString,
+		Required: true,
+	}
+	return tfresource.GetSingularDataSourceItemSchema(CoreCaptureFilterResource(), fieldMap, readSingularCoreCaptureFilter)
+}
+
+func readSingularCoreCaptureFilter(d *schema.ResourceData, m interface{}) error {
+	sync := &CoreCaptureFilterDataSourceCrud{}
+	sync.D = d
+	sync.Client = m.(*client.OracleClients).VirtualNetworkClient()
+
+	return tfresource.ReadResource(sync)
+}
+
+type CoreCaptureFilterDataSourceCrud struct {
+	D      *schema.ResourceData
+	Client *oci_core.VirtualNetworkClient
+	Res    *oci_core.GetCaptureFilterResponse
+}
+
+func (s *CoreCaptureFilterDataSourceCrud) VoidState() {
+	s.D.SetId("")
+}
+
+func (s *CoreCaptureFilterDataSourceCrud) Get() error {
+	request := oci_core.GetCaptureFilterRequest{}
+
+	if captureFilterId, ok := s.D.GetOkExists("capture_filter_id"); ok {
+		tmp := captureFilterId.(string)
+		request.CaptureFilterId = &tmp
+	}
+
+	request.RequestMetadata.RetryPolicy = tfresource.GetRetryPolicy(false, "core")
+
+	response, err := s.Client.GetCaptureFilter(context.Background(), request)
+	if err != nil {
+		return err
+	}
+
+	s.Res = &response
+	return nil
+}
+
+func (s *CoreCaptureFilterDataSourceCrud) SetData() error {
+	if s.Res == nil {
+		return nil
+	}
+
+	s.D.SetId(*s.Res.Id)
+
+	if s.Res.CompartmentId != nil {
+		s.D.Set("compartment_id", *s.Res.CompartmentId)
+	}
+
+	if s.Res.DefinedTags != nil {
+		s.D.Set("defined_tags", tfresource.DefinedTagsToMap(s.Res.DefinedTags))
+	}
+
+	if s.Res.DisplayName != nil {
+		s.D.Set("display_name", *s.Res.DisplayName)
+	}
+
+	s.D.Set("filter_type", s.Res.FilterType)
+
+	s.D.Set("freeform_tags", s.Res.FreeformTags)
+
+	s.D.Set("state", s.Res.LifecycleState)
+
+	if s.Res.TimeCreated != nil {
+		s.D.Set("time_created", s.Res.TimeCreated.String())
+	}
+
+	vtapCaptureFilterRules := []interface{}{}
+	for _, item := range s.Res.VtapCaptureFilterRules {
+		vtapCaptureFilterRules = append(vtapCaptureFilterRules, VtapCaptureFilterRuleDetailsToMap(item))
+	}
+	s.D.Set("vtap_capture_filter_rules", vtapCaptureFilterRules)
+
+	return nil
+}