Skip to content

Commit

Permalink
Merge branch 'master' into nlb-udp
Browse files Browse the repository at this point in the history
  • Loading branch information
@ujjwal-ibm
ujjwal-ibm committed Apr 14, 2022
2 parents d3454d9 + 48459df commit 9ad2a25
Show file tree
Hide file tree
Showing 87 changed files with 5,128 additions and 394 deletions.
35 changes: 35 additions & 0 deletions examples/ibm-is-ng/main.tf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -692,6 +692,41 @@ data "ibm_is_instance_disks" "disk1" {
instance = ibm_is_instance.instance1.id
}

// reserved ips

resource "ibm_is_instance" "instance7" {
name = "instance5"
profile = var.profile
boot_volume {
name = "boot-restore"
snapshot = ibm_is_snapshot.b_snapshot.id
}
auto_delete_volume = true
primary_network_interface {
primary_ip {
address = "10.0.0.5"
auto_delete = true
}
name = "test-reserved-ip"
subnet = ibm_is_subnet.subnet2.id
}
vpc = ibm_is_vpc.vpc2.id
zone = "us-south-2"
keys = [ibm_is_ssh_key.sshkey.id]
}


data "ibm_is_instance_network_interface_reserved_ip" "data_reserved_ip" {
instance = ibm_is_instance.test_instance.id
network_interface = ibm_is_instance.test_instance.network_interfaces.0.id
reserved_ip = ibm_is_instance.test_instance.network_interfaces.0.ips.0.id
}

data "ibm_is_instance_network_interface_reserved_ips" "data_reserved_ips" {
instance = ibm_is_instance.test_instance.id
network_interface = ibm_is_instance.test_instance.network_interfaces.0.id
}

data "ibm_is_instance_disk" "disk1" {
instance = ibm_is_instance.instance1.id
disk = data.ibm_is_instance_disks.disk1.disks.0.id
Expand Down
153 changes: 79 additions & 74 deletions ibm/provider/provider.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -389,80 +389,85 @@ func Provider() *schema.Provider {
"ibm_is_instance_network_interfaces": vpc.DataSourceIBMIsInstanceNetworkInterfaces(),
"ibm_is_instance_disk": vpc.DataSourceIbmIsInstanceDisk(),
"ibm_is_instance_disks": vpc.DataSourceIbmIsInstanceDisks(),
"ibm_is_instance_volume_attachment": vpc.DataSourceIBMISInstanceVolumeAttachment(),
"ibm_is_instance_volume_attachments": vpc.DataSourceIBMISInstanceVolumeAttachments(),
"ibm_is_ipsec_policy": vpc.DataSourceIBMIsIpsecPolicy(),
"ibm_is_ipsec_policies": vpc.DataSourceIBMIsIpsecPolicies(),
"ibm_is_ike_policies": vpc.DataSourceIBMIsIkePolicies(),
"ibm_is_ike_policy": vpc.DataSourceIBMIsIkePolicy(),
"ibm_is_lb": vpc.DataSourceIBMISLB(),
"ibm_is_lb_listener": vpc.DataSourceIBMISLBListener(),
"ibm_is_lb_listeners": vpc.DataSourceIBMISLBListeners(),
"ibm_is_lb_listener_policies": vpc.DataSourceIBMISLBListenerPolicies(),
"ibm_is_lb_listener_policy": vpc.DataSourceIBMISLBListenerPolicy(),
"ibm_is_lb_listener_policy_rule": vpc.DataSourceIBMISLBListenerPolicyRule(),
"ibm_is_lb_listener_policy_rules": vpc.DataSourceIBMISLBListenerPolicyRules(),
"ibm_is_lb_pool": vpc.DataSourceIBMISLBPool(),
"ibm_is_lb_pools": vpc.DataSourceIBMISLBPools(),
"ibm_is_lb_pool_member": vpc.DataSourceIBMIBLBPoolMember(),
"ibm_is_lb_pool_members": vpc.DataSourceIBMISLBPoolMembers(),
"ibm_is_lb_profiles": vpc.DataSourceIBMISLbProfiles(),
"ibm_is_lbs": vpc.DataSourceIBMISLBS(),
"ibm_is_public_gateway": vpc.DataSourceIBMISPublicGateway(),
"ibm_is_public_gateways": vpc.DataSourceIBMISPublicGateways(),
"ibm_is_region": vpc.DataSourceIBMISRegion(),
"ibm_is_regions": vpc.DataSourceIBMISRegions(),
"ibm_is_ssh_key": vpc.DataSourceIBMISSSHKey(),
"ibm_is_subnet": vpc.DataSourceIBMISSubnet(),
"ibm_is_subnets": vpc.DataSourceIBMISSubnets(),
"ibm_is_subnet_reserved_ip": vpc.DataSourceIBMISReservedIP(),
"ibm_is_subnet_reserved_ips": vpc.DataSourceIBMISReservedIPs(),
"ibm_is_security_group": vpc.DataSourceIBMISSecurityGroup(),
"ibm_is_security_groups": vpc.DataSourceIBMIsSecurityGroups(),
"ibm_is_security_group_rule": vpc.DataSourceIBMIsSecurityGroupRule(),
"ibm_is_security_group_rules": vpc.DataSourceIBMIsSecurityGroupRules(),
"ibm_is_security_group_target": vpc.DataSourceIBMISSecurityGroupTarget(),
"ibm_is_security_group_targets": vpc.DataSourceIBMISSecurityGroupTargets(),
"ibm_is_snapshot": vpc.DataSourceSnapshot(),
"ibm_is_snapshots": vpc.DataSourceSnapshots(),
"ibm_is_volume": vpc.DataSourceIBMISVolume(),
"ibm_is_volume_profile": vpc.DataSourceIBMISVolumeProfile(),
"ibm_is_volume_profiles": vpc.DataSourceIBMISVolumeProfiles(),
"ibm_is_vpc": vpc.DataSourceIBMISVPC(),
"ibm_is_vpcs": vpc.DataSourceIBMISVPCs(),
"ibm_is_vpn_gateway": vpc.DataSourceIBMISVPNGateway(),
"ibm_is_vpn_gateways": vpc.DataSourceIBMISVPNGateways(),
"ibm_is_vpc_address_prefixes": vpc.DataSourceIbmIsVpcAddressPrefixes(),
"ibm_is_vpc_address_prefix": vpc.DataSourceIBMIsVPCAddressPrefix(),
"ibm_is_vpn_gateway_connection": vpc.DataSourceIBMISVPNGatewayConnection(),
"ibm_is_vpn_gateway_connections": vpc.DataSourceIBMISVPNGatewayConnections(),
"ibm_is_vpc_default_routing_table": vpc.DataSourceIBMISVPCDefaultRoutingTable(),
"ibm_is_vpc_routing_table": vpc.DataSourceIBMIBMIsVPCRoutingTable(),
"ibm_is_vpc_routing_tables": vpc.DataSourceIBMISVPCRoutingTables(),
"ibm_is_vpc_routing_table_route": vpc.DataSourceIBMIBMIsVPCRoutingTableRoute(),
"ibm_is_vpc_routing_table_routes": vpc.DataSourceIBMISVPCRoutingTableRoutes(),
"ibm_is_zone": vpc.DataSourceIBMISZone(),
"ibm_is_zones": vpc.DataSourceIBMISZones(),
"ibm_is_operating_system": vpc.DataSourceIBMISOperatingSystem(),
"ibm_is_operating_systems": vpc.DataSourceIBMISOperatingSystems(),
"ibm_is_network_acls": vpc.DataSourceIBMIsNetworkAcls(),
"ibm_is_network_acl": vpc.DataSourceIBMIsNetworkACL(),
"ibm_is_network_acl_rule": vpc.DataSourceIBMISNetworkACLRule(),
"ibm_is_network_acl_rules": vpc.DataSourceIBMISNetworkACLRules(),
"ibm_lbaas": classicinfrastructure.DataSourceIBMLbaas(),
"ibm_network_vlan": classicinfrastructure.DataSourceIBMNetworkVlan(),
"ibm_org": cloudfoundry.DataSourceIBMOrg(),
"ibm_org_quota": cloudfoundry.DataSourceIBMOrgQuota(),
"ibm_kp_key": kms.DataSourceIBMkey(),
"ibm_kms_key_rings": kms.DataSourceIBMKMSkeyRings(),
"ibm_kms_key_policies": kms.DataSourceIBMKMSkeyPolicies(),
"ibm_kms_keys": kms.DataSourceIBMKMSkeys(),
"ibm_kms_key": kms.DataSourceIBMKMSkey(),
"ibm_pn_application_chrome": pushnotification.DataSourceIBMPNApplicationChrome(),
"ibm_app_config_environment": appconfiguration.DataSourceIBMAppConfigEnvironment(),
"ibm_app_config_environments": appconfiguration.DataSourceIBMAppConfigEnvironments(),
"ibm_app_config_feature": appconfiguration.DataSourceIBMAppConfigFeature(),
"ibm_app_config_features": appconfiguration.DataSourceIBMAppConfigFeatures(),

// reserved ips
"ibm_is_instance_network_interface_reserved_ip": vpc.DataSourceIBMISInstanceNICReservedIP(),
"ibm_is_instance_network_interface_reserved_ips": vpc.DataSourceIBMISInstanceNICReservedIPs(),

"ibm_is_instance_volume_attachment": vpc.DataSourceIBMISInstanceVolumeAttachment(),
"ibm_is_instance_volume_attachments": vpc.DataSourceIBMISInstanceVolumeAttachments(),
"ibm_is_ipsec_policy": vpc.DataSourceIBMIsIpsecPolicy(),
"ibm_is_ipsec_policies": vpc.DataSourceIBMIsIpsecPolicies(),
"ibm_is_ike_policies": vpc.DataSourceIBMIsIkePolicies(),
"ibm_is_ike_policy": vpc.DataSourceIBMIsIkePolicy(),
"ibm_is_lb": vpc.DataSourceIBMISLB(),
"ibm_is_lb_listener": vpc.DataSourceIBMISLBListener(),
"ibm_is_lb_listeners": vpc.DataSourceIBMISLBListeners(),
"ibm_is_lb_listener_policies": vpc.DataSourceIBMISLBListenerPolicies(),
"ibm_is_lb_listener_policy": vpc.DataSourceIBMISLBListenerPolicy(),
"ibm_is_lb_listener_policy_rule": vpc.DataSourceIBMISLBListenerPolicyRule(),
"ibm_is_lb_listener_policy_rules": vpc.DataSourceIBMISLBListenerPolicyRules(),
"ibm_is_lb_pool": vpc.DataSourceIBMISLBPool(),
"ibm_is_lb_pools": vpc.DataSourceIBMISLBPools(),
"ibm_is_lb_pool_member": vpc.DataSourceIBMIBLBPoolMember(),
"ibm_is_lb_pool_members": vpc.DataSourceIBMISLBPoolMembers(),
"ibm_is_lb_profiles": vpc.DataSourceIBMISLbProfiles(),
"ibm_is_lbs": vpc.DataSourceIBMISLBS(),
"ibm_is_public_gateway": vpc.DataSourceIBMISPublicGateway(),
"ibm_is_public_gateways": vpc.DataSourceIBMISPublicGateways(),
"ibm_is_region": vpc.DataSourceIBMISRegion(),
"ibm_is_regions": vpc.DataSourceIBMISRegions(),
"ibm_is_ssh_key": vpc.DataSourceIBMISSSHKey(),
"ibm_is_subnet": vpc.DataSourceIBMISSubnet(),
"ibm_is_subnets": vpc.DataSourceIBMISSubnets(),
"ibm_is_subnet_reserved_ip": vpc.DataSourceIBMISReservedIP(),
"ibm_is_subnet_reserved_ips": vpc.DataSourceIBMISReservedIPs(),
"ibm_is_security_group": vpc.DataSourceIBMISSecurityGroup(),
"ibm_is_security_groups": vpc.DataSourceIBMIsSecurityGroups(),
"ibm_is_security_group_rule": vpc.DataSourceIBMIsSecurityGroupRule(),
"ibm_is_security_group_rules": vpc.DataSourceIBMIsSecurityGroupRules(),
"ibm_is_security_group_target": vpc.DataSourceIBMISSecurityGroupTarget(),
"ibm_is_security_group_targets": vpc.DataSourceIBMISSecurityGroupTargets(),
"ibm_is_snapshot": vpc.DataSourceSnapshot(),
"ibm_is_snapshots": vpc.DataSourceSnapshots(),
"ibm_is_volume": vpc.DataSourceIBMISVolume(),
"ibm_is_volume_profile": vpc.DataSourceIBMISVolumeProfile(),
"ibm_is_volume_profiles": vpc.DataSourceIBMISVolumeProfiles(),
"ibm_is_vpc": vpc.DataSourceIBMISVPC(),
"ibm_is_vpcs": vpc.DataSourceIBMISVPCs(),
"ibm_is_vpn_gateway": vpc.DataSourceIBMISVPNGateway(),
"ibm_is_vpn_gateways": vpc.DataSourceIBMISVPNGateways(),
"ibm_is_vpc_address_prefixes": vpc.DataSourceIbmIsVpcAddressPrefixes(),
"ibm_is_vpc_address_prefix": vpc.DataSourceIBMIsVPCAddressPrefix(),
"ibm_is_vpn_gateway_connection": vpc.DataSourceIBMISVPNGatewayConnection(),
"ibm_is_vpn_gateway_connections": vpc.DataSourceIBMISVPNGatewayConnections(),
"ibm_is_vpc_default_routing_table": vpc.DataSourceIBMISVPCDefaultRoutingTable(),
"ibm_is_vpc_routing_table": vpc.DataSourceIBMIBMIsVPCRoutingTable(),
"ibm_is_vpc_routing_tables": vpc.DataSourceIBMISVPCRoutingTables(),
"ibm_is_vpc_routing_table_route": vpc.DataSourceIBMIBMIsVPCRoutingTableRoute(),
"ibm_is_vpc_routing_table_routes": vpc.DataSourceIBMISVPCRoutingTableRoutes(),
"ibm_is_zone": vpc.DataSourceIBMISZone(),
"ibm_is_zones": vpc.DataSourceIBMISZones(),
"ibm_is_operating_system": vpc.DataSourceIBMISOperatingSystem(),
"ibm_is_operating_systems": vpc.DataSourceIBMISOperatingSystems(),
"ibm_is_network_acls": vpc.DataSourceIBMIsNetworkAcls(),
"ibm_is_network_acl": vpc.DataSourceIBMIsNetworkACL(),
"ibm_is_network_acl_rule": vpc.DataSourceIBMISNetworkACLRule(),
"ibm_is_network_acl_rules": vpc.DataSourceIBMISNetworkACLRules(),
"ibm_lbaas": classicinfrastructure.DataSourceIBMLbaas(),
"ibm_network_vlan": classicinfrastructure.DataSourceIBMNetworkVlan(),
"ibm_org": cloudfoundry.DataSourceIBMOrg(),
"ibm_org_quota": cloudfoundry.DataSourceIBMOrgQuota(),
"ibm_kp_key": kms.DataSourceIBMkey(),
"ibm_kms_key_rings": kms.DataSourceIBMKMSkeyRings(),
"ibm_kms_key_policies": kms.DataSourceIBMKMSkeyPolicies(),
"ibm_kms_keys": kms.DataSourceIBMKMSkeys(),
"ibm_kms_key": kms.DataSourceIBMKMSkey(),
"ibm_pn_application_chrome": pushnotification.DataSourceIBMPNApplicationChrome(),
"ibm_app_config_environment": appconfiguration.DataSourceIBMAppConfigEnvironment(),
"ibm_app_config_environments": appconfiguration.DataSourceIBMAppConfigEnvironments(),
"ibm_app_config_feature": appconfiguration.DataSourceIBMAppConfigFeature(),
"ibm_app_config_features": appconfiguration.DataSourceIBMAppConfigFeatures(),

"ibm_resource_quota": resourcecontroller.DataSourceIBMResourceQuota(),
"ibm_resource_group": resourcemanager.DataSourceIBMResourceGroup(),
Expand Down
Loading

0 comments on commit 9ad2a25

Please sign in to comment.