remove testing code

Change-Id: Iccbfa76ada834a28e1a40e0c4a0e5b70ec830aae

Author: karta0807913

pkg/virtualnetwork/services.go

@@ -22,6 +22,7 @@ import (
 	"gvisor.dev/gvisor/pkg/tcpip/transport/udp"
 )
 
+// ipv6Pool can be nil
 func addServices(configuration *types.Configuration, s *stack.Stack, ipPool *tap.IPPool, ipv6Pool *tap.IPPool) (http.Handler, error) {
 	var natLock sync.Mutex
 	translation := parseNATTable(configuration)
@@ -41,22 +42,18 @@ func addServices(configuration *types.Configuration, s *stack.Stack, ipPool *tap
 		return nil, err
 	}
 
-	var dhcpv6Mux http.Handler
-	if ipv6Pool != nil {
-		dhcpv6Mux, err = dhcpv6Server(configuration, s, ipv6Pool)
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	forwarderMux, err := forwardHostVM(configuration, s)
 	if err != nil {
 		return nil, err
 	}
 	mux := http.NewServeMux()
 	mux.Handle("/forwarder/", http.StripPrefix("/forwarder", forwarderMux))
 	mux.Handle("/dhcp/", http.StripPrefix("/dhcp", dhcpMux))
-	if dhcpv6Mux != nil {
+	if ipv6Pool != nil {
+		dhcpv6Mux, err := dhcpv6Server(configuration, s, ipv6Pool)
+		if err != nil {
+			return nil, err
+		}
 		mux.Handle("/dhcpv6/", http.StripPrefix("/dhcpv6", dhcpv6Mux))
 	}
 	mux.Handle("/dns/", http.StripPrefix("/dns", dnsMux))

pkg/virtualnetwork/virtualnetwork.go

@@ -193,22 +193,6 @@ func createStack(configuration *types.Configuration, endpoint stack.LinkEndpoint
 			Gateway:     tcpip.Address{},
 			NIC:         1,
 		})
-
-		_, linkLocalSubnet, _ := net.ParseCIDR("fe80::/10")
-		linkLocal, _ := tcpip.NewSubnet(tcpip.AddrFromSlice(linkLocalSubnet.IP), tcpip.MaskFromBytes(linkLocalSubnet.Mask))
-		routes = append(routes, tcpip.Route{
-			Destination: linkLocal,
-			Gateway:     tcpip.Address{},
-			NIC:         1,
-		})
-
-		_, ipv6DefaultCIDR, _ := net.ParseCIDR("::/0")
-		ipv6DefaultRoute, _ := tcpip.NewSubnet(tcpip.AddrFromSlice(ipv6DefaultCIDR.IP), tcpip.MaskFromBytes(ipv6DefaultCIDR.Mask))
-		routes = append(routes, tcpip.Route{
-			Destination: ipv6DefaultRoute,
-			Gateway:     tcpip.Address{},
-			NIC:         1,
-		})
 	}
 
 	s.SetRouteTable(routes)