Improvements

Signed-off-by: Elena Gershkovich <elenage@il.ibm.com>

Author: ELENAGER

api/v1alpha1/drplacementcontrol_types.go

@@ -167,14 +167,8 @@ type PlacementDecision struct {
 	ClusterNamespace string `json:"clusterNamespace,omitempty"`
 }
 
-// ProtectedPVCsList defines a group of ProtectedPVCs
-type ProtectedPVCsList struct {
-	// Name of the VolRep/PVC resource
-	//+optional
-	Name string `json:"name,omitempty"`
-
-	// All the protected pvcs
-	ProtectedPVCs []string `json:"protectedpvcs,omitempty"`
+type Groups struct {
+	Grouped []string `json:"grouped,omitempty"`
 }
 
 // VRGResourceMeta represents the VRG resource.
@@ -197,7 +191,7 @@ type VRGResourceMeta struct {
 
 	// List of CGs that are protected by the VRG resource
 	//+optional
-	ProtectedCGs []ProtectedPVCsList `json:"protectedcgs,omitempty"`
+	PVCGroups []Groups `json:"pvcgroups,omitempty"`
 
 	// ResourceVersion is a value used to identify the version of the
 	// VRG resource object

api/v1alpha1/volumereplicationgroup_types.go

@@ -307,14 +307,6 @@ type ProtectedPVC struct {
 	VolumeMode *corev1.PersistentVolumeMode `json:"volumeMode,omitempty"`
 }
 
-// ProtectedCG defines a group of ProtectedPVCs
-type ProtectedCG struct {
-	ProtectedPVC `json:",inline"`
-
-	// List the protected pvcs names
-	PVCs []string `json:"protectedPVCs,omitempty"`
-}
-
 type KubeObjectsCaptureIdentifier struct {
 	Number int64 `json:"number"`
 	//+nullable
@@ -333,9 +325,11 @@ type KubeObjectProtectionStatus struct {
 type VolumeReplicationGroupStatus struct {
 	State State `json:"state,omitempty"`
 
-	// One of ProtectedPVCs or ProtectedCGs must be set
+	// All the protected pvcs
 	ProtectedPVCs []ProtectedPVC `json:"protectedPVCs,omitempty"`
-	ProtectedCGs  []ProtectedCG  `json:"protectedCGs,omitempty"`
+	// List of CGs that are protected by the VRG resource
+	//+optional
+	PVCGroups []Groups `json:"pvcgroups,omitempty"`
 
 	// Conditions are the list of VRG's summary conditions and their status.
 	Conditions []metav1.Condition `json:"conditions,omitempty"`

api/v1alpha1/zz_generated.deepcopy.go

@@ -510,26 +510,21 @@ spec:
                         description: Namespace is the namespace of the Kubernetes
                           resource.
                         type: string
-                      protectedcgs:
+                      protectedpvcs:
+                        description: List of PVCs that are protected by the VRG resource
+                        items:
+                          type: string
+                        type: array
+                      pvcgroups:
                         description: List of CGs that are protected by the VRG resource
                         items:
-                          description: ProtectedPVCsList defines a group of ProtectedPVCs
                           properties:
-                            name:
-                              description: Name of the VolRep/PVC resource
-                              type: string
-                            protectedpvcs:
-                              description: All the protected pvcs
+                            grouped:
                               items:
                                 type: string
                               type: array
                           type: object
                         type: array
-                      protectedpvcs:
-                        description: List of PVCs that are protected by the VRG resource
-                        items:
-                          type: string
-                        type: array
                       resourceVersion:
                         description: |-
                           ResourceVersion is a value used to identify the version of the