[
https://issues.apache.org/jira/browse/CLOUDSTACK-9368?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15265999#comment-15265999
]
ASF GitHub Bot commented on CLOUDSTACK-9368:
--------------------------------------------
Github user cristofolini commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1518#discussion_r61694862
--- Diff:
plugins/hypervisors/vmware/test/com/cloud/hypervisor/vmware/resource/VmwareResourceTest.java
---
@@ -117,4 +154,79 @@ public void testStartVm3dgpuEnabled() throws Exception{
verify(vmMo3dgpu).configureVm(any(VirtualMachineConfigSpec.class));
}
-}
+ //
---------------------------------------------------------------------------------------------------
+
+ @Test
+ public void testgetNfsVersionFromNfsTONull(){
+ assertFalse(_resource.getStorageNfsVersionFromNfsTO(null));
+ }
+
+ @Test
+ public void testgetNfsVersionFromNfsTONfsVersionNull(){
+
when(srcDataNfsTO.getNfsVersion()).thenReturn(NFS_VERSION_NOT_PRESENT);
+ assertFalse(_resource.getStorageNfsVersionFromNfsTO(srcDataNfsTO));
+ }
+
+ @Test
+ public void testgetNfsVersionFromNfsTONfsVersion(){
+ assertTrue(_resource.getStorageNfsVersionFromNfsTO(srcDataNfsTO));
+ }
+
+ //
---------------------------------------------------------------------------------------------------
+
+ @Test
+ public void testSetCurrentNfsVersionInProcessorAndHandler(){
+ _resource.setCurrentNfsVersionInProcessorAndHandler();
+ verify(storageHandler).reconfigureNfsVersion(any(Integer.class));
+ }
+
+ //
---------------------------------------------------------------------------------------------------
+
+ @Test
+ public void testExamineStorageSubSystemCommandNfsVersionNotPresent(){
+
when(srcDataNfsTO.getNfsVersion()).thenReturn(NFS_VERSION_NOT_PRESENT);
+ _resource.examineStorageSubSystemCommandNfsVersion(storageCmd);
+ verify(_resource,
never()).setCurrentNfsVersionInProcessorAndHandler();
+ }
+
+ @Test
+ public void testExamineStorageSubSystemCommandNfsVersion(){
+ _resource.examineStorageSubSystemCommandNfsVersion(storageCmd);
+ verify(_resource).setCurrentNfsVersionInProcessorAndHandler();
+ }
+
+ //
---------------------------------------------------------------------------------------------------
+
+ @Test
+ public void testStorageSetNfsVersion(){
--- End diff --
It does seem this test would work out better if it were to be split into
two. I'd recommend just testing out the two possibilities of execution for the
`checkStorageProcessorAndHandlerNfsVersionAttribute` method, one test for the
possibility that it will just return when the version is already set, and
another one where it should set the version if it isn't already. As for naming,
I'd recommend `checkStorageProcessorAndHandlerNfsVersionAttributeVersionNotSet`
and `checkStorageProcessorAndHandlerNfsVersionAttributeVersionSet`
respectively, but that's up to you, @nvazquez. :)
Separate tests are better in situations like this since they allow us to
determine in what case(s) a method is failing to execute properly a bit more
precisely.
> Fix for Support configurable NFS version for Secondary Storage mounts
> ---------------------------------------------------------------------
>
> Key: CLOUDSTACK-9368
> URL: https://issues.apache.org/jira/browse/CLOUDSTACK-9368
> Project: CloudStack
> Issue Type: Bug
> Security Level: Public(Anyone can view this level - this is the
> default.)
> Components: VMware
> Affects Versions: 4.9.0
> Reporter: Nicolas Vazquez
> Fix For: 4.9.0
>
>
> This issue address a problem introduced in
> [CLOUDSTACK-9252|https://issues.apache.org/jira/browse/CLOUDSTACK-9252] in
> which NFS version couldn't be changed after hosts resources were configured
> on startup (for hosts using `VmwareResource`), and as host parameters didn't
> include `nfs.version` key, it was set `null`.
> h4. Proposed solution
> In this proposed solution `nfsVersion` would be passed in `NfsTO` through
> `CopyCommand` to `VmwareResource`, who will check if NFS version is still
> configured or not. If not, it will use the one sent in the command and will
> set it to its storage processor and storage handler. After those setups, it
> will proceed executing command.
--
This message was sent by Atlassian JIRA
(v6.3.4#6332)
