Merge branch 'vnip2' into VNIp2-SDK-1.59.0

Author: sumitkumartiwari

examples/ibm-is-ng/main.tf

@@ -1399,3 +1399,100 @@ resource "ibm_is_image_deprecate" "example" {
 resource "ibm_is_image_obsolete" "example" {
   image     = ibm_is_image.image1.id
 }
+
+
+// vni
+
+resource "ibm_is_vpc" "testacc_vpc" {
+	name = "${var.name}-vpc"
+}
+
+resource "ibm_is_subnet" "testacc_subnet" {
+	name = "${var.name}-subnet"
+	vpc = ibm_is_vpc.testacc_vpc.id
+	zone = "${var.region}-2"
+	total_ipv4_address_count = 16
+
+}
+
+resource "ibm_is_virtual_network_interface" "testacc_vni"{
+	name = "${var.name}"
+    subnet = ibm_is_subnet.testacc_subnet.id
+	enable_infrastructure_nat = true
+	allow_ip_spoofing = true
+}
+
+resource "ibm_is_floating_ip" "testacc_floatingip" {
+	name = "${var.name}-floating"
+	zone = ibm_is_subnet.testacc_subnet.zone
+}
+resource "ibm_is_virtual_network_interface_floating_ip" "testacc_vni_floatingip" {
+	virtual_network_interface = ibm_is_virtual_network_interface.testacc_vni.id
+	floating_ip = ibm_is_floating_ip.testacc_floatingip.id
+}
+data "ibm_is_virtual_network_interface_floating_ip" "is_vni_floating_ip" {
+    depends_on = [ ibm_is_virtual_network_interface_floating_ip.testacc_vni_floatingip ]
+	virtual_network_interface = ibm_is_virtual_network_interface.testacc_vni.id
+	floating_ip = ibm_is_floating_ip.testacc_floatingip.id
+}
+data "ibm_is_virtual_network_interface_floating_ips" "is_vni_floating_ips" {
+    depends_on = [ ibm_is_virtual_network_interface_floating_ip.testacc_vni_floatingip ]
+	virtual_network_interface = ibm_is_virtual_network_interface.testacc_vni.id
+}
+
+data "ibm_is_virtual_network_interface_ips" "is_vni_reservedips" {
+    depends_on = [ ibm_is_virtual_network_interface_ip.testacc_vni_reservedip ]
+	virtual_network_interface = ibm_is_virtual_network_interface.testacc_vni.id
+}
+data "ibm_is_virtual_network_interface_ip" "is_vni_reservedip" {
+    depends_on = [ ibm_is_virtual_network_interface_ip.testacc_vni_reservedip ]
+	virtual_network_interface = ibm_is_virtual_network_interface.testacc_vni.id
+	reserved_ip = ibm_is_subnet_reserved_ip.testacc_reservedip.reserved_ip
+}
+
+resource "ibm_is_subnet_reserved_ip" "testacc_reservedip" {
+	subnet = ibm_is_subnet.testacc_subnet.id
+	name = "${var.name}-reserved-ip"
+}
+resource "ibm_is_virtual_network_interface_ip" "testacc_vni_reservedip" {
+	virtual_network_interface = ibm_is_virtual_network_interface.testacc_vni.id
+	reserved_ip = ibm_is_subnet_reserved_ip.testacc_reservedip.reserved_ip
+}
+
+resource "ibm_is_virtual_network_interface" "testacc_vni2"{
+	name = "${var.name}-2"
+    subnet = ibm_is_subnet.testacc_subnet.id
+	enable_infrastructure_nat = true
+	allow_ip_spoofing = true
+}
+resource "ibm_is_virtual_network_interface" "testacc_vni3"{
+	name = "${var.name}-3"
+    subnet = ibm_is_subnet.testacc_subnet.id
+	enable_infrastructure_nat = true
+	allow_ip_spoofing = true
+}
+resource "ibm_is_ssh_key" "testacc_sshkey" {
+	name       			= "${var.name}-ssh"
+	public_key 			= file("~/.ssh/id_rsa.pub")
+}
+resource "ibm_is_instance_network_attachment" "ina" {
+  instance = ibm_is_instance.ins.id
+  name = "viability-undecided-jalapeno-unbuilt"
+  virtual_network_interface {
+    id = ibm_is_virtual_network_interface.testacc_vni2.id
+  }
+}
+resource "ibm_is_instance" "ins" {
+	name   				= "${var.name}-vsi2"
+	profile 			= "bx2-2x8"
+  image = "r134-f47cc24c-e020-4db5-ad96-1e5be8b5853b"
+	primary_network_attachment {
+        name = "vni-test"
+        virtual_network_interface { 
+            id = ibm_is_virtual_network_interface.testacc_vni3.id
+        }
+	}
+	vpc     = ibm_is_vpc.testacc_vpc.id
+	zone    = "${var.region}-2"
+	keys    = [ibm_is_ssh_key.testacc_sshkey.id]
+}

ibm/acctest/acctest.go

@@ -76,6 +76,7 @@ var (
 	ISZoneName2                     string
 	ISZoneName3                     string
 	IsResourceGroupID               string
+	ISResourceCrn                   string
 	ISCIDR                          string
 	ISCIDR2                         string
 	ISPublicSSHKeyFilePath          string
@@ -662,6 +663,11 @@ func init() {
 		IsResourceGroupID = "c01d34dff4364763476834c990398zz8"
 		fmt.Println("[INFO] Set the environment variable SL_RESOURCE_GROUP_ID for testing with different resource group id else it is set to default value 'c01d34dff4364763476834c990398zz8'")
 	}
+	ISResourceCrn = os.Getenv("IS_RESOURCE_INSTANCE_CRN")
+	if ISResourceCrn == "" {
+		ISResourceCrn = "crn:v1:bluemix:public:cloud-object-storage:global:a/fugeggfcgjebvrburvgurgvugfr:236764224-f48fu4-f4h84-9db3-4f94fh::"
+		fmt.Println("[INFO] Set the environment variable IS_RESOURCE_CRN for testing with created resource instance")
+	}
 
 	IsImage = os.Getenv("IS_IMAGE")
 	if IsImage == "" {