Skip to content

Commit e139951

Browse files
nvazqueznvazquez
committed
CLOUDSTACK-9368: Change NFS version type
1 parent d0fa324 commit e139951

31 files changed

Lines changed: 105 additions & 91 deletions

File tree

‎api/src/com/cloud/agent/api/to/NfsTO.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ public class NfsTO implements DataStoreTO {
2424
private DataStoreRole _role;
2525
private String uuid;
2626
private static final String pathSeparator = "/";
27-
private String nfsVersion;
27+
private Integer nfsVersion;
2828

2929
public NfsTO() {
3030

@@ -73,11 +73,11 @@ public String getPathSeparator() {
7373
return pathSeparator;
7474
}
7575

76-
public String getNfsVersion() {
76+
public Integer getNfsVersion() {
7777
return nfsVersion;
7878
}
7979

80-
public void setNfsVersion(String nfsVersion) {
80+
public void setNfsVersion(Integer nfsVersion) {
8181
this.nfsVersion = nfsVersion;
8282
}
8383
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public class BackupSnapshotCommand extends SnapshotCommand {
3939
private S3TO s3;
4040
StorageFilerTO pool;
4141
private Long secHostId;
42-
private String nfsVersion;
42+
private Integer nfsVersion;
4343

4444
protected BackupSnapshotCommand() {
4545

@@ -109,11 +109,11 @@ public Long getSecHostId() {
109109
return secHostId;
110110
}
111111

112-
public String getNfsVersion() {
112+
public Integer getNfsVersion() {
113113
return nfsVersion;
114114
}
115115

116-
public void setNfsVersion(String nfsVersion) {
116+
public void setNfsVersion(Integer nfsVersion) {
117117
this.nfsVersion = nfsVersion;
118118
}
119119
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class CreatePrivateTemplateFromSnapshotCommand extends SnapshotCommand {
2828
private String origTemplateInstallPath;
2929
private Long newTemplateId;
3030
private String templateName;
31-
private String nfsVersion;
31+
private Integer nfsVersion;
3232

3333
protected CreatePrivateTemplateFromSnapshotCommand() {
3434

@@ -74,11 +74,11 @@ public String getTemplateName() {
7474
return templateName;
7575
}
7676

77-
public String getNfsVersion() {
77+
public Integer getNfsVersion() {
7878
return nfsVersion;
7979
}
8080

81-
public void setNfsVersion(String nfsVersion) {
81+
public void setNfsVersion(Integer nfsVersion) {
8282
this.nfsVersion = nfsVersion;
8383
}
8484
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class CreatePrivateTemplateFromVolumeCommand extends SnapshotCommand {
3232
StorageFilerTO _primaryPool;
3333
// For XenServer
3434
private String _secondaryStorageUrl;
35-
private String nfsVersion;
35+
private Integer nfsVersion;
3636

3737
public CreatePrivateTemplateFromVolumeCommand() {
3838
}
@@ -101,11 +101,11 @@ public void setTemplateId(long templateId) {
101101
_templateId = templateId;
102102
}
103103

104-
public String getNfsVersion() {
104+
public Integer getNfsVersion() {
105105
return nfsVersion;
106106
}
107107

108-
public void setNfsVersion(String nfsVersion) {
108+
public void setNfsVersion(Integer nfsVersion) {
109109
this.nfsVersion = nfsVersion;
110110
}
111111
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
*/
2727
public class CreateVolumeFromSnapshotCommand extends SnapshotCommand {
2828

29-
private String nfsVersion;
29+
private Integer nfsVersion;
3030

3131
protected CreateVolumeFromSnapshotCommand() {
3232

@@ -53,11 +53,11 @@ public CreateVolumeFromSnapshotCommand(StoragePool pool, String secondaryStorage
5353
setWait(wait);
5454
}
5555

56-
public String getNfsVersion() {
56+
public Integer getNfsVersion() {
5757
return nfsVersion;
5858
}
5959

60-
public void setNfsVersion(String nfsVersion) {
60+
public void setNfsVersion(Integer nfsVersion) {
6161
this.nfsVersion = nfsVersion;
6262
}
6363
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public class GetStorageStatsCommand extends Command {
3030
private StoragePoolType pooltype;
3131
private String secUrl;
3232
private DataStoreTO store;
33-
private String nfsVersion;
33+
private Integer nfsVersion;
3434

3535
public String getSecUrl() {
3636
return secUrl;
@@ -55,7 +55,7 @@ public GetStorageStatsCommand(DataStoreTO store) {
5555
this.store = store;
5656
}
5757

58-
public GetStorageStatsCommand(DataStoreTO store, String nfsVersion) {
58+
public GetStorageStatsCommand(DataStoreTO store, Integer nfsVersion) {
5959
this.store = store;
6060
this.nfsVersion = nfsVersion;
6161
}
@@ -87,11 +87,11 @@ public DataStoreTO getStore() {
8787
return this.store;
8888
}
8989

90-
public String getNfsVersion() {
90+
public Integer getNfsVersion() {
9191
return nfsVersion;
9292
}
9393

94-
public void setNfsVersion(String nfsVersion) {
94+
public void setNfsVersion(Integer nfsVersion) {
9595
this.nfsVersion = nfsVersion;
9696
}
9797

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class SecStorageSetupCommand extends Command {
2828
private String secUrl;
2929
private KeystoreManager.Certificates certs;
3030
private String postUploadKey;
31-
private String nfsVersion;
31+
private Integer nfsVersion;
3232

3333

3434
public SecStorageSetupCommand() {
@@ -76,11 +76,11 @@ public void setPostUploadKey(String postUploadKey) {
7676
this.postUploadKey = postUploadKey;
7777
}
7878

79-
public String getNfsVersion() {
79+
public Integer getNfsVersion() {
8080
return nfsVersion;
8181
}
8282

83-
public void setNfsVersion(String nfsVersion) {
83+
public void setNfsVersion(Integer nfsVersion) {
8484
this.nfsVersion = nfsVersion;
8585
}
8686
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class CopyVolumeCommand extends Command {
3232
boolean toSecondaryStorage;
3333
String vmName;
3434
boolean executeInSequence = false;
35-
String nfsVersion;
35+
Integer nfsVersion;
3636

3737
public CopyVolumeCommand() {
3838
}
@@ -77,11 +77,11 @@ public String getVmName() {
7777
return vmName;
7878
}
7979

80-
public String getNfsVersion() {
80+
public Integer getNfsVersion() {
8181
return nfsVersion;
8282
}
8383

84-
public void setNfsVersion(String nfsVersion) {
84+
public void setNfsVersion(Integer nfsVersion) {
8585
this.nfsVersion = nfsVersion;
8686
}
8787
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
public class ListTemplateCommand extends StorageCommand {
2525
private DataStoreTO store;
26-
private String nfsVersion;
26+
private Integer nfsVersion;
2727

2828
//private String secUrl;
2929

@@ -35,7 +35,7 @@ public ListTemplateCommand(DataStoreTO store) {
3535
// this.secUrl = url;
3636
}
3737

38-
public ListTemplateCommand(DataStoreTO store, String nfsVersion) {
38+
public ListTemplateCommand(DataStoreTO store, Integer nfsVersion) {
3939
this.store = store;
4040
this.nfsVersion = nfsVersion;
4141
}
@@ -49,7 +49,7 @@ public DataStoreTO getDataStore() {
4949
return store;
5050
}
5151

52-
public String getNfsVersion() {
52+
public Integer getNfsVersion() {
5353
return nfsVersion;
5454
}
5555

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class PrimaryStorageDownloadCommand extends AbstractDownloadCommand {
3535

3636
String secondaryStorageUrl;
3737
String primaryStorageUrl;
38-
String nfsVersion;
38+
Integer nfsVersion;
3939

4040
protected PrimaryStorageDownloadCommand() {
4141
}
@@ -89,11 +89,11 @@ public boolean executeInSequence() {
8989
return true;
9090
}
9191

92-
public String getNfsVersion() {
92+
public Integer getNfsVersion() {
9393
return nfsVersion;
9494
}
9595

96-
public void setNfsVersion(String nfsVersion) {
96+
public void setNfsVersion(Integer nfsVersion) {
9797
this.nfsVersion = nfsVersion;
9898
}
9999
}

0 commit comments

Comments
 (0)