Merge pull request #7205 from rawagner/vmt_clone_boot

Show 'Clone and boot' if VMT disk will be cloned
openshift · Nov 25, 2020 · c3a6a76 · c3a6a76
2 parents e20029f + c98f4ba
commit c3a6a76
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 18 deletions.
diff --git a/frontend/packages/kubevirt-plugin/locales/en/kubevirt-plugin.json b/frontend/packages/kubevirt-plugin/locales/en/kubevirt-plugin.json
@@ -196,7 +196,7 @@
   "No Active Users": "No Active Users",
   "Pending changes": "Pending changes",
   "No virtual machines found": "No virtual machines found",
-  "See the <1>templates tab</1> to quickly create a virtual machine from the available templates.": "See the <1>templates tab</1> to quickly create a virtual machine from the available templates.",
+  "See the <2>templates tab</2> to quickly create a virtual machine from the available templates.": "See the <2>templates tab</2> to quickly create a virtual machine from the available templates.",
   "Create virtual machine": "Create virtual machine",
   "Virtual Machine Instance {{name}}": "Virtual Machine Instance {{name}}",
   "Consider using a Virtual Machine that will provide additional management capabilities to a VirtualMachineInstance inside the cluster.": "Consider using a Virtual Machine that will provide additional management capabilities to a VirtualMachineInstance inside the cluster.",

diff --git a/frontend/packages/kubevirt-plugin/src/components/create-vm/forms/create-vm-form.tsx b/frontend/packages/kubevirt-plugin/src/components/create-vm/forms/create-vm-form.tsx
@@ -177,6 +177,7 @@ export const CreateVMForm: React.FC<CreateVMFormProps> = ({
             name={customSource.pvcName?.value}
             namespace={customSource.pvcNamespace?.value}
             isCDRom={cdRom}
+            clone
           />
         );
         break;

diff --git a/frontend/packages/kubevirt-plugin/src/components/vm-templates/vm-template-source.tsx b/frontend/packages/kubevirt-plugin/src/components/vm-templates/vm-template-source.tsx
@@ -94,11 +94,14 @@ const DeleteSourceButton: React.FC<DeleteSourceButtonProps> = ({ template, sourc
 type ContainerSourceProps = {
   container: string;
   isCDRom: boolean;
+  clone?: boolean;
 };
 
-export const ContainerSource: React.FC<ContainerSourceProps> = ({ container, isCDRom }) => (
+export const ContainerSource: React.FC<ContainerSourceProps> = ({ container, isCDRom, clone }) => (
   <Stack>
-    <StackItem className="text-secondary">Boot from {isCDRom ? 'CD-ROM' : 'disk'}</StackItem>
+    <StackItem className="text-secondary">
+      {clone ? 'Clone and boot' : 'Boot'} from {isCDRom ? 'CD-ROM' : 'disk'}
+    </StackItem>
     <StackItem>Container {container}</StackItem>
   </Stack>
 );
@@ -121,11 +124,14 @@ type PVCSourceProps = {
   name: string;
   namespace: string;
   isCDRom: boolean;
+  clone?: boolean;
 };
 
-export const PVCSource: React.FC<PVCSourceProps> = ({ name, namespace, isCDRom }) => (
+export const PVCSource: React.FC<PVCSourceProps> = ({ name, namespace, isCDRom, clone }) => (
   <Stack>
-    <StackItem className="text-secondary">Boot from {isCDRom ? 'CD-ROM' : 'disk'}</StackItem>
+    <StackItem className="text-secondary">
+      {clone ? 'Clone and boot' : 'Boot'} from {isCDRom ? 'CD-ROM' : 'disk'}
+    </StackItem>
     <StackItem>
       <ResourceLink kind={PersistentVolumeClaimModel.kind} name={name} namespace={namespace} />
     </StackItem>
@@ -161,6 +167,14 @@ export const SourceDescription: React.FC<SourceDescriptionProps> = ({ sourceStat
   const { pvc, source, container, dvTemplate, pxe, isCDRom } = sourceStatus;
   switch (source) {
     case SOURCE_TYPE.BASE_IMAGE:
+      return (
+        <PVCSource
+          name={pvc.metadata.name}
+          namespace={pvc.metadata.namespace}
+          isCDRom={isCDRom}
+          clone
+        />
+      );
     case SOURCE_TYPE.PVC:
     case SOURCE_TYPE.DATA_VOLUME:
       return (
@@ -184,6 +198,7 @@ export const SourceDescription: React.FC<SourceDescriptionProps> = ({ sourceStat
               name={dvWrapper.getPesistentVolumeClaimName()}
               namespace={dvWrapper.getPesistentVolumeClaimNamespace()}
               isCDRom={isCDRom}
+              clone
             />
           );
         default:

diff --git a/frontend/packages/kubevirt-plugin/src/components/vms/vm.tsx b/frontend/packages/kubevirt-plugin/src/components/vms/vm.tsx
@@ -193,8 +193,11 @@ const VMListEmpty: React.FC = () => {
       </Title>
       <EmptyStateBody>
         <Trans ns="kubevirt-plugin">
-          See the <Link to={`${location.pathname}/templates`}>templates tab</Link> to quickly create
-          a virtual machine from the available templates.
+          See the{' '}
+          <Link to={`${location.pathname}${location.pathname.endsWith('/') ? '' : '/'}templates`}>
+            templates tab
+          </Link>{' '}
+          to quickly create a virtual machine from the available templates.
         </Trans>
       </EmptyStateBody>
       <Button

diff --git a/frontend/packages/kubevirt-plugin/src/selectors/vm-template/advanced.ts b/frontend/packages/kubevirt-plugin/src/selectors/vm-template/advanced.ts
@@ -152,20 +152,13 @@ export const getTemplateSizeRequirement = (
         ? convertToBaseValue(customSource.pvcSize?.value)
         : convertToBaseValue(`${customSource.size?.value}${customSource.size?.value.unit}`);
     isCDRom = customSource.cdRom?.value;
-  } else if (
-    isCommonTemplate(template) &&
-    !isTemplateSourceError(templateSource) &&
-    templateSource?.pvc
-  ) {
+  } else if (!isTemplateSourceError(templateSource) && templateSource?.pvc) {
     sourceSize = convertToBaseValue(templateSource.pvc.spec.resources.requests.storage);
     isCDRom =
+      isCommonTemplate(template) &&
       (templateSource.dataVolume || templateSource.pvc)?.metadata.labels?.[LABEL_CDROM_SOURCE] ===
-      'true';
-  } else if (
-    !isCommonTemplate(template) &&
-    !isTemplateSourceError(templateSource) &&
-    templateSource.dvTemplate
-  ) {
+        'true';
+  } else if (!isTemplateSourceError(templateSource) && templateSource.dvTemplate) {
     sourceSize = convertToBaseValue(getDataVolumeStorageSize(templateSource.dvTemplate));
   }