Renames address filtering methods to indicate explicitly that they utilise space *name*.

manadart · manadart · commit dddb5c9804c1 · 2018-01-11T17:29:51.000+01:00
This is in preparation for address filtering based on space subnets.
diff --git a/agent/agentbootstrap/bootstrap.go b/agent/agentbootstrap/bootstrap.go
@@ -330,7 +330,7 @@ func initAPIHostPorts(c agent.ConfigSetter, st *state.State, addrs []network.Add
 	var hostPorts []network.HostPort
 	// First try to select the correct address using the default space where all
 	// API servers should be accessible on.
-	spaceAddr, ok := network.SelectAddressBySpaces(addrs)
+	spaceAddr, ok := network.SelectAddressBySpaceNames(addrs)
 	if ok {
 		logger.Debugf("selected %q as API address", spaceAddr.Value)
 		hostPorts = network.AddressesWithPort([]network.Address{spaceAddr}, apiPort)
diff --git a/mongo/mongo.go b/mongo/mongo.go
@@ -300,7 +300,7 @@ func SelectPeerHostPortBySpace(hostPorts []network.HostPort, space network.Space
 	logger.Debugf("selecting mongo peer hostPort in space %s from %+v", space, hostPorts)
 	// ScopeMachineLocal addresses are OK if we can't pick by space.
 	suitableHostPorts, foundHostPortsInSpaces :=
-		network.SelectMongoHostPortsBySpaces(hostPorts, []network.SpaceName{space})
+		network.SelectMongoHostPortsBySpaceNames(hostPorts, []network.SpaceName{space})
 
 	if !foundHostPortsInSpaces {
 		logger.Debugf("Failed to select hostPort by space - trying by scope from %+v", hostPorts)
diff --git a/network/address.go b/network/address.go
@@ -275,9 +275,9 @@ func ExactScopeMatch(addr Address, addrScopes ...Scope) bool {
 	return false
 }
 
-// SelectAddressBySpaces picks the first address from the given slice that has
+// SelectAddressBySpaceNames picks the first address from the given slice that has
 // the given space name associated.
-func SelectAddressBySpaces(addresses []Address, spaceNames ...SpaceName) (Address, bool) {
+func SelectAddressBySpaceNames(addresses []Address, spaceNames ...SpaceName) (Address, bool) {
 	for _, addr := range addresses {
 		if spaceNameList(spaceNames).IndexOf(addr.SpaceName) >= 0 {
 			logger.Debugf("selected %q as first address in space %q", addr.Value, addr.SpaceName)
@@ -293,9 +293,9 @@ func SelectAddressBySpaces(addresses []Address, spaceNames ...SpaceName) (Addres
 	return Address{}, false
 }
 
-// SelectHostPortsBySpaces filters the input slice of HostPorts down to
+// SelectHostPortsBySpaceNames filters the input slice of HostPorts down to
 // those in the inpu space name.
-func SelectHostPortsBySpaces(hps []HostPort, spaceNames ...SpaceName) ([]HostPort, bool) {
+func SelectHostPortsBySpaceNames(hps []HostPort, spaceNames ...SpaceName) ([]HostPort, bool) {
 	if len(spaceNames) == 0 {
 		logger.Errorf("host ports not filtered - no spaces given.")
 		return hps, false
@@ -331,15 +331,15 @@ func SelectControllerAddress(addresses []Address, machineLocal bool) (Address, b
 	return internalAddress, ok
 }
 
-// SelectMongoHostPortsBySpaces returns the most suitable HostPort (as string) to
+// SelectMongoHostPortsBySpaceNames returns the most suitable HostPort (as string) to
 // use as a Juju Controller (API/state server) endpoint given the list of
 // hostPorts. It first tries to find the first HostPort bound to the
 // spaces provided, then, if that fails, uses the older selection method based on scope.
 // When machineLocal is true and an address can't be selected by space both
 // ScopeCloudLocal and ScopeMachineLocal addresses are considered during the
 // selection, otherwise just ScopeCloudLocal are.
-func SelectMongoHostPortsBySpaces(hostPorts []HostPort, spaces []SpaceName) ([]string, bool) {
-	filteredHostPorts, ok := SelectHostPortsBySpaces(hostPorts, spaces...)
+func SelectMongoHostPortsBySpaceNames(hostPorts []HostPort, spaces []SpaceName) ([]string, bool) {
+	filteredHostPorts, ok := SelectHostPortsBySpaceNames(hostPorts, spaces...)
 	if ok {
 		logger.Debugf(
 			"selected %q as controller host:port, using spaces %q",
diff --git a/state/address.go b/state/address.go
@@ -198,7 +198,7 @@ func (st *State) filterHostPortsForManagementSpace(apiHostPorts [][]network.Host
 		hostPortsForAgents = make([][]network.HostPort, len(apiHostPorts))
 		sp := network.SpaceName(mgmtSpace)
 		for i := range apiHostPorts {
-			if filtered, ok := network.SelectHostPortsBySpaces(apiHostPorts[i], sp); ok {
+			if filtered, ok := network.SelectHostPortsBySpaceNames(apiHostPorts[i], sp); ok {
 				hostPortsForAgents[i] = filtered
 			} else {
 				hostPortsForAgents[i] = apiHostPorts[i]
