Additional renames of ul*

Signed-off-by: eriknordmark <[email protected]>

pkg/pillar/cmd/zedrouter/networkinstance.go

@@ -36,7 +36,7 @@ func (z *zedrouter) getArgsForNIStateCollecting(niID uuid.UUID) (
 		if appNetConfig == nil || !appNetConfig.Activate {
 			continue
 		}
-		for _, anaStatus := range appNetStatus.GetULStatusForNI(niID) {
+		for _, anaStatus := range appNetStatus.GetAdaptersStatusForNI(niID) {
 			vifs = append(vifs, nistate.AppVIF{
 				App:            appNetStatus.UUIDandVersion.UUID,
 				NI:             niID,

pkg/pillar/types/zedroutertypes.go

@@ -187,18 +187,18 @@ func (status AppNetworkStatus) AwaitingNetwork() bool {
 	return status.AwaitNetworkInstance
 }
 
-// GetULStatusForNI returns AppNetAdapterStatus for every application VIF
+// GetAdaptersStatusForNI returns AppNetAdapterStatus for every application VIF
 // connected to the given network instance (there can be multiple interfaces connected
 // to the same network instance).
-func (status AppNetworkStatus) GetULStatusForNI(netUUID uuid.UUID) []*AppNetAdapterStatus {
-	var uls []*AppNetAdapterStatus
+func (status AppNetworkStatus) GetAdaptersStatusForNI(netUUID uuid.UUID) []*AppNetAdapterStatus {
+	var adapters []*AppNetAdapterStatus
 	for i := range status.AppNetAdapterList {
-		ul := &status.AppNetAdapterList[i]
-		if ul.Network == netUUID {
-			uls = append(uls, ul)
+		adapter := &status.AppNetAdapterList[i]
+		if adapter.Network == netUUID {
+			adapters = append(adapters, adapter)
 		}
 	}
-	return uls
+	return adapters
 }
 
 // AppContainerMetrics - App Container Metrics
@@ -281,7 +281,7 @@ type AppNetAdapterConfig struct {
 
 	// XXX Shouldn't we use ErrorAndTime here
 	// Error
-	//	If there is a parsing error and this uLNetwork config cannot be
+	//	If there is a parsing error and this AppNetAdapterNetwork config cannot be
 	//	processed, set the error here. This allows the error to be propagated
 	//  back to zedcloud
 	//	If this is non-empty ( != ""), the UL network Config should not be