Inject windows vpnkit guids

* Allows for unit tests not to collide with running cfdev

[#160907700]

Signed-off-by: Anthony Emengo <[email protected]>

Author: Anthony Emengo

cmd/root_windows.go

@@ -57,7 +57,15 @@ func NewRoot(exit chan struct{}, ui UI, config config.Config, analyticsClient An
 	root.PersistentFlags().Bool("help", false, "")
 	root.PersistentFlags().Lookup("help").Hidden = true
 	lctl := daemon.NewWinSW(config.CFDevHome)
-	vpnkit := &network.VpnKit{Config: config, DaemonRunner: lctl, Powershell: runner.Powershell{}, Label: network.VpnKitLabel}
+	vpnkit := &network.VpnKit{
+		Config: config,
+		DaemonRunner: lctl,
+		Powershell: runner.Powershell{},
+		Label: network.VpnKitLabel,
+		EthernetGUID: "7207f451-2ca3-4b88-8d01-820a21d78293",
+		PortGUID:  "cc2a519a-fb40-4e45-a9f1-c7f04c5ad7fa",
+		ForwarderGUID: "e3ae8f06-8c25-47fb-b6ed-c20702bcef5e",
+	}
 	isoReader := iso.New()
 	hostnet := &network.HostNet{
 		VMSwitchName: "cfdev",

network/vpnkit.go

@@ -20,6 +20,9 @@ type VpnKit struct {
 	DaemonRunner DaemonRunner
 	Powershell   runner.Powershell
 	Label string
+	EthernetGUID string
+	PortGUID string
+	ForwarderGUID string
 }
 
 type DaemonRunner interface {

network/vpnkit_windows.go

@@ -14,10 +14,6 @@ import (
 	"io/ioutil"
 )
 
-const ethernetGUID = "7207f451-2ca3-4b88-8d01-820a21d78293"
-const portGUID = "cc2a519a-fb40-4e45-a9f1-c7f04c5ad7fa"
-const forwarderGUID = "e3ae8f06-8c25-47fb-b6ed-c20702bcef5e"
-
 func (v *VpnKit) Start() error {
 	if err := v.Setup(); err != nil {
 		return errors.SafeWrap(err, "Failed to Setup VPNKit")
@@ -64,9 +60,9 @@ func (v *VpnKit) daemonSpec(vmGuid string) daemon.DaemonSpec {
 		Label:   v.Label,
 		Program: path.Join(v.Config.CacheDir, "vpnkit.exe"),
 		ProgramArguments: []string{
-			fmt.Sprintf("--ethernet hyperv-connect://%s/%s", vmGuid, ethernetGUID),
-			fmt.Sprintf("--port hyperv-connect://%s/%s", vmGuid, portGUID),
-			fmt.Sprintf("--port hyperv-connect://%s/%s", vmGuid, forwarderGUID),
+			fmt.Sprintf("--ethernet hyperv-connect://%s/%s", vmGuid, v.EthernetGUID),
+			fmt.Sprintf("--port hyperv-connect://%s/%s", vmGuid, v.PortGUID),
+			fmt.Sprintf("--port hyperv-connect://%s/%s", vmGuid, v.ForwarderGUID),
 			fmt.Sprintf("--dns %s", dnsPath),
 			fmt.Sprintf("--dhcp %s", dhcpPath),
 			"--http", path.Join(v.Config.VpnKitStateDir, "http_proxy.json"),
@@ -105,13 +101,13 @@ func (v *VpnKit) Setup() error {
 }
 
 func (v *VpnKit) registerServiceGUIDs() error {
-	if err := v.registerGUID(ethernetGUID, "Ethernet"); err != nil {
+	if err := v.registerGUID(v.EthernetGUID, "Ethernet"); err != nil {
 		return err
 	}
-	if err := v.registerGUID(portGUID, "Port"); err != nil {
+	if err := v.registerGUID(v.PortGUID, "Port"); err != nil {
 		return err
 	}
-	return v.registerGUID(forwarderGUID, "Forwarder")
+	return v.registerGUID(v.ForwarderGUID, "Forwarder")
 }
 
 func (v *VpnKit) registerGUID(guid, name string) error {

network/vpnkit_windows_test.go

@@ -29,6 +29,9 @@ var _ = Describe("VpnKit", func() {
 			Config: config.Config{
 				CFDevHome: tempDir,
 			},
+			EthernetGUID: "65319afc-c1a2-4ad9-97a0-0058737b94c2",
+			PortGUID:  "d611c86d-22c9-417c-ac09-3ed4ce5fbfb0",
+			ForwarderGUID: "2ad4fb96-7f0b-4ff9-b42b-8e25da407647",
 		}
 	})