From ff5306c451b323041e3d6e30ea7a2582ae4a1b84 Mon Sep 17 00:00:00 2001 From: Pablo Fontanilla Date: Thu, 18 Dec 2025 18:42:41 +0100 Subject: [PATCH] Rename two_node directory to edge-topologies MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Rename test/extended/two_node to test/extended/edge-topologies and test/extended/testdata/two_node to test/extended/testdata/edge-topologies. Updates package declarations, imports, and testdata path references. Suite name openshift/two-node remains unchanged. 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- test/extended/{two_node => edge-topologies}/OWNERS | 0 .../arbiter_topology.go | 4 ++-- .../{two_node => edge-topologies}/tna_recovery.go | 4 ++-- .../{two_node => edge-topologies}/tnf_degraded.go | 4 ++-- .../tnf_node_replacement.go | 12 ++++++------ .../{two_node => edge-topologies}/tnf_recovery.go | 10 +++++----- .../{two_node => edge-topologies}/tnf_topology.go | 4 ++-- .../utils/apis/baremetalhost.go | 4 ++-- .../{two_node => edge-topologies}/utils/apis/csr.go | 0 .../{two_node => edge-topologies}/utils/common.go | 0 .../{two_node => edge-topologies}/utils/core/file.go | 4 ++-- .../utils/core/retry.go | 0 .../{two_node => edge-topologies}/utils/core/ssh.go | 0 .../utils/core/validation.go | 2 +- .../utils/services/etcd.go | 2 +- .../utils/services/hypervisor.go | 2 +- .../utils/services/libvirt.go | 2 +- .../utils/services/pacemaker.go | 2 +- test/extended/include.go | 2 +- .../baremetalhost-template.yaml | 0 .../machine-template.yaml | 0 21 files changed, 29 insertions(+), 29 deletions(-) rename test/extended/{two_node => edge-topologies}/OWNERS (100%) rename test/extended/{two_node => edge-topologies}/arbiter_topology.go (99%) rename test/extended/{two_node => edge-topologies}/tna_recovery.go (98%) rename test/extended/{two_node => edge-topologies}/tnf_degraded.go (99%) rename test/extended/{two_node => edge-topologies}/tnf_node_replacement.go (99%) rename test/extended/{two_node => edge-topologies}/tnf_recovery.go (98%) rename test/extended/{two_node => edge-topologies}/tnf_topology.go (98%) rename test/extended/{two_node => edge-topologies}/utils/apis/baremetalhost.go (97%) rename test/extended/{two_node => edge-topologies}/utils/apis/csr.go (100%) rename test/extended/{two_node => edge-topologies}/utils/common.go (100%) rename test/extended/{two_node => edge-topologies}/utils/core/file.go (98%) rename test/extended/{two_node => edge-topologies}/utils/core/retry.go (100%) rename test/extended/{two_node => edge-topologies}/utils/core/ssh.go (100%) rename test/extended/{two_node => edge-topologies}/utils/core/validation.go (99%) rename test/extended/{two_node => edge-topologies}/utils/services/etcd.go (99%) rename test/extended/{two_node => edge-topologies}/utils/services/hypervisor.go (98%) rename test/extended/{two_node => edge-topologies}/utils/services/libvirt.go (99%) rename test/extended/{two_node => edge-topologies}/utils/services/pacemaker.go (99%) rename test/extended/testdata/{two_node => edge-topologies}/baremetalhost-template.yaml (100%) rename test/extended/testdata/{two_node => edge-topologies}/machine-template.yaml (100%) diff --git a/test/extended/two_node/OWNERS b/test/extended/edge-topologies/OWNERS similarity index 100% rename from test/extended/two_node/OWNERS rename to test/extended/edge-topologies/OWNERS diff --git a/test/extended/two_node/arbiter_topology.go b/test/extended/edge-topologies/arbiter_topology.go similarity index 99% rename from test/extended/two_node/arbiter_topology.go rename to test/extended/edge-topologies/arbiter_topology.go index 4260fbbcbd8d..528cd328ef6d 100644 --- a/test/extended/two_node/arbiter_topology.go +++ b/test/extended/edge-topologies/arbiter_topology.go @@ -1,4 +1,4 @@ -package two_node +package edge_topologies import ( "context" @@ -10,7 +10,7 @@ import ( o "github.com/onsi/gomega" v1 "github.com/openshift/api/config/v1" - "github.com/openshift/origin/test/extended/two_node/utils" + "github.com/openshift/origin/test/extended/edge-topologies/utils" exutil "github.com/openshift/origin/test/extended/util" "github.com/openshift/origin/test/extended/util/image" appv1 "k8s.io/api/apps/v1" diff --git a/test/extended/two_node/tna_recovery.go b/test/extended/edge-topologies/tna_recovery.go similarity index 98% rename from test/extended/two_node/tna_recovery.go rename to test/extended/edge-topologies/tna_recovery.go index 75c597c92a69..d44864a9b8c9 100644 --- a/test/extended/two_node/tna_recovery.go +++ b/test/extended/edge-topologies/tna_recovery.go @@ -1,4 +1,4 @@ -package two_node +package edge_topologies import ( "context" @@ -10,7 +10,7 @@ import ( o "github.com/onsi/gomega" v1 "github.com/openshift/api/config/v1" - "github.com/openshift/origin/test/extended/two_node/utils" + "github.com/openshift/origin/test/extended/edge-topologies/utils" exutil "github.com/openshift/origin/test/extended/util" corev1 "k8s.io/api/core/v1" diff --git a/test/extended/two_node/tnf_degraded.go b/test/extended/edge-topologies/tnf_degraded.go similarity index 99% rename from test/extended/two_node/tnf_degraded.go rename to test/extended/edge-topologies/tnf_degraded.go index 6437578818ed..7b3ce1e401c6 100644 --- a/test/extended/two_node/tnf_degraded.go +++ b/test/extended/edge-topologies/tnf_degraded.go @@ -1,4 +1,4 @@ -package two_node +package edge_topologies import ( "bytes" @@ -12,7 +12,7 @@ import ( machineconfigv1 "github.com/openshift/api/machineconfiguration/v1" machineconfigclient "github.com/openshift/client-go/machineconfiguration/clientset/versioned" - "github.com/openshift/origin/test/extended/two_node/utils" + "github.com/openshift/origin/test/extended/edge-topologies/utils" "github.com/openshift/origin/test/extended/util/image" appsv1 "k8s.io/api/apps/v1" corev1 "k8s.io/api/core/v1" diff --git a/test/extended/two_node/tnf_node_replacement.go b/test/extended/edge-topologies/tnf_node_replacement.go similarity index 99% rename from test/extended/two_node/tnf_node_replacement.go rename to test/extended/edge-topologies/tnf_node_replacement.go index fe6705f31168..0af5864f6738 100644 --- a/test/extended/two_node/tnf_node_replacement.go +++ b/test/extended/edge-topologies/tnf_node_replacement.go @@ -1,4 +1,4 @@ -package two_node +package edge_topologies import ( "context" @@ -16,10 +16,10 @@ import ( g "github.com/onsi/ginkgo/v2" o "github.com/onsi/gomega" configv1 "github.com/openshift/api/config/v1" - "github.com/openshift/origin/test/extended/two_node/utils" - "github.com/openshift/origin/test/extended/two_node/utils/apis" - "github.com/openshift/origin/test/extended/two_node/utils/core" - "github.com/openshift/origin/test/extended/two_node/utils/services" + "github.com/openshift/origin/test/extended/edge-topologies/utils" + "github.com/openshift/origin/test/extended/edge-topologies/utils/apis" + "github.com/openshift/origin/test/extended/edge-topologies/utils/core" + "github.com/openshift/origin/test/extended/edge-topologies/utils/services" exutil "github.com/openshift/origin/test/extended/util" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" @@ -81,7 +81,7 @@ const ( virshProvisioningBridge = "ostestpr" // Template paths (relative to test/extended/ - framework FixturePath will prefix automatically) - templateBaseDir = "testdata/two_node" + templateBaseDir = "testdata/edge-topologies" bmhTemplatePath = templateBaseDir + "/baremetalhost-template.yaml" machineTemplatePath = templateBaseDir + "/machine-template.yaml" diff --git a/test/extended/two_node/tnf_recovery.go b/test/extended/edge-topologies/tnf_recovery.go similarity index 98% rename from test/extended/two_node/tnf_recovery.go rename to test/extended/edge-topologies/tnf_recovery.go index 6b3c8c783642..3ff6b64bfd61 100644 --- a/test/extended/two_node/tnf_recovery.go +++ b/test/extended/edge-topologies/tnf_recovery.go @@ -1,4 +1,4 @@ -package two_node +package edge_topologies import ( "context" @@ -13,10 +13,10 @@ import ( o "github.com/onsi/gomega" v1 "github.com/openshift/api/config/v1" "github.com/openshift/origin/test/extended/etcd/helpers" - "github.com/openshift/origin/test/extended/two_node/utils" - "github.com/openshift/origin/test/extended/two_node/utils/apis" - "github.com/openshift/origin/test/extended/two_node/utils/core" - "github.com/openshift/origin/test/extended/two_node/utils/services" + "github.com/openshift/origin/test/extended/edge-topologies/utils" + "github.com/openshift/origin/test/extended/edge-topologies/utils/apis" + "github.com/openshift/origin/test/extended/edge-topologies/utils/core" + "github.com/openshift/origin/test/extended/edge-topologies/utils/services" exutil "github.com/openshift/origin/test/extended/util" "github.com/pkg/errors" "go.etcd.io/etcd/api/v3/etcdserverpb" diff --git a/test/extended/two_node/tnf_topology.go b/test/extended/edge-topologies/tnf_topology.go similarity index 98% rename from test/extended/two_node/tnf_topology.go rename to test/extended/edge-topologies/tnf_topology.go index dc1b684c8484..861cb75555cd 100644 --- a/test/extended/two_node/tnf_topology.go +++ b/test/extended/edge-topologies/tnf_topology.go @@ -1,4 +1,4 @@ -package two_node +package edge_topologies import ( "context" @@ -8,7 +8,7 @@ import ( g "github.com/onsi/ginkgo/v2" o "github.com/onsi/gomega" v1 "github.com/openshift/api/config/v1" - "github.com/openshift/origin/test/extended/two_node/utils" + "github.com/openshift/origin/test/extended/edge-topologies/utils" exutil "github.com/openshift/origin/test/extended/util" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/apis/meta/v1/unstructured" diff --git a/test/extended/two_node/utils/apis/baremetalhost.go b/test/extended/edge-topologies/utils/apis/baremetalhost.go similarity index 97% rename from test/extended/two_node/utils/apis/baremetalhost.go rename to test/extended/edge-topologies/utils/apis/baremetalhost.go index 342fde44e17d..9eb43e7fab22 100644 --- a/test/extended/two_node/utils/apis/baremetalhost.go +++ b/test/extended/edge-topologies/utils/apis/baremetalhost.go @@ -7,8 +7,8 @@ import ( "strings" metal3v1alpha1 "github.com/metal3-io/baremetal-operator/apis/metal3.io/v1alpha1" - "github.com/openshift/origin/test/extended/two_node/utils" - "github.com/openshift/origin/test/extended/two_node/utils/core" + "github.com/openshift/origin/test/extended/edge-topologies/utils" + "github.com/openshift/origin/test/extended/edge-topologies/utils/core" exutil "github.com/openshift/origin/test/extended/util" corev1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/extended/two_node/utils/apis/csr.go b/test/extended/edge-topologies/utils/apis/csr.go similarity index 100% rename from test/extended/two_node/utils/apis/csr.go rename to test/extended/edge-topologies/utils/apis/csr.go diff --git a/test/extended/two_node/utils/common.go b/test/extended/edge-topologies/utils/common.go similarity index 100% rename from test/extended/two_node/utils/common.go rename to test/extended/edge-topologies/utils/common.go diff --git a/test/extended/two_node/utils/core/file.go b/test/extended/edge-topologies/utils/core/file.go similarity index 98% rename from test/extended/two_node/utils/core/file.go rename to test/extended/edge-topologies/utils/core/file.go index 6d83ae84afd0..b25a98f4d2a5 100644 --- a/test/extended/two_node/utils/core/file.go +++ b/test/extended/edge-topologies/utils/core/file.go @@ -75,7 +75,7 @@ func CreateFromTemplate(templatePath string, replacements map[string]string) (st } // Validate template path to prevent directory traversal attacks - const allowedTemplateDir = "test/extended/testdata/two_node/" + const allowedTemplateDir = "test/extended/testdata/edge-topologies/" if err := ValidateSafePath(normalizedPath, allowedTemplateDir); err != nil { return "", nil, WrapError("validate template path", templatePath, err) } @@ -141,7 +141,7 @@ func CreateResourceFromTemplate(oc *exutil.CLI, templatePath string, replacement } // Validate template path to prevent directory traversal attacks - const allowedTemplateDir = "test/extended/testdata/two_node/" + const allowedTemplateDir = "test/extended/testdata/edge-topologies/" if err := ValidateSafePath(normalizedPath, allowedTemplateDir); err != nil { return WrapError("validate template path", templatePath, err) } diff --git a/test/extended/two_node/utils/core/retry.go b/test/extended/edge-topologies/utils/core/retry.go similarity index 100% rename from test/extended/two_node/utils/core/retry.go rename to test/extended/edge-topologies/utils/core/retry.go diff --git a/test/extended/two_node/utils/core/ssh.go b/test/extended/edge-topologies/utils/core/ssh.go similarity index 100% rename from test/extended/two_node/utils/core/ssh.go rename to test/extended/edge-topologies/utils/core/ssh.go diff --git a/test/extended/two_node/utils/core/validation.go b/test/extended/edge-topologies/utils/core/validation.go similarity index 99% rename from test/extended/two_node/utils/core/validation.go rename to test/extended/edge-topologies/utils/core/validation.go index a547dd34f685..3457e297eca2 100644 --- a/test/extended/two_node/utils/core/validation.go +++ b/test/extended/edge-topologies/utils/core/validation.go @@ -112,7 +112,7 @@ func ValidateSSHKeyPermissions(keyPath string) error { // ValidateSafePath ensures path is within baseDir (prevents path traversal attacks). // -// if err := ValidateSafePath(templatePath, "test/extended/testdata/two_node/"); err != nil { return err } +// if err := ValidateSafePath(templatePath, "test/extended/testdata/edge-topologies/"); err != nil { return err } func ValidateSafePath(path, baseDir string) error { if strings.Contains(path, "..") { return ValidationError("path", fmt.Sprintf("contains directory traversal: %s", path)) diff --git a/test/extended/two_node/utils/services/etcd.go b/test/extended/edge-topologies/utils/services/etcd.go similarity index 99% rename from test/extended/two_node/utils/services/etcd.go rename to test/extended/edge-topologies/utils/services/etcd.go index 7bd8b17f7dff..de23d283a67d 100644 --- a/test/extended/two_node/utils/services/etcd.go +++ b/test/extended/edge-topologies/utils/services/etcd.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/openshift/origin/test/extended/two_node/utils/core" + "github.com/openshift/origin/test/extended/edge-topologies/utils/core" exutil "github.com/openshift/origin/test/extended/util" batchv1 "k8s.io/api/batch/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" diff --git a/test/extended/two_node/utils/services/hypervisor.go b/test/extended/edge-topologies/utils/services/hypervisor.go similarity index 98% rename from test/extended/two_node/utils/services/hypervisor.go rename to test/extended/edge-topologies/utils/services/hypervisor.go index 1188591a09f4..38df2e52868e 100644 --- a/test/extended/two_node/utils/services/hypervisor.go +++ b/test/extended/edge-topologies/utils/services/hypervisor.go @@ -6,7 +6,7 @@ import ( "strings" g "github.com/onsi/ginkgo/v2" - "github.com/openshift/origin/test/extended/two_node/utils/core" + "github.com/openshift/origin/test/extended/edge-topologies/utils/core" "k8s.io/klog/v2" ) diff --git a/test/extended/two_node/utils/services/libvirt.go b/test/extended/edge-topologies/utils/services/libvirt.go similarity index 99% rename from test/extended/two_node/utils/services/libvirt.go rename to test/extended/edge-topologies/utils/services/libvirt.go index 3847934c8559..0dffee6c7019 100644 --- a/test/extended/two_node/utils/services/libvirt.go +++ b/test/extended/edge-topologies/utils/services/libvirt.go @@ -7,7 +7,7 @@ import ( "strings" "time" - "github.com/openshift/origin/test/extended/two_node/utils/core" + "github.com/openshift/origin/test/extended/edge-topologies/utils/core" "k8s.io/klog/v2" e2e "k8s.io/kubernetes/test/e2e/framework" ) diff --git a/test/extended/two_node/utils/services/pacemaker.go b/test/extended/edge-topologies/utils/services/pacemaker.go similarity index 99% rename from test/extended/two_node/utils/services/pacemaker.go rename to test/extended/edge-topologies/utils/services/pacemaker.go index 20c59c174ca0..9a280d58cff9 100644 --- a/test/extended/two_node/utils/services/pacemaker.go +++ b/test/extended/edge-topologies/utils/services/pacemaker.go @@ -6,7 +6,7 @@ import ( "fmt" "time" - "github.com/openshift/origin/test/extended/two_node/utils/core" + "github.com/openshift/origin/test/extended/edge-topologies/utils/core" "k8s.io/klog/v2" e2e "k8s.io/kubernetes/test/e2e/framework" ) diff --git a/test/extended/include.go b/test/extended/include.go index 002f778bfda1..21bb78e0c1c3 100644 --- a/test/extended/include.go +++ b/test/extended/include.go @@ -56,7 +56,7 @@ import ( _ "github.com/openshift/origin/test/extended/storage" _ "github.com/openshift/origin/test/extended/tbr_health" _ "github.com/openshift/origin/test/extended/templates" - _ "github.com/openshift/origin/test/extended/two_node" + _ "github.com/openshift/origin/test/extended/edge-topologies" _ "github.com/openshift/origin/test/extended/user" _ "github.com/openshift/origin/test/extended/windows" ) diff --git a/test/extended/testdata/two_node/baremetalhost-template.yaml b/test/extended/testdata/edge-topologies/baremetalhost-template.yaml similarity index 100% rename from test/extended/testdata/two_node/baremetalhost-template.yaml rename to test/extended/testdata/edge-topologies/baremetalhost-template.yaml diff --git a/test/extended/testdata/two_node/machine-template.yaml b/test/extended/testdata/edge-topologies/machine-template.yaml similarity index 100% rename from test/extended/testdata/two_node/machine-template.yaml rename to test/extended/testdata/edge-topologies/machine-template.yaml