diff --git a/ocp_resources/datavolume.py b/ocp_resources/datavolume.py index e7f4e16676..e1f6477606 100644 --- a/ocp_resources/datavolume.py +++ b/ocp_resources/datavolume.py @@ -253,9 +253,7 @@ def pvc(self): @property def scratch_pvc(self): scratch_pvc_prefix = ( - f"prime-{self.pvc.instance.metadata.uid}" - if self.pvc.use_populator - else self.name + self.pvc.prime_pvc.name if self.pvc.use_populator else self.name ) return PersistentVolumeClaim( name=f"{scratch_pvc_prefix}-scratch", diff --git a/ocp_resources/persistent_volume_claim.py b/ocp_resources/persistent_volume_claim.py index de5db04598..21e938ec59 100644 --- a/ocp_resources/persistent_volume_claim.py +++ b/ocp_resources/persistent_volume_claim.py @@ -117,3 +117,12 @@ def use_populator(self): ) == "true" ) + + @property + def prime_pvc(self): + if self.use_populator: + return PersistentVolumeClaim( + name=f"prime-{self.instance.metadata.uid}", + namespace=self.namespace, + client=self.client, + )