Fix GoFmt

Update License Fix Node AddressPrefix to use from Subnet instead of Network
flannel-io · Sep 17, 2018 · 6befc8f · 6befc8f
1 parent 48a9fb0
commit 6befc8f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/backend/vxlan/vxlan_network_windows.go b/backend/vxlan/vxlan_network_windows.go
@@ -192,4 +192,4 @@ func createRemoteEndpoint(remoteEndpointName string, remoteIp ip.IP4, remoteMac
 	}
 
 	return nil
-}
+}
diff --git a/backend/vxlan/vxlan_network_windows_test.go b/backend/vxlan/vxlan_network_windows_test.go
@@ -1,6 +1,6 @@
 // +build windows
 
-// Copyright 2015 CNI authors
+// Copyright 2015 flannel authors
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -91,4 +91,4 @@ func TestCheckPAAddressNoMatch(t *testing.T) {
 func TestCheckPAAddressNoMatchIfNil(t *testing.T) {
 	var hnsEndpoint hcsshim.HNSEndpoint
 	assert.False(t, checkPAAddress(&hnsEndpoint, "someOtherAddress"))
-}
+}
diff --git a/backend/vxlan/vxlan_windows.go b/backend/vxlan/vxlan_windows.go
@@ -139,8 +139,8 @@ func (be *VXLANBackend) RegisterNetwork(ctx context.Context, wg sync.WaitGroup,
 	// check if the network exists and has the expected settings?
 	networkName := cfg.name
 	createNetwork := true
-	addressPrefix := config.Network
-	networkGatewayAddress := config.Network.IP + 1
+	addressPrefix := l.Subnet
+	networkGatewayAddress := l.Subnet.IP + 1
 	hnsNetwork, err := hcsshim.GetHNSNetworkByName(networkName)
 	if err == nil {
 		log.Infof("Found existing HNS network [%+v]", hnsNetwork)
-Original file line number
+Diff line change
@@ Expand Up @@
     	}
     	return nil
-    }
+    }