start ipv6 support

Author: sgsullivan

cmd/cloudNetworkPublicAdd.go

@@ -37,14 +37,21 @@ operating system.
 If the configure-ips flag is not passed, the IP addresses will be assigned, and
 routing will be allowed. However the IP(s) will not be automatically configured
 in the guest operating system. In this scenario, it will be up to the system
-administrator to add the IP(s) to the network configuration.`,
+administrator to add the IP(s) to the network configuration.
+
+IPv6 Notes:
+
+Only /64s will be given out, and new-ips refers to how many /64's to assign.
+There is a limit of one /64 per Cloud Server. If you need more than this, you
+can contact support.`,
 	Run: func(cmd *cobra.Command, args []string) {
 		params := &instance.CloudNetworkPublicAddParams{}
 
 		params.UniqId, _ = cmd.Flags().GetString("uniq-id")
 		params.ConfigureIps, _ = cmd.Flags().GetBool("configure-ips")
 		params.NewIps, _ = cmd.Flags().GetInt64("new-ips")
 		params.PoolIps = cloudNetworkPublicAddCmdPoolIpsFlag
+		params.IpVersion, _ = cmd.Flags().GetInt("ip-version")
 
 		status, err := lwCliInst.CloudNetworkPublicAdd(params)
 		if err != nil {
@@ -64,6 +71,8 @@ func init() {
 	cloudNetworkPublicAddCmd.Flags().StringSliceVar(&cloudNetworkPublicAddCmdPoolIpsFlag, "pool-ips", []string{},
 		"ips from your IP Pool separated by ',' to assign to the Cloud Server")
 
+	cloudNetworkPublicAddCmd.Flags().Int("ip-version", 4, "IP version 4 or 6")
+
 	if err := cloudNetworkPublicAddCmd.MarkFlagRequired("uniq-id"); err != nil {
 		lwCliInst.Die(err)
 	}

instance/cloudNetworkPublicAdd.go

@@ -28,6 +28,7 @@ type CloudNetworkPublicAddParams struct {
 	ConfigureIps bool     `yaml:"configure-ips"`
 	NewIps       int64    `yaml:"new-ips"`
 	PoolIps      []string `yaml:"pool-ips"`
+	IpVersion    int      `yaml:"ip-version"`
 }
 
 func (self *CloudNetworkPublicAddParams) UnmarshalYAML(unmarshal func(interface{}) error) error {
@@ -55,9 +56,15 @@ func (self *Client) CloudNetworkPublicAdd(params *CloudNetworkPublicAddParams) (
 		return
 	}
 
+	if params.IpVersion != 4 && params.IpVersion != 6 {
+		err = fmt.Errorf("ip-version may only be 4 or 6")
+		return
+	}
+
 	apiArgs := map[string]interface{}{
 		"configure_ips": params.ConfigureIps,
 		"uniq_id":       params.UniqId,
+		"ip_version":    params.IpVersion,
 	}
 	if params.NewIps != 0 {
 		apiArgs["ip_count"] = params.NewIps

types/api/network.go

@@ -96,11 +96,13 @@ func (x NetworkAssignmentListEntry) String() string {
 	var slice []string
 
 	slice = append(slice, fmt.Sprintf("\tIP: %s\n", x.Ip))
+	slice = append(slice, fmt.Sprintf("\t\tNetwork: %s\n", x.Network))
 	slice = append(slice, fmt.Sprintf("\t\tId: %d\n", x.Id))
 	slice = append(slice, fmt.Sprintf("\t\tGateway: %s\n", x.Gateway))
-	slice = append(slice, fmt.Sprintf("\t\tBroadcast: %s\n", x.Broadcast))
+	if x.Broadcast != "" {
+		slice = append(slice, fmt.Sprintf("\t\tBroadcast: %s\n", x.Broadcast))
+	}
 	slice = append(slice, fmt.Sprintf("\t\tNetmask: %s\n", x.Netmask))
-	slice = append(slice, fmt.Sprintf("\t\tNetwork: %s\n", x.Netmask))
 
 	return strings.Join(slice[:], "")
 }