Refactor virt-v2v

Signed-off-by: Martin Necas <[email protected]>
kubev2v · Jan 20, 2025 · 3083ffc · 3083ffc
1 parent 14201d9
commit 3083ffc
Show file tree

Hide file tree

Showing 64 changed files with 24 additions and 22 deletions.
diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Check out forklift repository
         uses: actions/checkout@v4
 
-      - run: ${{ matrix.shell }} ./virt-v2v/pkg/customize/scripts/rhel/run/test-network_config_util.sh
+      - run: ${{ matrix.shell }} ./pkg/virt-v2v/customize/scripts/rhel/run/test-network_config_util.sh
 
   ci_setup:
     strategy:

diff --git a/.tekton/virt-v2v-pull-request.yaml b/.tekton/virt-v2v-pull-request.yaml
@@ -11,7 +11,8 @@ metadata:
       == "main" && ( ".tekton/virt-v2v-pull-request.yaml".pathChanged() ||
       ".tekton/virt-v2v-push.yaml".pathChanged() ||
       "build/virt-v2v/Containerfile".pathChanged() ||
-      "virt-v2v/***".pathChanged() ||
+      "pkg/virt-v2v/***".pathChanged() ||
+      "cmd/virt-v2v/***".pathChanged() ||
       "cmd/virt-v2v-monitor/***".pathChanged() )
   creationTimestamp: null
   labels:

diff --git a/.tekton/virt-v2v-push.yaml b/.tekton/virt-v2v-push.yaml
@@ -12,7 +12,8 @@ metadata:
       == "main" && ( ".tekton/virt-v2v-pull-request.yaml".pathChanged() ||
       ".tekton/virt-v2v-push.yaml".pathChanged() ||
       "build/virt-v2v/Containerfile".pathChanged() ||
-      "virt-v2v/***".pathChanged() ||
+      "pkg/virt-v2v/***".pathChanged() ||
+      "cmd/virt-v2v/***".pathChanged() ||
       "cmd/virt-v2v-monitor/***".pathChanged() )
   creationTimestamp: null
   labels:

diff --git a/Makefile b/Makefile
@@ -76,7 +76,7 @@ all: test forklift-controller
 
 # Run tests
 test: generate fmt vet manifests validation-test
-	go test -coverprofile=cover.out ./pkg/... ./cmd/... ./virt-v2v/...
+	go test -coverprofile=cover.out ./pkg/... ./cmd/...
 
 # Experimental e2e target
 e2e-sanity: e2e-sanity-ovirt e2e-sanity-vsphere

diff --git a/build/virt-v2v/Containerfile b/build/virt-v2v/Containerfile
@@ -24,7 +24,7 @@ ENV GOEXPERIMENT strictfipsruntime
 
 RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o virt-v2v-monitor github.com/konveyor/forklift-controller/cmd/virt-v2v-monitor
 RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o image-converter github.com/konveyor/forklift-controller/cmd/image-converter
-RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o virt-v2v-wrapper virt-v2v/cmd/entrypoint.go
+RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o virt-v2v-wrapper github.com/konveyor/forklift-controller/cmd/virt-v2v
 
 FROM registry.access.redhat.com/ubi9:9.5-1731517889
 

diff --git a/build/virt-v2v/Containerfile-upstream b/build/virt-v2v/Containerfile-upstream
@@ -7,7 +7,7 @@ ENV GOEXPERIMENT strictfipsruntime
 
 RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o virt-v2v-monitor ./cmd/virt-v2v-monitor/virt-v2v-monitor.go
 RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o image-converter ./cmd/image-converter/image-converter.go
-RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o virt-v2v-wrapper ./virt-v2v/cmd/entrypoint.go
+RUN GOOS=linux GOARCH=amd64 go build -ldflags="-w -s" -o virt-v2v-wrapper ./cmd/virt-v2v/entrypoint.go
 
 # Main container
 FROM quay.io/centos/centos:stream9-minimal

diff --git a/virt-v2v/cmd/entrypoint.go → cmd/virt-v2v/entrypoint.go b/virt-v2v/cmd/entrypoint.go → cmd/virt-v2v/entrypoint.go
@@ -10,10 +10,10 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/customize"
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/global"
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/server"
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/utils"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/customize"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/global"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/server"
+	utils "github.com/konveyor/forklift-controller/pkg/virt-v2v/utils"
 )
 
 func main() {

diff --git a/virt-v2v/cmd/entrypoint_test.go → cmd/virt-v2v/entrypoint_test.go b/virt-v2v/cmd/entrypoint_test.go → cmd/virt-v2v/entrypoint_test.go
@@ -4,7 +4,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/global"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/global"
 )
 
 func TestStaticIPs(t *testing.T) {

diff --git a/virt-v2v/pkg/customize/image.go → pkg/virt-v2v/customize/image.go b/virt-v2v/pkg/customize/image.go → pkg/virt-v2v/customize/image.go
@@ -7,8 +7,8 @@ import (
 	"os/exec"
 	"strings"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/global"
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/utils"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/global"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/utils"
 )
 
 //go:embed scripts

diff --git a/virt-v2v/pkg/customize/rhel.go → pkg/virt-v2v/customize/rhel.go b/virt-v2v/pkg/customize/rhel.go → pkg/virt-v2v/customize/rhel.go
@@ -7,8 +7,8 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/global"
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/utils"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/global"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/utils"
 )
 
 func CustomizeLinux(execFunc DomainExecFunc, disks []string, dir string, t FileSystemTool) error {

diff --git a/virt-v2v/pkg/customize/rhel_test.go → pkg/virt-v2v/customize/rhel_test.go b/virt-v2v/pkg/customize/rhel_test.go → pkg/virt-v2v/customize/rhel_test.go
@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/global"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/global"
 )
 
 type MockEmbedTool struct {

diff --git a/...ustomize/scripts/rhel/firstboot/README.md → ...ustomize/scripts/rhel/firstboot/README.md b/...ustomize/scripts/rhel/firstboot/README.md → ...ustomize/scripts/rhel/firstboot/README.md
diff --git a/.../pkg/customize/scripts/rhel/run/README.md → ...-v2v/customize/scripts/rhel/run/README.md b/.../pkg/customize/scripts/rhel/run/README.md → ...-v2v/customize/scripts/rhel/run/README.md
diff --git a/...g-double-quotes-test.d/expected-udev.rule → ...g-double-quotes-test.d/expected-udev.rule b/...g-double-quotes-test.d/expected-udev.rule → ...g-double-quotes-test.d/expected-udev.rule
diff --git a/.../etc/sysconfig/network-scripts/ifcfg-eth0 → .../etc/sysconfig/network-scripts/ifcfg-eth0 b/.../etc/sysconfig/network-scripts/ifcfg-eth0 → .../etc/sysconfig/network-scripts/ifcfg-eth0
diff --git a/...cfg-double-quotes-test.d/root/tmp/macToIP → ...cfg-double-quotes-test.d/root/tmp/macToIP b/...cfg-double-quotes-test.d/root/tmp/macToIP → ...cfg-double-quotes-test.d/root/tmp/macToIP
diff --git a/...-hwaddr-test-failure.d/expected-udev.rule → ...-hwaddr-test-failure.d/expected-udev.rule b/...-hwaddr-test-failure.d/expected-udev.rule → ...-hwaddr-test-failure.d/expected-udev.rule
diff --git a/.../etc/sysconfig/network-scripts/ifcfg-eth0 → .../etc/sysconfig/network-scripts/ifcfg-eth0 b/.../etc/sysconfig/network-scripts/ifcfg-eth0 → .../etc/sysconfig/network-scripts/ifcfg-eth0
diff --git a/...fg-hwaddr-test-failure.d/root/tmp/macToIP → ...fg-hwaddr-test-failure.d/root/tmp/macToIP b/...fg-hwaddr-test-failure.d/root/tmp/macToIP → ...fg-hwaddr-test-failure.d/root/tmp/macToIP
diff --git a/...un/ifcfg-hwaddr-test.d/expected-udev.rule → ...un/ifcfg-hwaddr-test.d/expected-udev.rule b/...un/ifcfg-hwaddr-test.d/expected-udev.rule → ...un/ifcfg-hwaddr-test.d/expected-udev.rule
diff --git a/...tc/sysconfig/network-scripts/ifcfg-ens192 → ...tc/sysconfig/network-scripts/ifcfg-ens192 b/...tc/sysconfig/network-scripts/ifcfg-ens192 → ...tc/sysconfig/network-scripts/ifcfg-ens192
diff --git a/...tc/sysconfig/network-scripts/ifcfg-ens224 → ...tc/sysconfig/network-scripts/ifcfg-ens224 b/...tc/sysconfig/network-scripts/ifcfg-ens224 → ...tc/sysconfig/network-scripts/ifcfg-ens224
diff --git a/.../run/ifcfg-hwaddr-test.d/root/tmp/macToIP → .../run/ifcfg-hwaddr-test.d/root/tmp/macToIP b/.../run/ifcfg-hwaddr-test.d/root/tmp/macToIP → .../run/ifcfg-hwaddr-test.d/root/tmp/macToIP
diff --git a/...ifcfg-no-quotes-test.d/expected-udev.rule → ...ifcfg-no-quotes-test.d/expected-udev.rule b/...ifcfg-no-quotes-test.d/expected-udev.rule → ...ifcfg-no-quotes-test.d/expected-udev.rule
diff --git a/.../etc/sysconfig/network-scripts/ifcfg-eth0 → .../etc/sysconfig/network-scripts/ifcfg-eth0 b/.../etc/sysconfig/network-scripts/ifcfg-eth0 → .../etc/sysconfig/network-scripts/ifcfg-eth0
diff --git a/...n/ifcfg-no-quotes-test.d/root/tmp/macToIP → ...n/ifcfg-no-quotes-test.d/root/tmp/macToIP b/...n/ifcfg-no-quotes-test.d/root/tmp/macToIP → ...n/ifcfg-no-quotes-test.d/root/tmp/macToIP
diff --git a/...g-single-quotes-test.d/expected-udev.rule → ...g-single-quotes-test.d/expected-udev.rule b/...g-single-quotes-test.d/expected-udev.rule → ...g-single-quotes-test.d/expected-udev.rule
diff --git a/.../etc/sysconfig/network-scripts/ifcfg-eth0 → .../etc/sysconfig/network-scripts/ifcfg-eth0 b/.../etc/sysconfig/network-scripts/ifcfg-eth0 → .../etc/sysconfig/network-scripts/ifcfg-eth0
diff --git a/...cfg-single-quotes-test.d/root/tmp/macToIP → ...cfg-single-quotes-test.d/root/tmp/macToIP b/...cfg-single-quotes-test.d/root/tmp/macToIP → ...cfg-single-quotes-test.d/root/tmp/macToIP
diff --git a/...hel/run/netplan-test.d/expected-udev.rule → ...hel/run/netplan-test.d/expected-udev.rule b/...hel/run/netplan-test.d/expected-udev.rule → ...hel/run/netplan-test.d/expected-udev.rule
diff --git a/...n-test.d/root/etc/netplan/50-netplan.yaml → ...n-test.d/root/etc/netplan/50-netplan.yaml b/...n-test.d/root/etc/netplan/50-netplan.yaml → ...n-test.d/root/etc/netplan/50-netplan.yaml
diff --git a/...un/systemd/network/netplan-enp3s0.network → ...un/systemd/network/netplan-enp3s0.network b/...un/systemd/network/netplan-enp3s0.network → ...un/systemd/network/netplan-enp3s0.network
diff --git a/.../run/systemd/network/netplan-eth1.network → .../run/systemd/network/netplan-eth1.network b/.../run/systemd/network/netplan-eth1.network → .../run/systemd/network/netplan-eth1.network
diff --git a/.../rhel/run/netplan-test.d/root/tmp/macToIP → .../rhel/run/netplan-test.d/root/tmp/macToIP b/.../rhel/run/netplan-test.d/root/tmp/macToIP → .../rhel/run/netplan-test.d/root/tmp/macToIP
diff --git a/...rfaces-multiple-test.d/expected-udev.rule → ...rfaces-multiple-test.d/expected-udev.rule b/...rfaces-multiple-test.d/expected-udev.rule → ...rfaces-multiple-test.d/expected-udev.rule
diff --git a/...ltiple-test.d/root/etc/network/interfaces → ...ltiple-test.d/root/etc/network/interfaces b/...ltiple-test.d/root/etc/network/interfaces → ...ltiple-test.d/root/etc/network/interfaces
diff --git a/...d/root/etc/network/interfaces.d/if-ens192 → ...d/root/etc/network/interfaces.d/if-ens192 b/...d/root/etc/network/interfaces.d/if-ens192 → ...d/root/etc/network/interfaces.d/if-ens192
diff --git a/...t.d/root/etc/network/interfaces.d/if-eth0 → ...t.d/root/etc/network/interfaces.d/if-eth0 b/...t.d/root/etc/network/interfaces.d/if-eth0 → ...t.d/root/etc/network/interfaces.d/if-eth0
diff --git a/...terfaces-multiple-test.d/root/tmp/macToIP → ...terfaces-multiple-test.d/root/tmp/macToIP b/...terfaces-multiple-test.d/root/tmp/macToIP → ...terfaces-multiple-test.d/root/tmp/macToIP
diff --git a/...terfaces-single-test.d/expected-udev.rule → ...terfaces-single-test.d/expected-udev.rule b/...terfaces-single-test.d/expected-udev.rule → ...terfaces-single-test.d/expected-udev.rule
diff --git a/...single-test.d/root/etc/network/interfaces → ...single-test.d/root/etc/network/interfaces b/...single-test.d/root/etc/network/interfaces → ...single-test.d/root/etc/network/interfaces
diff --git a/...interfaces-single-test.d/root/tmp/macToIP → ...interfaces-single-test.d/root/tmp/macToIP b/...interfaces-single-test.d/root/tmp/macToIP → ...interfaces-single-test.d/root/tmp/macToIP
diff --git a/...e/scripts/rhel/run/network_config_util.sh → ...e/scripts/rhel/run/network_config_util.sh b/...e/scripts/rhel/run/network_config_util.sh → ...e/scripts/rhel/run/network_config_util.sh
diff --git a/.../networkmanager-test.d/expected-udev.rule → .../networkmanager-test.d/expected-udev.rule b/.../networkmanager-test.d/expected-udev.rule → .../networkmanager-test.d/expected-udev.rule
diff --git a/...ections/eth1 but with spaces.nmconnection → ...ections/eth1 but with spaces.nmconnection b/...ections/eth1 but with spaces.nmconnection → ...ections/eth1 but with spaces.nmconnection
diff --git a/...un/networkmanager-test.d/root/tmp/macToIP → ...un/networkmanager-test.d/root/tmp/macToIP b/...un/networkmanager-test.d/root/tmp/macToIP → ...un/networkmanager-test.d/root/tmp/macToIP
diff --git a/...hel/run/systemd-test.d/expected-udev.rule → ...hel/run/systemd-test.d/expected-udev.rule b/...hel/run/systemd-test.d/expected-udev.rule → ...hel/run/systemd-test.d/expected-udev.rule
diff --git a/...d-test.d/root/etc/netplan/50-netplan.yaml → ...d-test.d/root/etc/netplan/50-netplan.yaml b/...d-test.d/root/etc/netplan/50-netplan.yaml → ...d-test.d/root/etc/netplan/50-netplan.yaml
diff --git a/...un/systemd/network/netplan-ens160.network → ...un/systemd/network/netplan-ens160.network b/...un/systemd/network/netplan-ens160.network → ...un/systemd/network/netplan-ens160.network
diff --git a/.../rhel/run/systemd-test.d/root/tmp/macToIP → .../rhel/run/systemd-test.d/root/tmp/macToIP b/.../rhel/run/systemd-test.d/root/tmp/macToIP → .../rhel/run/systemd-test.d/root/tmp/macToIP
diff --git a/...ipts/rhel/run/test-network_config_util.sh → ...ipts/rhel/run/test-network_config_util.sh b/...ipts/rhel/run/test-network_config_util.sh → ...ipts/rhel/run/test-network_config_util.sh
diff --git a/...e/scripts/windows/9999-restore_config.ps1 → ...e/scripts/windows/9999-restore_config.ps1 b/...e/scripts/windows/9999-restore_config.ps1 → ...e/scripts/windows/9999-restore_config.ps1
diff --git a/...ripts/windows/9999-run-mtv-ps-scripts.bat → ...ripts/windows/9999-run-mtv-ps-scripts.bat b/...ripts/windows/9999-run-mtv-ps-scripts.bat → ...ripts/windows/9999-run-mtv-ps-scripts.bat
diff --git a/...g/customize/scripts/windows/firstboot.bat → ...v/customize/scripts/windows/firstboot.bat b/...g/customize/scripts/windows/firstboot.bat → ...v/customize/scripts/windows/firstboot.bat
diff --git a/...v/pkg/customize/testdata/valid_config.xml → ...t-v2v/customize/testdata/valid_config.xml b/...v/pkg/customize/testdata/valid_config.xml → ...t-v2v/customize/testdata/valid_config.xml
diff --git a/...v/pkg/customize/testdata/valid_config.yml → ...t-v2v/customize/testdata/valid_config.yml b/...v/pkg/customize/testdata/valid_config.yml → ...t-v2v/customize/testdata/valid_config.yml
diff --git a/virt-v2v/pkg/customize/utils.go → pkg/virt-v2v/customize/utils.go b/virt-v2v/pkg/customize/utils.go → pkg/virt-v2v/customize/utils.go
@@ -7,7 +7,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/utils"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/utils"
 )
 
 // getScriptsWithSuffix retrieves all scripts with suffix from the specified directory

diff --git a/virt-v2v/pkg/customize/windows.go → pkg/virt-v2v/customize/windows.go b/virt-v2v/pkg/customize/windows.go → pkg/virt-v2v/customize/windows.go
@@ -5,8 +5,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/global"
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/utils"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/global"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/utils"
 )
 
 // CustomizeWindows customizes a windows disk image by uploading scripts.

diff --git a/virt-v2v/pkg/global/variables.go → pkg/virt-v2v/global/variables.go b/virt-v2v/pkg/global/variables.go → pkg/virt-v2v/global/variables.go
diff --git a/virt-v2v/pkg/server/server.go → pkg/virt-v2v/server/server.go b/virt-v2v/pkg/server/server.go → pkg/virt-v2v/server/server.go
@@ -8,8 +8,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/global"
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/utils"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/global"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/utils"
 )
 
 var (

diff --git a/virt-v2v/pkg/utils/command.go → pkg/virt-v2v/utils/command.go b/virt-v2v/pkg/utils/command.go → pkg/virt-v2v/utils/command.go
@@ -7,7 +7,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/konveyor/forklift-controller/virt-v2v/pkg/global"
+	"github.com/konveyor/forklift-controller/pkg/virt-v2v/global"
 )
 
 func CheckEnvVariablesSet(envVars ...string) bool {

diff --git a/virt-v2v/pkg/utils/embed-tool.go → pkg/virt-v2v/utils/embed-tool.go b/virt-v2v/pkg/utils/embed-tool.go → pkg/virt-v2v/utils/embed-tool.go
diff --git a/virt-v2v/pkg/utils/utils_test.go → pkg/virt-v2v/utils/utils_test.go b/virt-v2v/pkg/utils/utils_test.go → pkg/virt-v2v/utils/utils_test.go
diff --git a/virt-v2v/pkg/utils/xml-reader.go → pkg/virt-v2v/utils/xml-reader.go b/virt-v2v/pkg/utils/xml-reader.go → pkg/virt-v2v/utils/xml-reader.go