Skip to content

Commit 0eaba69

Browse files
authored
2 - vni phase 2 - instance changes (#279)
* instance changes * vni bare metal changes * Update resource_ibm_is_instance.go * some changes * updated instance * updating tests * doc udpate * fixed show change issue * Update main.tf * reverted bm changes * added deprecation message * merge issues * Update resource_ibm_is_instance_network_attachment.go * Update data_source_ibm_is_instances_test.go * template changes * instance profile changes * test * Update resource_ibm_is_instance_template.go * doc update * updated tests * removed deprecation * Update data_source_ibm_is_instance_network_interfaces.go * network attachments test cases * doc update and test update * Update resource_ibm_is_instance_network_interface_floating_ip.go * Update resource_ibm_is_instance_network_attachment_test.go * instance template changes * it changes removed * doc cleanup * max items set * Update resource_ibm_is_instance_network_attachment.go * test changes * some code changes to fix auto delete change * Update resource_ibm_is_instance.go * Update resource_ibm_is_instance.go * Update resource_ibm_is_instance.go * doc fix * Update is_instance.html.markdown
1 parent 649b707 commit 0eaba69

26 files changed

+4405
-34
lines changed

examples/ibm-is-ng/main.tf

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1458,3 +1458,41 @@ resource "ibm_is_virtual_network_interface_ip" "testacc_vni_reservedip" {
14581458
virtual_network_interface = ibm_is_virtual_network_interface.testacc_vni.id
14591459
reserved_ip = ibm_is_subnet_reserved_ip.testacc_reservedip.reserved_ip
14601460
}
1461+
1462+
resource "ibm_is_virtual_network_interface" "testacc_vni2"{
1463+
name = "${var.name}-2"
1464+
subnet = ibm_is_subnet.testacc_subnet.id
1465+
enable_infrastructure_nat = true
1466+
allow_ip_spoofing = true
1467+
}
1468+
resource "ibm_is_virtual_network_interface" "testacc_vni3"{
1469+
name = "${var.name}-3"
1470+
subnet = ibm_is_subnet.testacc_subnet.id
1471+
enable_infrastructure_nat = true
1472+
allow_ip_spoofing = true
1473+
}
1474+
resource "ibm_is_ssh_key" "testacc_sshkey" {
1475+
name = "${var.name}-ssh"
1476+
public_key = file("~/.ssh/id_rsa.pub")
1477+
}
1478+
resource "ibm_is_instance_network_attachment" "ina" {
1479+
instance = ibm_is_instance.ins.id
1480+
name = "viability-undecided-jalapeno-unbuilt"
1481+
virtual_network_interface {
1482+
id = ibm_is_virtual_network_interface.testacc_vni2.id
1483+
}
1484+
}
1485+
resource "ibm_is_instance" "ins" {
1486+
name = "${var.name}-vsi2"
1487+
profile = "bx2-2x8"
1488+
image = "r134-f47cc24c-e020-4db5-ad96-1e5be8b5853b"
1489+
primary_network_attachment {
1490+
name = "vni-test"
1491+
virtual_network_interface {
1492+
id = ibm_is_virtual_network_interface.testacc_vni3.id
1493+
}
1494+
}
1495+
vpc = ibm_is_vpc.testacc_vpc.id
1496+
zone = "${var.region}-2"
1497+
keys = [ibm_is_ssh_key.testacc_sshkey.id]
1498+
}

ibm/provider/provider.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,8 @@ func Provider() *schema.Provider {
435435
"ibm_is_instance_profiles": vpc.DataSourceIBMISInstanceProfiles(),
436436
"ibm_is_instance": vpc.DataSourceIBMISInstance(),
437437
"ibm_is_instances": vpc.DataSourceIBMISInstances(),
438+
"ibm_is_instance_network_attachment": vpc.DataSourceIBMIsInstanceNetworkAttachment(),
439+
"ibm_is_instance_network_attachments": vpc.DataSourceIBMIsInstanceNetworkAttachments(),
438440
"ibm_is_instance_network_interface": vpc.DataSourceIBMIsInstanceNetworkInterface(),
439441
"ibm_is_instance_network_interfaces": vpc.DataSourceIBMIsInstanceNetworkInterfaces(),
440442
"ibm_is_instance_disk": vpc.DataSourceIbmIsInstanceDisk(),
@@ -1028,6 +1030,7 @@ func Provider() *schema.Provider {
10281030
"ibm_is_flow_log": vpc.ResourceIBMISFlowLog(),
10291031
"ibm_is_instance": vpc.ResourceIBMISInstance(),
10301032
"ibm_is_instance_action": vpc.ResourceIBMISInstanceAction(),
1033+
"ibm_is_instance_network_attachment": vpc.ResourceIBMIsInstanceNetworkAttachment(),
10311034
"ibm_is_instance_network_interface": vpc.ResourceIBMIsInstanceNetworkInterface(),
10321035
"ibm_is_instance_network_interface_floating_ip": vpc.ResourceIBMIsInstanceNetworkInterfaceFloatingIp(),
10331036
"ibm_is_instance_disk_management": vpc.ResourceIBMISInstanceDiskManagement(),
@@ -1458,6 +1461,7 @@ func Validator() validate.ValidatorDict {
14581461
"ibm_is_instance_template": vpc.ResourceIBMISInstanceTemplateValidator(),
14591462
"ibm_is_instance": vpc.ResourceIBMISInstanceValidator(),
14601463
"ibm_is_instance_action": vpc.ResourceIBMISInstanceActionValidator(),
1464+
"ibm_is_instance_network_attachment": vpc.ResourceIBMIsInstanceNetworkAttachmentValidator(),
14611465
"ibm_is_instance_network_interface": vpc.ResourceIBMIsInstanceNetworkInterfaceValidator(),
14621466
"ibm_is_instance_disk_management": vpc.ResourceIBMISInstanceDiskManagementValidator(),
14631467
"ibm_is_instance_volume_attachment": vpc.ResourceIBMISInstanceVolumeAttachmentValidator(),

0 commit comments

Comments
 (0)