issue 2382 added private ip attributes to vpn gateway

Author: deepakibms

ibm/data_source_ibm_is_vpn_gateways.go

@@ -56,6 +56,12 @@ func dataSourceIBMISVPNGateways() *schema.Resource {
 										Description: "The public IP address assigned to the VPN gateway member",
 									},
 
+									"private_address": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: "The private IP address assigned to the VPN gateway member",
+									},
+
 									"role": {
 										Type:        schema.TypeString,
 										Computed:    true,
@@ -154,6 +160,9 @@ func dataSourceIBMVPNGatewaysRead(d *schema.ResourceData, meta interface{}) erro
 					currentMemberIP["status"] = *memberIP.Status
 					vpcMembersIpsList = append(vpcMembersIpsList, currentMemberIP)
 				}
+				if memberIP.PrivateIP != nil {
+					currentMemberIP["private_address"] = *memberIP.PrivateIP.Address
+				}
 			}
 			gateway[isVPNGatewayMembers] = vpcMembersIpsList
 		}

ibm/resource_ibm_is_vpn_gateway.go

@@ -18,20 +18,22 @@ import (
 )
 
 const (
-	isVPNGatewayName             = "name"
-	isVPNGatewayResourceGroup    = "resource_group"
-	isVPNGatewayMode             = "mode"
-	isVPNGatewayTags             = "tags"
-	isVPNGatewaySubnet           = "subnet"
-	isVPNGatewayStatus           = "status"
-	isVPNGatewayDeleting         = "deleting"
-	isVPNGatewayDeleted          = "done"
-	isVPNGatewayProvisioning     = "provisioning"
-	isVPNGatewayProvisioningDone = "done"
-	isVPNGatewayPublicIPAddress  = "public_ip_address"
-	isVPNGatewayMembers          = "members"
-	isVPNGatewayCreatedAt        = "created_at"
-	isVPNGatewayPublicIPAddress2 = "public_ip_address2"
+	isVPNGatewayName              = "name"
+	isVPNGatewayResourceGroup     = "resource_group"
+	isVPNGatewayMode              = "mode"
+	isVPNGatewayTags              = "tags"
+	isVPNGatewaySubnet            = "subnet"
+	isVPNGatewayStatus            = "status"
+	isVPNGatewayDeleting          = "deleting"
+	isVPNGatewayDeleted           = "done"
+	isVPNGatewayProvisioning      = "provisioning"
+	isVPNGatewayProvisioningDone  = "done"
+	isVPNGatewayPublicIPAddress   = "public_ip_address"
+	isVPNGatewayMembers           = "members"
+	isVPNGatewayCreatedAt         = "created_at"
+	isVPNGatewayPublicIPAddress2  = "public_ip_address2"
+	isVPNGatewayPrivateIPAddress  = "private_ip_address"
+	isVPNGatewayPrivateIPAddress2 = "private_ip_address2"
 )
 
 func resourceIBMISVPNGateway() *schema.Resource {
@@ -86,13 +88,27 @@ func resourceIBMISVPNGateway() *schema.Resource {
 			},
 
 			isVPNGatewayPublicIPAddress: {
-				Type:     schema.TypeString,
-				Computed: true,
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The public IP address assigned to the VPN gateway member.",
 			},
 
 			isVPNGatewayPublicIPAddress2: {
-				Type:     schema.TypeString,
-				Computed: true,
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The second public IP address assigned to the VPN gateway member.",
+			},
+
+			isVPNGatewayPrivateIPAddress: {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The Private IP address assigned to the VPN gateway member.",
+			},
+
+			isVPNGatewayPrivateIPAddress2: {
+				Type:        schema.TypeString,
+				Computed:    true,
+				Description: "The Second Private IP address assigned to the VPN gateway member.",
 			},
 
 			isVPNGatewayTags: {
@@ -159,6 +175,12 @@ func resourceIBMISVPNGateway() *schema.Resource {
 							Description: "The public IP address assigned to the VPN gateway member",
 						},
 
+						"private_address": {
+							Type:        schema.TypeString,
+							Computed:    true,
+							Description: "The private IP address assigned to the VPN gateway member",
+						},
+
 						"role": {
 							Type:        schema.TypeString,
 							Computed:    true,
@@ -497,9 +519,18 @@ func vpngwGet(d *schema.ResourceData, meta interface{}, id string) error {
 	for _, member := range vpnGateway.Members {
 		members = append(members, member)
 	}
-	if len(members) > 1 {
+	if len(members) > 0 {
 		d.Set(isVPNGatewayPublicIPAddress, *members[0].PublicIP.Address)
+		if members[0].PrivateIP != nil && members[0].PrivateIP.Address != nil {
+			d.Set(isVPNGatewayPrivateIPAddress, *members[0].PrivateIP.Address)
+		}
+	}
+	if len(members) > 1 {
 		d.Set(isVPNGatewayPublicIPAddress2, *members[1].PublicIP.Address)
+		if members[1].PrivateIP != nil && members[1].PrivateIP.Address != nil {
+			d.Set(isVPNGatewayPrivateIPAddress2, *members[1].PrivateIP.Address)
+		}
+
 	}
 	tags, err := GetTagsUsingCRN(meta, *vpnGateway.CRN)
 	if err != nil {
@@ -530,6 +561,9 @@ func vpngwGet(d *schema.ResourceData, meta interface{}, id string) error {
 				currentMemberIP["status"] = *memberIP.Status
 				vpcMembersIpsList = append(vpcMembersIpsList, currentMemberIP)
 			}
+			if memberIP.PrivateIP != nil {
+				currentMemberIP["private_address"] = *memberIP.PrivateIP.Address
+			}
 		}
 		d.Set(isVPNGatewayMembers, vpcMembersIpsList)
 	}

website/docs/d/is_vpn_gateways.html.markdown

@@ -37,6 +37,7 @@ The following attributes are exported:
 * `crn` - The VPN gateway's CRN.
 * `members` - Collection of VPN gateway members.
   * `address` - The public IP address assigned to the VPN gateway member.
+  * `private_address` - The private IP address assigned to the VPN gateway member.
   * `role` - The high availability role assigned to the VPN gateway member.
   * `status` - The status of the VPN gateway member
 * `resource_type` - The resource type(vpn_gateway)

website/docs/r/is_vpn_gateway.html.markdown

@@ -48,12 +48,15 @@ In addition to all arguments above, the following attributes are exported:
 
 * `id` - The unique identifier of the VPN gateway.
 * `status` - The status of VPN gateway.
-* `public_ip_address` -  The IP address assigned to this VPN gateway.
-* `public_ip_address2` -  The Second IP address assigned to this VPN gateway.
+* `public_ip_address` -  The Public IP address assigned to this VPN gateway member.
+* `public_ip_address2` -  The Second Public IP address assigned to this VPN gateway member.
+* `private_ip_address` -  The Private IP address assigned to this VPN gateway member.
+* `private_ip_address2` -  The Second Private IP address assigned to this VPN gateway.
 * `status` -  The status of the VPN gateway-(available, deleting, failed, pending).
 * `created_at` -  The Second IP address assigned to this VPN gateway.
 * `members` -  Collection of VPN gateway members.
   * `address` -  The public IP address assigned to the VPN gateway member.
+  * `private_address` -  The private IP address assigned to the VPN gateway member.
   * `role` -  The high availability role assigned to the VPN gateway member.
   * `status` -  The status of the VPN gateway member.