Update all import paths

auniyal61 · openshift-merge-bot[bot] · commit 5701277f8fe2 · 2026-03-24T18:54:05.000Z
diff --git a/cmd/main.go b/cmd/main.go
@@ -38,8 +38,8 @@ import (
 	metricsserver "sigs.k8s.io/controller-runtime/pkg/metrics/server"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
-	"github.com/openstack-k8s-operators/nova-operator/internal/controller"
-	webhookv1beta1 "github.com/openstack-k8s-operators/nova-operator/internal/webhook/v1beta1"
+	"github.com/openstack-k8s-operators/nova-operator/internal/controller/nova"
+	webhookv1beta1 "github.com/openstack-k8s-operators/nova-operator/internal/webhook/nova/v1beta1"
 	// +kubebuilder:scaffold:imports
 	networkv1 "github.com/k8snetworkplumbingwg/network-attachment-definition-client/pkg/apis/k8s.cni.cncf.io/v1"
 	memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
@@ -48,7 +48,7 @@ import (
 	keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/operator"
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/client-go/kubernetes"
diff --git a/internal/controller/nova/common.go b/internal/controller/nova/common.go
@@ -40,7 +40,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log"
 
 	memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/internal/nova"
 
 	gophercloud "github.com/gophercloud/gophercloud/v2"
diff --git a/internal/controller/nova/nova_controller.go b/internal/controller/nova/nova_controller.go
@@ -54,9 +54,9 @@ import (
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	util "github.com/openstack-k8s-operators/lib-common/modules/common/util"
 
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/internal/nova"
-	"github.com/openstack-k8s-operators/nova-operator/internal/novaapi"
+	"github.com/openstack-k8s-operators/nova-operator/internal/nova/api"
 
 	memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
 	rabbitmqv1 "github.com/openstack-k8s-operators/infra-operator/apis/rabbitmq/v1beta1"
diff --git a/internal/controller/nova/novaapi_controller.go b/internal/controller/nova/novaapi_controller.go
@@ -53,9 +53,9 @@ import (
 
 	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/internal/nova"
-	"github.com/openstack-k8s-operators/nova-operator/internal/novaapi"
+	"github.com/openstack-k8s-operators/nova-operator/internal/nova/api"
 
 	k8s_errors "k8s.io/apimachinery/pkg/api/errors"
 )
diff --git a/internal/controller/nova/novacell_controller.go b/internal/controller/nova/novacell_controller.go
@@ -46,7 +46,7 @@ import (
 	util "github.com/openstack-k8s-operators/lib-common/modules/common/util"
 
 	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 )
 
 // NovaCellReconciler reconciles a NovaCell object
diff --git a/internal/controller/nova/novacompute_controller.go b/internal/controller/nova/novacompute_controller.go
@@ -47,9 +47,9 @@ import (
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	util "github.com/openstack-k8s-operators/lib-common/modules/common/util"
 
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/internal/nova"
-	"github.com/openstack-k8s-operators/nova-operator/internal/novacompute"
+	"github.com/openstack-k8s-operators/nova-operator/internal/nova/compute"
 
 	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	k8s_errors "k8s.io/apimachinery/pkg/api/errors"
diff --git a/internal/controller/nova/novaconductor_controller.go b/internal/controller/nova/novaconductor_controller.go
@@ -53,8 +53,8 @@ import (
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	util "github.com/openstack-k8s-operators/lib-common/modules/common/util"
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
-	"github.com/openstack-k8s-operators/nova-operator/internal/novaconductor"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
+	"github.com/openstack-k8s-operators/nova-operator/internal/nova/conductor"
 )
 
 // NovaConductorReconciler reconciles a NovaConductor object
diff --git a/internal/controller/nova/novametadata_controller.go b/internal/controller/nova/novametadata_controller.go
@@ -53,9 +53,9 @@ import (
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	util "github.com/openstack-k8s-operators/lib-common/modules/common/util"
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/internal/nova"
-	"github.com/openstack-k8s-operators/nova-operator/internal/novametadata"
+	"github.com/openstack-k8s-operators/nova-operator/internal/nova/metadata"
 	k8s_errors "k8s.io/apimachinery/pkg/api/errors"
 )
 
diff --git a/internal/controller/nova/novanovncproxy_controller.go b/internal/controller/nova/novanovncproxy_controller.go
@@ -50,9 +50,9 @@ import (
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
 	util "github.com/openstack-k8s-operators/lib-common/modules/common/util"
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/internal/nova"
-	"github.com/openstack-k8s-operators/nova-operator/internal/novncproxy"
+	"github.com/openstack-k8s-operators/nova-operator/internal/nova/novncproxy"
 	k8s_errors "k8s.io/apimachinery/pkg/api/errors"
 )
 
diff --git a/internal/controller/nova/novascheduler_controller.go b/internal/controller/nova/novascheduler_controller.go
@@ -51,9 +51,9 @@ import (
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
 
 	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/internal/nova"
-	"github.com/openstack-k8s-operators/nova-operator/internal/novascheduler"
+	"github.com/openstack-k8s-operators/nova-operator/internal/nova/scheduler"
 )
 
 // NovaSchedulerReconciler reconciles a NovaScheduler object
diff --git a/internal/nova/api/deployment.go b/internal/nova/api/deployment.go
@@ -26,7 +26,7 @@ import (
 	env "github.com/openstack-k8s-operators/lib-common/modules/common/env"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/internal/nova"
 
 	appsv1 "k8s.io/api/apps/v1"
diff --git a/internal/nova/celldelete.go b/internal/nova/celldelete.go
@@ -8,7 +8,7 @@ import (
 	"k8s.io/utils/ptr"
 
 	"github.com/openstack-k8s-operators/lib-common/modules/common/env"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 )
 
 // CellDeleteJob creates a Kubernetes job to delete a Nova cell
diff --git a/internal/nova/cellmapping.go b/internal/nova/cellmapping.go
@@ -7,7 +7,7 @@ import (
 	"k8s.io/utils/ptr"
 
 	"github.com/openstack-k8s-operators/lib-common/modules/common/env"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 )
 
 // CellMappingJob creates a Kubernetes job to create Nova cell mappings
diff --git a/internal/nova/compute/deployment.go b/internal/nova/compute/deployment.go
@@ -21,7 +21,7 @@ import (
 	common "github.com/openstack-k8s-operators/lib-common/modules/common"
 	affinity "github.com/openstack-k8s-operators/lib-common/modules/common/affinity"
 	env "github.com/openstack-k8s-operators/lib-common/modules/common/env"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/internal/nova"
 
 	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
diff --git a/internal/nova/conductor/dbpurge.go b/internal/nova/conductor/dbpurge.go
@@ -12,7 +12,7 @@ import (
 
 	memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/env"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/internal/nova"
 )
 
diff --git a/internal/nova/conductor/dbsync.go b/internal/nova/conductor/dbsync.go
@@ -17,7 +17,7 @@ limitations under the License.
 package novaconductor
 
 import (
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/internal/nova"
 
 	env "github.com/openstack-k8s-operators/lib-common/modules/common/env"
diff --git a/internal/nova/conductor/deployment.go b/internal/nova/conductor/deployment.go
@@ -22,7 +22,7 @@ import (
 	common "github.com/openstack-k8s-operators/lib-common/modules/common"
 	affinity "github.com/openstack-k8s-operators/lib-common/modules/common/affinity"
 	env "github.com/openstack-k8s-operators/lib-common/modules/common/env"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/internal/nova"
 
 	appsv1 "k8s.io/api/apps/v1"
diff --git a/internal/nova/host_discover.go b/internal/nova/host_discover.go
@@ -17,7 +17,7 @@ package nova
 
 import (
 	env "github.com/openstack-k8s-operators/lib-common/modules/common/env"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
diff --git a/internal/nova/metadata/deployment.go b/internal/nova/metadata/deployment.go
@@ -24,7 +24,7 @@ import (
 	common "github.com/openstack-k8s-operators/lib-common/modules/common"
 	affinity "github.com/openstack-k8s-operators/lib-common/modules/common/affinity"
 	env "github.com/openstack-k8s-operators/lib-common/modules/common/env"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/internal/nova"
 
 	appsv1 "k8s.io/api/apps/v1"
diff --git a/internal/nova/novncproxy/deployment.go b/internal/nova/novncproxy/deployment.go
@@ -22,7 +22,7 @@ import (
 	common "github.com/openstack-k8s-operators/lib-common/modules/common"
 	affinity "github.com/openstack-k8s-operators/lib-common/modules/common/affinity"
 	env "github.com/openstack-k8s-operators/lib-common/modules/common/env"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/internal/nova"
 
 	appsv1 "k8s.io/api/apps/v1"
diff --git a/internal/nova/scheduler/deployment.go b/internal/nova/scheduler/deployment.go
@@ -21,7 +21,7 @@ import (
 	common "github.com/openstack-k8s-operators/lib-common/modules/common"
 	affinity "github.com/openstack-k8s-operators/lib-common/modules/common/affinity"
 	env "github.com/openstack-k8s-operators/lib-common/modules/common/env"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	"github.com/openstack-k8s-operators/nova-operator/internal/nova"
 
 	memcachedv1 "github.com/openstack-k8s-operators/infra-operator/apis/memcached/v1beta1"
diff --git a/internal/webhook/nova/v1beta1/nova_webhook.go b/internal/webhook/nova/v1beta1/nova_webhook.go
@@ -28,7 +28,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	novav1beta1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1beta1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 )
 
 // nolint:unused
diff --git a/internal/webhook/nova/v1beta1/novaapi_webhook.go b/internal/webhook/nova/v1beta1/novaapi_webhook.go
@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	novav1beta1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1beta1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 )
 
 // nolint:unused
diff --git a/internal/webhook/nova/v1beta1/novacell_webhook.go b/internal/webhook/nova/v1beta1/novacell_webhook.go
@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	novav1beta1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1beta1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 )
 
 // nolint:unused
diff --git a/internal/webhook/nova/v1beta1/novacompute_webhook.go b/internal/webhook/nova/v1beta1/novacompute_webhook.go
@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	novav1beta1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1beta1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 )
 
 // nolint:unused
diff --git a/internal/webhook/nova/v1beta1/novaconductor_webhook.go b/internal/webhook/nova/v1beta1/novaconductor_webhook.go
@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	novav1beta1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1beta1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 )
 
 // nolint:unused
diff --git a/internal/webhook/nova/v1beta1/novametadata_webhook.go b/internal/webhook/nova/v1beta1/novametadata_webhook.go
@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	novav1beta1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1beta1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 )
 
 // nolint:unused
diff --git a/internal/webhook/nova/v1beta1/novanovncproxy_webhook.go b/internal/webhook/nova/v1beta1/novanovncproxy_webhook.go
@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	novav1beta1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1beta1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 )
 
 // nolint:unused
diff --git a/internal/webhook/nova/v1beta1/novascheduler_webhook.go b/internal/webhook/nova/v1beta1/novascheduler_webhook.go
@@ -27,7 +27,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
 
-	novav1beta1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1beta1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 )
 
 // nolint:unused
diff --git a/test/functional/base_test.go b/test/functional/base_test.go
@@ -36,7 +36,7 @@ import (
 
 	keystonev1 "github.com/openstack-k8s-operators/keystone-operator/api/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
diff --git a/test/functional/nova_compute_ironic_controller_test.go b/test/functional/nova_compute_ironic_controller_test.go
@@ -32,7 +32,7 @@ import (
 
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 )
 
 var _ = Describe("NovaCompute controller", func() {
diff --git a/test/functional/nova_controller_test.go b/test/functional/nova_controller_test.go
@@ -35,8 +35,8 @@ import (
 
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
-	controllers "github.com/openstack-k8s-operators/nova-operator/internal/controller"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
+	controllers "github.com/openstack-k8s-operators/nova-operator/internal/controller/nova"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 
diff --git a/test/functional/nova_metadata_controller_test.go b/test/functional/nova_metadata_controller_test.go
@@ -36,7 +36,7 @@ import (
 	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 )
 
 var _ = Describe("NovaMetadata controller", func() {
diff --git a/test/functional/nova_multicell_test.go b/test/functional/nova_multicell_test.go
@@ -26,8 +26,8 @@ import (
 
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
-	controllers "github.com/openstack-k8s-operators/nova-operator/internal/controller"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
+	controllers "github.com/openstack-k8s-operators/nova-operator/internal/controller/nova"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/test/functional/nova_novncproxy_test.go b/test/functional/nova_novncproxy_test.go
@@ -29,7 +29,7 @@ import (
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/test/functional/nova_reconfiguration_test.go b/test/functional/nova_reconfiguration_test.go
@@ -31,7 +31,7 @@ import (
 	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/test/functional/nova_scheduler_test.go b/test/functional/nova_scheduler_test.go
@@ -30,7 +30,7 @@ import (
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/test/functional/novaapi_controller_test.go b/test/functional/novaapi_controller_test.go
@@ -32,7 +32,7 @@ import (
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
diff --git a/test/functional/novacell_controller_test.go b/test/functional/novacell_controller_test.go
@@ -28,8 +28,8 @@ import (
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/service"
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
-	controllers "github.com/openstack-k8s-operators/nova-operator/internal/controller"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
+	controllers "github.com/openstack-k8s-operators/nova-operator/internal/controller/nova"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/utils/ptr"
diff --git a/test/functional/novaconductor_controller_test.go b/test/functional/novaconductor_controller_test.go
@@ -30,7 +30,7 @@ import (
 	condition "github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/util"
 	mariadbv1 "github.com/openstack-k8s-operators/mariadb-operator/api/v1beta1"
-	novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"
+	novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"
diff --git a/test/functional/suite_test.go b/test/functional/suite_test.go

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ import (`
`46`	`46`	`util "github.com/openstack-k8s-operators/lib-common/modules/common/util"`
`47`	`47`
`48`	`48`	`topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"`
`49`		`- novav1 "github.com/openstack-k8s-operators/nova-operator/api/v1beta1"`
	`49`	`+ novav1 "github.com/openstack-k8s-operators/nova-operator/api/nova/v1beta1"`
`50`	`50`	`)`
`51`	`51`
`52`	`52`	`// NovaCellReconciler reconciles a NovaCell object`