Merge pull request #1361 from nvazquez/bothgoals

CLOUDSTACK-9252: Support configurable NFS version for Secondary Storage mountsJIRA Ticket: https://issues.apache.org/jira/browse/CLOUDSTACK-9252

### Description of the problem
After starting secondary storage VM, secondary storage tries to be mounted but fails with error: <code>Protocol family not supported</code>

It was found out that adding <code>-o vers=X</code> to mount command it would work, where <code>X</code> is the desired NFS version to use.
If it is desired to mount a store with a specific NFS version, it has passed in <code>image_store_details</code> table for a store with id <code>Y</code> as a property:

| store_id| name| value |
|:-------------:|:-------------:|:-------------:|
|Y|nfs.version|X (e.g. 3)|
Where X stands for NFS version

* pr/1361:
  CLOUDSTACK-9252: Last refactor, passing nfs version to ssvm
  CLOUDSTACK-9252: Add missing licence header
  CLOUDSTACK-9252: Little refactor
  CLOUDSTACK-9252: Mock application context for unit test
  CLOUDSTACK-9252: Add unit tests
  CLOUDSTACK-9252: New refactor
  CLOUDSTACK-9252: Remove static dependencies, refactor
  CLOUDSTACK-9252: Remove duplicates getNfsVersion, refactor
  CLOUDSTACK-9252: Support configurable nfs version
  CLOUDSTACK-9252: Add nfs version to commands

Signed-off-by: Rafael Weingärtner <[email protected]>

Author: rafaelweingartner

core/src/com/cloud/agent/api/BackupSnapshotCommand.java

@@ -39,6 +39,7 @@ public class BackupSnapshotCommand extends SnapshotCommand {
     private S3TO s3;
     StorageFilerTO pool;
     private Long secHostId;
+    private String nfsVersion;
 
     protected BackupSnapshotCommand() {
 
@@ -107,4 +108,12 @@ public Long getSnapshotId() {
     public Long getSecHostId() {
         return secHostId;
     }
+
+    public String getNfsVersion() {
+        return nfsVersion;
+    }
+
+    public void setNfsVersion(String nfsVersion) {
+        this.nfsVersion = nfsVersion;
+    }
 }

core/src/com/cloud/agent/api/CreatePrivateTemplateFromSnapshotCommand.java

@@ -28,6 +28,7 @@ public class CreatePrivateTemplateFromSnapshotCommand extends SnapshotCommand {
     private String origTemplateInstallPath;
     private Long newTemplateId;
     private String templateName;
+    private String nfsVersion;
 
     protected CreatePrivateTemplateFromSnapshotCommand() {
 
@@ -72,4 +73,12 @@ public Long getNewTemplateId() {
     public String getTemplateName() {
         return templateName;
     }
+
+    public String getNfsVersion() {
+        return nfsVersion;
+    }
+
+    public void setNfsVersion(String nfsVersion) {
+        this.nfsVersion = nfsVersion;
+    }
 }

core/src/com/cloud/agent/api/CreatePrivateTemplateFromVolumeCommand.java

@@ -32,6 +32,7 @@ public class CreatePrivateTemplateFromVolumeCommand extends SnapshotCommand {
     StorageFilerTO _primaryPool;
     // For XenServer
     private String _secondaryStorageUrl;
+    private String nfsVersion;
 
     public CreatePrivateTemplateFromVolumeCommand() {
     }
@@ -99,4 +100,12 @@ public Long getAccountId() {
     public void setTemplateId(long templateId) {
         _templateId = templateId;
     }
+
+    public String getNfsVersion() {
+        return nfsVersion;
+    }
+
+    public void setNfsVersion(String nfsVersion) {
+        this.nfsVersion = nfsVersion;
+    }
 }

core/src/com/cloud/agent/api/CreateVolumeFromSnapshotCommand.java

@@ -26,6 +26,8 @@
  */
 public class CreateVolumeFromSnapshotCommand extends SnapshotCommand {
 
+    private String nfsVersion;
+
     protected CreateVolumeFromSnapshotCommand() {
 
     }
@@ -50,4 +52,12 @@ public CreateVolumeFromSnapshotCommand(StoragePool pool, String secondaryStorage
         super(pool, secondaryStoragePoolURL, backedUpSnapshotUuid, backedUpSnapshotName, dcId, accountId, volumeId);
         setWait(wait);
     }
+
+    public String getNfsVersion() {
+        return nfsVersion;
+    }
+
+    public void setNfsVersion(String nfsVersion) {
+        this.nfsVersion = nfsVersion;
+    }
 }

core/src/com/cloud/agent/api/GetStorageStatsCommand.java

@@ -30,6 +30,7 @@ public class GetStorageStatsCommand extends Command {
     private StoragePoolType pooltype;
     private String secUrl;
     private DataStoreTO store;
+    private String nfsVersion;
 
     public String getSecUrl() {
         return secUrl;
@@ -54,6 +55,11 @@ public GetStorageStatsCommand(DataStoreTO store) {
         this.store = store;
     }
 
+    public GetStorageStatsCommand(DataStoreTO store, String nfsVersion) {
+        this.store = store;
+        this.nfsVersion = nfsVersion;
+    }
+
     public GetStorageStatsCommand(String secUrl) {
         this.secUrl = secUrl;
     }
@@ -81,6 +87,14 @@ public DataStoreTO getStore() {
         return this.store;
     }
 
+    public String getNfsVersion() {
+        return nfsVersion;
+    }
+
+    public void setNfsVersion(String nfsVersion) {
+        this.nfsVersion = nfsVersion;
+    }
+
     @Override
     public boolean executeInSequence() {
         return false;

core/src/com/cloud/agent/api/SecStorageSetupCommand.java

@@ -28,6 +28,7 @@ public class SecStorageSetupCommand extends Command {
     private String secUrl;
     private KeystoreManager.Certificates certs;
     private String postUploadKey;
+    private String nfsVersion;
 
 
     public SecStorageSetupCommand() {
@@ -74,4 +75,12 @@ public String getPostUploadKey() {
     public void setPostUploadKey(String postUploadKey) {
         this.postUploadKey = postUploadKey;
     }
+
+    public String getNfsVersion() {
+        return nfsVersion;
+    }
+
+    public void setNfsVersion(String nfsVersion) {
+        this.nfsVersion = nfsVersion;
+    }
 }

core/src/com/cloud/agent/api/storage/CopyVolumeCommand.java

@@ -32,6 +32,7 @@ public class CopyVolumeCommand extends Command {
     boolean toSecondaryStorage;
     String vmName;
     boolean executeInSequence = false;
+    String nfsVersion;
 
     public CopyVolumeCommand() {
     }
@@ -75,4 +76,12 @@ public boolean toSecondaryStorage() {
     public String getVmName() {
         return vmName;
     }
+
+    public String getNfsVersion() {
+        return nfsVersion;
+    }
+
+    public void setNfsVersion(String nfsVersion) {
+        this.nfsVersion = nfsVersion;
+    }
 }

core/src/com/cloud/agent/api/storage/ListTemplateCommand.java

@@ -23,6 +23,7 @@
 
 public class ListTemplateCommand extends StorageCommand {
     private DataStoreTO store;
+    private String nfsVersion;
 
     //private String secUrl;
 
@@ -34,6 +35,11 @@ public ListTemplateCommand(DataStoreTO store) {
 //        this.secUrl = url;
     }
 
+    public ListTemplateCommand(DataStoreTO store, String nfsVersion) {
+        this.store = store;
+        this.nfsVersion = nfsVersion;
+    }
+
     @Override
     public boolean executeInSequence() {
         return true;
@@ -43,6 +49,10 @@ public DataStoreTO getDataStore() {
         return store;
     }
 
+    public String getNfsVersion() {
+        return nfsVersion;
+    }
+
     //   public String getSecUrl() {
     //       return secUrl;
     //   }

core/src/com/cloud/agent/api/storage/PrimaryStorageDownloadCommand.java

@@ -35,6 +35,7 @@ public class PrimaryStorageDownloadCommand extends AbstractDownloadCommand {
 
     String secondaryStorageUrl;
     String primaryStorageUrl;
+    String nfsVersion;
 
     protected PrimaryStorageDownloadCommand() {
     }
@@ -87,4 +88,12 @@ public String getPrimaryStorageUrl() {
     public boolean executeInSequence() {
         return true;
     }
+
+    public String getNfsVersion() {
+        return nfsVersion;
+    }
+
+    public void setNfsVersion(String nfsVersion) {
+        this.nfsVersion = nfsVersion;
+    }
 }

core/src/org/apache/cloudstack/storage/command/TemplateOrVolumePostUploadCommand.java

@@ -53,6 +53,8 @@ public class TemplateOrVolumePostUploadCommand {
 
     private long accountId;
 
+    private String nfsVersion;
+
     public TemplateOrVolumePostUploadCommand(long entityId, String entityUUID, String absolutePath, String checksum, String type, String name, String imageFormat, String dataTo,
             String dataToRole) {
         this.entityId = entityId;
@@ -196,4 +198,12 @@ public void setAccountId(long accountId) {
     public long getAccountId() {
         return accountId;
     }
+
+    public String getNfsVersion() {
+        return nfsVersion;
+    }
+
+    public void setNfsVersion(String nfsVersion) {
+        this.nfsVersion = nfsVersion;
+    }
 }