refactoring

Signed-off-by: Valeriy Khorunzhin <valeriy.khorunzhin@flant.com>

Author: Valeriy Khorunzhin

images/virtualization-artifact/pkg/controller/service/restorer/secret_restorer.go

@@ -121,10 +121,12 @@ func (r SecretRestorer) RestoreMACAddressOrder(_ context.Context, secret *corev1
 
 	var macAddressOrder []string
 	for _, ns := range vm.Status.Networks {
-		if ns.Type == v1alpha2.NetworksTypeMain {
-			continue
+		switch ns.Type {
+		case v1alpha2.NetworksTypeMain:
+			macAddressOrder = append(macAddressOrder, "")
+		default:
+			macAddressOrder = append(macAddressOrder, ns.MAC)
 		}
-		macAddressOrder = append(macAddressOrder, ns.MAC)
 	}
 	return macAddressOrder, nil
 }

images/virtualization-artifact/pkg/controller/service/restorer/snapshot_resources.go

@@ -129,19 +129,13 @@ func (r *SnapshotResources) Prepare(ctx context.Context) error {
 			macAddressNamesByAddress[vmmac.Status.Address] = vmmac.Name
 		}
 
-		hasMainNetwork := len(vm.Spec.Networks) > 0 && vm.Spec.Networks[0].Type == v1alpha2.NetworksTypeMain
-
 		for i := range vm.Spec.Networks {
 			ns := &vm.Spec.Networks[i]
 			if ns.Type == v1alpha2.NetworksTypeMain {
 				continue
 			}
 
-			delta := 0
-			if hasMainNetwork {
-				delta = 1
-			}
-			ns.VirtualMachineMACAddressName = macAddressNamesByAddress[macAddressOrder[i-delta]]
+			ns.VirtualMachineMACAddressName = macAddressNamesByAddress[macAddressOrder[i]]
 		}
 	} else {
 		for i := range vm.Spec.Networks {

images/virtualization-artifact/pkg/controller/vmrestore/internal/life_cycle.go

@@ -180,18 +180,13 @@ func (h LifeCycleHandler) Handle(ctx context.Context, vmRestore *v1alpha2.Virtua
 			macAddressNamesByAddress[vmmac.Status.Address] = vmmac.Name
 		}
 
-		hasMainNetwork := len(vm.Spec.Networks) > 0 && vm.Spec.Networks[0].Type == v1alpha2.NetworksTypeMain
 		for i := range vm.Spec.Networks {
 			ns := &vm.Spec.Networks[i]
 			if ns.Type == v1alpha2.NetworksTypeMain {
 				continue
 			}
 
-			delta := 0
-			if hasMainNetwork {
-				delta = 1
-			}
-			ns.VirtualMachineMACAddressName = macAddressNamesByAddress[macAddressOrder[i-delta]]
+			ns.VirtualMachineMACAddressName = macAddressNamesByAddress[macAddressOrder[i]]
 		}
 	}