From 6f1d08297b97a087fafd8196b290e74dee7792e3 Mon Sep 17 00:00:00 2001
From: raaizik <132667934+raaizik@users.noreply.github.com>
Date: Sun, 31 Mar 2024 16:12:43 +0300
Subject: [PATCH] fix

---
 api/v1alpha1/storageconsumer_types.go         |  4 ++--
 services/provider/interfaces/interfaces.go    |  4 ++--
 services/provider/pb/provider.pb.go           | 24 +++++++++----------
 services/provider/proto/provider.proto        |  7 +++---
 .../api/v4/v1alpha1/storageconsumer_types.go  |  4 ++--
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/api/v1alpha1/storageconsumer_types.go b/api/v1alpha1/storageconsumer_types.go
index 5f34b63625..8391700594 100644
--- a/api/v1alpha1/storageconsumer_types.go
+++ b/api/v1alpha1/storageconsumer_types.go
@@ -74,10 +74,10 @@ type ClientStatus struct {
 	OperatorVersion string `json:"operatorVersion"`
 	// ClusterID is the id of the openshift cluster
 	ClusterID string `json:"clusterId"`
-	// NamespacedName is the name and namespace of the StorageClient
-	NamespacedName string `json:"namespacedName"`
 	// ClusterName is the name of the openshift cluster
 	ClusterName string `json:"clusterName"`
+	// NamespacedName is the name and namespace of the StorageClient
+	NamespacedName string `json:"namespacedName"`
 }
 
 //+kubebuilder:object:root=true
diff --git a/services/provider/interfaces/interfaces.go b/services/provider/interfaces/interfaces.go
index b75e9f2636..fea569cd07 100644
--- a/services/provider/interfaces/interfaces.go
+++ b/services/provider/interfaces/interfaces.go
@@ -7,14 +7,14 @@ type StorageClientStatus interface {
 	GetPlatformVersion() string
 	GetOperatorVersion() string
 	GetClusterID() string
-	GetNamespacedName() string
 	GetClusterName() string
+	GetNamespacedName() string
 
 	SetPlatformVersion(string) StorageClientStatus
 	SetOperatorVersion(string) StorageClientStatus
 	SetClusterID(string) StorageClientStatus
-	SetNamespacedName(string) StorageClientStatus
 	SetClusterName(string) StorageClientStatus
+	SetNamespacedName(string) StorageClientStatus
 }
 
 type StorageClientOnboarding interface {
diff --git a/services/provider/pb/provider.pb.go b/services/provider/pb/provider.pb.go
index b0f74e4d02..08e4e4151c 100644
--- a/services/provider/pb/provider.pb.go
+++ b/services/provider/pb/provider.pb.go
@@ -866,10 +866,10 @@ type ReportStatusRequest struct {
 	ClientOperatorVersion string `protobuf:"bytes,3,opt,name=clientOperatorVersion,proto3" json:"clientOperatorVersion,omitempty"`
 	// clusterID is the id of the openshift cluster
 	ClusterID string `protobuf:"bytes,4,opt,name=clusterID,proto3" json:"clusterID,omitempty"`
-	// NamespacedName is the name and namespace of the StorageClient
-	NamespacedName string `protobuf:"bytes,5,opt,name=NamespacedName,proto3" json:"NamespacedName,omitempty"`
 	// clusterName is the name of the openshift cluster
-	ClusterName string `protobuf:"bytes,6,opt,name=clusterName,proto3" json:"clusterName,omitempty"`
+	ClusterName string `protobuf:"bytes,5,opt,name=clusterName,proto3" json:"clusterName,omitempty"`
+	// NamespacedName is the name and namespace of the StorageClient
+	NamespacedName string `protobuf:"bytes,6,opt,name=NamespacedName,proto3" json:"NamespacedName,omitempty"`
 }
 
 func (x *ReportStatusRequest) Reset() {
@@ -932,16 +932,16 @@ func (x *ReportStatusRequest) GetClusterID() string {
 	return ""
 }
 
-func (x *ReportStatusRequest) GetNamespacedName() string {
+func (x *ReportStatusRequest) GetClusterName() string {
 	if x != nil {
-		return x.NamespacedName
+		return x.ClusterName
 	}
 	return ""
 }
 
-func (x *ReportStatusRequest) GetClusterName() string {
+func (x *ReportStatusRequest) GetNamespacedName() string {
 	if x != nil {
-		return x.ClusterName
+		return x.NamespacedName
 	}
 	return ""
 }
@@ -1109,11 +1109,11 @@ var file_provider_proto_rawDesc = []byte{
 	0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x15, 0x63, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x4f, 0x70, 0x65,
 	0x72, 0x61, 0x74, 0x6f, 0x72, 0x56, 0x65, 0x72, 0x73, 0x69, 0x6f, 0x6e, 0x12, 0x1c, 0x0a, 0x09,
 	0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52,
-	0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x44, 0x12, 0x26, 0x0a, 0x0e, 0x4e, 0x61,
-	0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01,
-	0x28, 0x09, 0x52, 0x0e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x64, 0x4e, 0x61,
-	0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d,
-	0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72,
+	0x09, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x49, 0x44, 0x12, 0x20, 0x0a, 0x0b, 0x63, 0x6c,
+	0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52,
+	0x0b, 0x63, 0x6c, 0x75, 0x73, 0x74, 0x65, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x26, 0x0a, 0x0e,
+	0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x06,
+	0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x4e, 0x61, 0x6d, 0x65, 0x73, 0x70, 0x61, 0x63, 0x65, 0x64,
 	0x4e, 0x61, 0x6d, 0x65, 0x22, 0x5a, 0x0a, 0x14, 0x52, 0x65, 0x70, 0x6f, 0x72, 0x74, 0x53, 0x74,
 	0x61, 0x74, 0x75, 0x73, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x42, 0x0a, 0x1c,
 	0x64, 0x65, 0x73, 0x69, 0x72, 0x65, 0x64, 0x43, 0x6c, 0x69, 0x65, 0x6e, 0x74, 0x4f, 0x70, 0x65,
diff --git a/services/provider/proto/provider.proto b/services/provider/proto/provider.proto
index af764070ba..14c5b88e02 100644
--- a/services/provider/proto/provider.proto
+++ b/services/provider/proto/provider.proto
@@ -161,10 +161,11 @@ message ReportStatusRequest{
     string clientOperatorVersion = 3;
     // clusterID is the id of the openshift cluster
     string clusterID = 4;
-    // NamespacedName is the name and namespace of the StorageClient
-    string NamespacedName = 5;
     // clusterName is the name of the openshift cluster
-    string clusterName = 6;
+    string clusterName = 5;
+    // NamespacedName is the name and namespace of the StorageClient
+    string NamespacedName = 6;
+
 }
 
 message ReportStatusResponse{
diff --git a/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1/storageconsumer_types.go b/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1/storageconsumer_types.go
index 5f34b63625..8391700594 100644
--- a/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1/storageconsumer_types.go
+++ b/vendor/github.com/red-hat-storage/ocs-operator/api/v4/v1alpha1/storageconsumer_types.go
@@ -74,10 +74,10 @@ type ClientStatus struct {
 	OperatorVersion string `json:"operatorVersion"`
 	// ClusterID is the id of the openshift cluster
 	ClusterID string `json:"clusterId"`
-	// NamespacedName is the name and namespace of the StorageClient
-	NamespacedName string `json:"namespacedName"`
 	// ClusterName is the name of the openshift cluster
 	ClusterName string `json:"clusterName"`
+	// NamespacedName is the name and namespace of the StorageClient
+	NamespacedName string `json:"namespacedName"`
 }
 
 //+kubebuilder:object:root=true