add debugging

Author: fmoehler

platform/linux_platform.go

@@ -1531,7 +1531,7 @@ func (p linux) DeleteARPEntryWithIP(ip string) error {
 }
 
 func (p linux) GetDefaultNetwork(ipv6 bool) (boshsettings.Network, error) {
-	return p.defaultNetworkResolver.GetDefaultNetwork(ipv6 bool)
+	return p.defaultNetworkResolver.GetDefaultNetwork(ipv6)
 }
 
 func (p linux) calculateEphemeralDiskPartitionSizes(diskSizeInBytes uint64, desiredSwapSizeInBytes *uint64) (uint64, uint64, error) {

platform/net/routes_searcher_unix.go

@@ -76,3 +76,26 @@ func (s cmdRoutesSearcher) SearchRoutes() ([]Route, error) {
 
 	return routes, nil
 }
+
+func (s cmdRoutesSearcher) SearchIPv6Routes() ([]Route, error) {
+	stdout, _, _, err := s.runner.RunCommandQuietly("ip", "-6", "r")
+	if err != nil {
+		return []Route{}, bosherr.WrapError(err, "Running route")
+	}
+
+	routeEntries := strings.Split(stdout, "\n")
+	routes := make([]Route, 0, len(routeEntries))
+	for _, routeEntry := range routeEntries {
+		if len(routeEntry) == 0 {
+			continue
+		}
+		route, err := parseRoute(routeEntry)
+		if err != nil {
+			s.logger.Warn("SearchRoutes", "parseRoute error for route '%s': %s", routeEntry, err.Error())
+			continue
+		}
+		routes = append(routes, route)
+	}
+
+	return routes, nil
+}

settings/service.go

@@ -45,7 +45,7 @@ type settingsService struct {
 type DefaultNetworkResolver interface {
 	// Ideally we would find a network based on a MAC address
 	// but current CPI implementations do not include it
-	GetDefaultNetwork() (Network, error)
+	GetDefaultNetwork(ipv6 bool) (Network, error)
 }
 
 //go:generate go run github.com/maxbrunsfeld/counterfeiter/v6 . PlatformSettingsGetter
@@ -257,7 +257,7 @@ func (s *settingsService) GetSettings() Settings {
 
 		s.logger.Debug(settingsServiceLogTag, "DEBUGGING NAME%s", networkName)
 		s.logger.Debug(settingsServiceLogTag, "DEBUGGING NETWORK%s", network)
-		s.logger.Debug(settingsServiceLogTag, "DEBUGGING PREFIX%s", network.prefix)
+		s.logger.Debug(settingsServiceLogTag, "DEBUGGING PREFIX%s", network.Prefix)
 
 		if network.Prefix == "32" || network.Prefix == "128" || network.Prefix == "" {
 			resolvedNetwork, err := s.resolveNetwork(network)
@@ -285,7 +285,13 @@ func (s *settingsService) resolveNetwork(network Network) (Network, error) {
 	// Ideally this would be GetNetworkByMACAddress(mac string)
 	// Currently, we are relying that if the default network does not contain
 	// the MAC adddress the InterfaceConfigurationCreator will fail.
-	resolvedNetwork, err := s.platform.GetDefaultNetwork()
+	ipv6 := false
+
+	if network.Prefix == "128" {
+		s.logger.Debug(settingsServiceLogTag, "DEBUGGING IPv6")
+		ipv6 = true
+	}
+	resolvedNetwork, err := s.platform.GetDefaultNetwork(ipv6)
 	if err != nil {
 		s.logger.Error(settingsServiceLogTag, "Failed retrieving default network %s", err.Error())
 		return Network{}, bosherr.WrapError(err, "Failed retrieving default network")