IPv6: Add Network6 to tstruct

Signed-off-by: Timothy Middelkoop <tmiddelkoop@internet2.edu>

internal/pkg/config/root.go

@@ -157,6 +157,15 @@ func (conf *WarewulfYaml) Parse(data []byte, autodetect bool) error {
 	return nil
 }
 
+func (config *WarewulfYaml) Network6() string {
+	cidr := fmt.Sprintf("%s/%s", config.Ipaddr6, config.PrefixLen6)
+	_, ipnet, err := net.ParseCIDR(cidr)
+	if err != nil {
+		return ""
+	}
+	return ipnet.IP.String()
+}
+
 func (config *WarewulfYaml) NetworkCIDR() string {
 	if config.Network == "" || config.Netmask == "" {
 		return ""

internal/pkg/overlay/datastructure.go

@@ -32,6 +32,7 @@ type TemplateStruct struct {
 	Ipaddr6       string
 	PrefixLen6    string
 	IpCIDR6       string
+	Network6      string
 	NetworkCIDR6  string
 	Ipv6          bool
 	Dhcp          warewulfconf.DHCPConf
@@ -78,6 +79,7 @@ func InitStruct(overlayName string, nodeData node.Node, allNodes []node.Node) (T
 	tstruct.Ipaddr6 = controller.Ipaddr6
 	tstruct.PrefixLen6 = controller.PrefixLen6
 	tstruct.IpCIDR6 = controller.IpCIDR6()
+	tstruct.Network6 = controller.Network6()
 	tstruct.NetworkCIDR6 = controller.NetworkCIDR6()
 	if controller.Ipaddr6 != "" && controller.PrefixLen6 != "" {
 		tstruct.Ipv6 = true

overlays/debug/internal/debug_test.go

@@ -96,6 +96,7 @@ data from other structures.
 - Ipaddr6: 2001:db8::1
 - PrefixLen6: 64
 - IpCIDR6: 2001:db8::1/64
+- Network6: 2001:db8::
 - NetworkCIDR6: 2001:db8::/64
 - Ipv6: true
 

overlays/debug/rootfs/tstruct.md.ww

@@ -36,6 +36,7 @@ data from other structures.
 - Ipaddr6: {{ .Ipaddr6 }}
 - PrefixLen6: {{ .PrefixLen6 }}
 - IpCIDR6: {{ .IpCIDR6 }}
+- Network6: {{ .Network6 }}
 - NetworkCIDR6: {{ .NetworkCIDR6 }}
 - Ipv6: {{ .Ipv6 }}